Skip to content

Commit deeef1f

Browse files
committed
fixes mongodb
1 parent 2ec1790 commit deeef1f

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

mongodb-driver/src/main/java/org/jnosql/diana/mongodb/document/DocumentQueryConversor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818

1919
import com.mongodb.client.model.Filters;
20-
import org.bson.conversions.Bson;
2120
import jakarta.nosql.TypeReference;
2221
import jakarta.nosql.document.Document;
2322
import jakarta.nosql.document.DocumentCondition;
23+
import org.bson.conversions.Bson;
2424
import org.jnosql.diana.driver.ValueUtil;
2525

2626
import java.util.List;

mongodb-driver/src/main/java/org/jnosql/diana/mongodb/document/MongoDBDocumentCollectionManager.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
import org.jnosql.diana.document.Documents;
3333

3434
import java.time.Duration;
35-
import java.util.List;
3635
import java.util.Objects;
36+
import java.util.stream.Stream;
3737
import java.util.stream.StreamSupport;
3838

3939
import static java.util.stream.Collectors.toList;
@@ -131,9 +131,8 @@ public void delete(DocumentDeleteQuery query) {
131131
collection.deleteMany(mongoDBQuery);
132132
}
133133

134-
135134
@Override
136-
public List<DocumentEntity> select(DocumentQuery query) {
135+
public Stream<DocumentEntity> select(DocumentQuery query) {
137136
Objects.requireNonNull(query, "query is required");
138137
String collectionName = query.getDocumentCollection();
139138
MongoCollection<Document> collection = mongoDatabase.getCollection(collectionName);
@@ -152,7 +151,7 @@ public List<DocumentEntity> select(DocumentQuery query) {
152151
query.getSorts().stream().map(this::getSort).forEach(documents::sort);
153152

154153
return stream(documents.spliterator(), false).map(MongoDBUtils::of)
155-
.map(ds -> DocumentEntity.of(collectionName, ds)).collect(toList());
154+
.map(ds -> DocumentEntity.of(collectionName, ds));
156155

157156
}
158157

mongodb-driver/src/main/java/org/jnosql/diana/mongodb/document/MongoDBDocumentCollectionManagerAsync.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import java.util.Objects;
4141
import java.util.concurrent.CopyOnWriteArrayList;
4242
import java.util.function.Consumer;
43+
import java.util.stream.Stream;
4344

4445
import static java.util.Objects.requireNonNull;
4546
import static org.jnosql.diana.mongodb.document.MongoDBUtils.ID_FIELD;
@@ -141,7 +142,7 @@ public void delete(DocumentDeleteQuery query, Consumer<Void> callBack)
141142
}
142143

143144
@Override
144-
public void select(DocumentQuery query, Consumer<List<DocumentEntity>> callBack)
145+
public void select(DocumentQuery query, Consumer<Stream<DocumentEntity>> callBack)
145146
throws ExecuteAsyncQueryException, UnsupportedOperationException {
146147

147148
requireNonNull(query, "query is required");
@@ -163,7 +164,7 @@ public void select(DocumentQuery query, Consumer<List<DocumentEntity>> callBack)
163164

164165
query.getSorts().stream().map(this::getSort).forEach(result::sort);
165166
Block<Document> documentBlock = d -> entities.add(createEntity(collectionName, d));
166-
SingleResultCallback<Void> voidSingleResultCallback = (v, e) -> callBack.accept(entities);
167+
SingleResultCallback<Void> voidSingleResultCallback = (v, e) -> callBack.accept(entities.stream());
167168
result.forEach(documentBlock, voidSingleResultCallback);
168169
}
169170

mongodb-driver/src/main/java/org/jnosql/diana/mongodb/document/MongoDBUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
*/
1515
package org.jnosql.diana.mongodb.document;
1616

17-
import org.bson.Document;
18-
import org.bson.types.Binary;
1917
import jakarta.nosql.Value;
2018
import jakarta.nosql.document.DocumentEntity;
19+
import org.bson.Document;
20+
import org.bson.types.Binary;
2121
import org.jnosql.diana.driver.ValueUtil;
2222

2323
import java.util.ArrayList;

mongodb-driver/src/test/java/org/jnosql/diana/mongodb/document/MongoDBDocumentCollectionManagerAsyncTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
import java.util.concurrent.atomic.AtomicReference;
3636
import java.util.function.Consumer;
3737

38-
import static org.awaitility.Awaitility.await;
39-
import static org.hamcrest.Matchers.notNullValue;
4038
import static jakarta.nosql.document.DocumentDeleteQuery.delete;
4139
import static jakarta.nosql.document.DocumentQuery.select;
40+
import static org.awaitility.Awaitility.await;
41+
import static org.hamcrest.Matchers.notNullValue;
4242
import static org.junit.jupiter.api.Assertions.assertFalse;
4343
import static org.junit.jupiter.api.Assertions.assertNotNull;
4444
import static org.junit.jupiter.api.Assertions.assertThrows;

mongodb-driver/src/test/java/org/jnosql/diana/mongodb/document/MongoDBDocumentCollectionManagerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@
4040
import java.util.stream.Collectors;
4141
import java.util.stream.StreamSupport;
4242

43+
import static jakarta.nosql.document.DocumentDeleteQuery.delete;
44+
import static jakarta.nosql.document.DocumentQuery.select;
4345
import static java.util.Arrays.asList;
4446
import static org.hamcrest.MatcherAssert.assertThat;
4547
import static org.hamcrest.Matchers.contains;
4648
import static org.hamcrest.Matchers.containsInAnyOrder;
4749
import static org.hamcrest.Matchers.not;
48-
import static jakarta.nosql.document.DocumentDeleteQuery.delete;
49-
import static jakarta.nosql.document.DocumentQuery.select;
5050
import static org.junit.jupiter.api.Assertions.assertEquals;
5151
import static org.junit.jupiter.api.Assertions.assertFalse;
5252
import static org.junit.jupiter.api.Assertions.assertNotNull;

0 commit comments

Comments
 (0)