|
|
@@ -17,7 +17,10 @@ import org.mongodb.morphia.Datastore;
|
|
|
import org.mongodb.morphia.Key;
|
|
|
import org.mongodb.morphia.annotations.Embedded;
|
|
|
import org.mongodb.morphia.annotations.Reference;
|
|
|
-import org.mongodb.morphia.query.*;
|
|
|
+import org.mongodb.morphia.query.FindOptions;
|
|
|
+import org.mongodb.morphia.query.Query;
|
|
|
+import org.mongodb.morphia.query.UpdateOperations;
|
|
|
+import org.mongodb.morphia.query.UpdateResults;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
|
import java.lang.reflect.Field;
|
|
|
@@ -662,12 +665,7 @@ public abstract class BaseDao<T extends BaseEntity> {
|
|
|
FindOptions findOptions = new FindOptions();
|
|
|
findOptions.skip(offset);
|
|
|
findOptions.limit(size);
|
|
|
- MorphiaIterator<T, T> morphiaIterator = query.fetch(findOptions);
|
|
|
- List<T> content = new ArrayList<>();
|
|
|
- while (morphiaIterator.hasNext()) {
|
|
|
- content.add(morphiaIterator.next());
|
|
|
- }
|
|
|
- result.setContent(content);
|
|
|
+ result.setContent(query.asList(findOptions));
|
|
|
return result;
|
|
|
}
|
|
|
|