fixes test

Author: otaviojava

ravendb-driver/src/main/java/org/jnosql/diana/ravendb/document/RavenDBDocumentCollectionManager.java

@@ -38,6 +38,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
 import static net.ravendb.client.Constants.Documents.Metadata.COLLECTION;
@@ -127,22 +128,21 @@ public void delete(DocumentDeleteQuery query) {
         Objects.requireNonNull(query, "query is required");
 
         try (IDocumentSession session = store.openSession()) {
-            List<Map> entities = getQueryMaps(new RavenDeleteQuery(query), session);
-            entities.stream().map(EntityConverter::getId).forEach(session::delete);
+            Stream<Map> entities = getQueryMaps(new RavenDeleteQuery(query), session);
+            entities.map(EntityConverter::getId).forEach(session::delete);
             session.saveChanges();
         }
 
     }
 
 
     @Override
-    public List<DocumentEntity> select(DocumentQuery query) {
+    public Stream<DocumentEntity> select(DocumentQuery query) {
         Objects.requireNonNull(query, "query is required");
 
         try (IDocumentSession session = store.openSession()) {
-            List<Map> entities = getQueryMaps(query, session);
-            return entities.stream().filter(Objects::nonNull).map(EntityConverter::getEntity)
-                    .collect(Collectors.toList());
+            Stream<Map> entities = getQueryMaps(query, session);
+            return entities.filter(Objects::nonNull).map(EntityConverter::getEntity);
         }
 
     }
@@ -181,16 +181,16 @@ private void insert(DocumentEntity entity, LocalDateTime time, IDocumentSession
     }
 
 
-    private List<Map> getQueryMaps(DocumentQuery query, IDocumentSession session) {
-        List<Map> entities = new ArrayList<>();
+    private Stream<Map> getQueryMaps(DocumentQuery query, IDocumentSession session) {
         QueryResult queryResult = DocumentQueryConversor.createQuery(session, query);
 
-        queryResult.getIds().stream()
-                .map(i -> session.load(HashMap.class, i))
-                .forEach(entities::add);
+        Stream<Map> idQueryStream = queryResult.getIds().stream()
+                .map(i -> session.load(HashMap.class, i));
 
-        queryResult.getRavenQuery().map(IEnumerableQuery::toList).ifPresent(entities::addAll);
-        return entities;
+        final Stream<HashMap> queryStream = queryResult.getRavenQuery()
+                .map(IEnumerableQuery::toList)
+                .map(List::stream).orElseGet(() -> Stream.empty());
+        return Stream.concat(idQueryStream, queryStream);
     }
 
 }

ravendb-driver/src/test/java/org/jnosql/diana/ravendb/document/RavenDBDocumentCollectionManagerTest.java

@@ -116,7 +116,7 @@ public void shouldRemoveEntity() throws InterruptedException {
                 .build();
 
         entityManager.delete(deleteQuery);
-        assertTrue(entityManager.select(query).isEmpty());
+        assertTrue(entityManager.select(query).collect(Collectors.toList()).isEmpty());
     }
 
     @Test
@@ -128,7 +128,8 @@ public void shouldFindDocument() {
                 .where("_id").eq(id.get().get())
                 .build();
 
-        List<DocumentEntity> entities = entityManager.select(query);
+        List<DocumentEntity> entities = entityManager.select(query)
+                .collect(Collectors.toList());
         assertFalse(entities.isEmpty());
         assertThat(entities, contains(entity));
     }
@@ -157,7 +158,7 @@ public void shouldFindDocument2() {
                 .and("city").eq("Salvador").and("_id").eq(id.get().get())
                 .build();
 
-        List<DocumentEntity> entities = entityManager.select(query);
+        List<DocumentEntity> entities = entityManager.select(query).collect(Collectors.toList());
         assertFalse(entities.isEmpty());
         assertThat(entities, contains(entity));
     }
@@ -172,7 +173,8 @@ public void shouldFindDocument3() {
                 .and(id.get().getName()).eq(id.get().get())
                 .build();
 
-        List<DocumentEntity> entities = entityManager.select(query);
+        List<DocumentEntity> entities = entityManager.select(query)
+                .collect(Collectors.toList());
         assertFalse(entities.isEmpty());
         assertThat(entities, contains(entity));
     }
@@ -190,7 +192,7 @@ public void shouldFindDocumentGreaterThan() throws InterruptedException {
                 .build();
 
         Thread.sleep(TIME_LIMIT);
-        List<DocumentEntity> entitiesFound = entityManager.select(query);
+        List<DocumentEntity> entitiesFound = entityManager.select(query).collect(Collectors.toList());
         assertEquals(2, entitiesFound.size());
         assertThat(entitiesFound, not(contains(entities.get(0))));
     }
@@ -208,7 +210,7 @@ public void shouldFindDocumentGreaterEqualsThan() throws InterruptedException {
                 .build();
 
         Thread.sleep(TIME_LIMIT);
-        List<DocumentEntity> entitiesFound = entityManager.select(query);
+        List<DocumentEntity> entitiesFound = entityManager.select(query).collect(Collectors.toList());
         assertEquals(2, entitiesFound.size());
         assertThat(entitiesFound, not(contains(entities.get(0))));
     }
@@ -225,7 +227,7 @@ public void shouldFindDocumentLesserThan() {
                 .and("type").eq("V")
                 .build();
 
-        List<DocumentEntity> entitiesFound = entityManager.select(query);
+        List<DocumentEntity> entitiesFound = entityManager.select(query).collect(Collectors.toList());
         assertEquals(1, entitiesFound.size());
         assertThat(entitiesFound, contains(entities.get(0)));
     }
@@ -243,7 +245,7 @@ public void shouldFindDocumentLesserEqualsThan() throws InterruptedException {
                 .build();
 
         Thread.sleep(TIME_LIMIT);
-        List<DocumentEntity> entitiesFound = entityManager.select(query);
+        List<DocumentEntity> entitiesFound = entityManager.select(query).collect(Collectors.toList());
         System.out.println(entitiesFound);
         assertEquals(2, entitiesFound.size());
         assertThat(entitiesFound, contains(entities.get(0), entities.get(2)));
@@ -269,7 +271,7 @@ public void shouldFindDocumentIn() throws InterruptedException {
     public void shouldFindAll() {
         entityManager.insert(getEntity());
         DocumentQuery query = select().from(COLLECTION_NAME).build();
-        List<DocumentEntity> entities = entityManager.select(query);
+        List<DocumentEntity> entities = entityManager.select(query).collect(Collectors.toList());
         assertFalse(entities.isEmpty());
     }
 
@@ -284,7 +286,7 @@ public void shouldSaveSubDocument() {
                 .where("_id").eq(id.get())
                 .build();
 
-        DocumentEntity entityFound = entityManager.select(query).get(0);
+        DocumentEntity entityFound = entityManager.select(query).collect(Collectors.toList()).get(0);
         Document subDocument = entityFound.find("phones").get();
         List<Document> documents = subDocument.get(new TypeReference<List<Document>>() {
         });
@@ -301,7 +303,7 @@ public void shouldSaveSubDocument2() {
         DocumentQuery query = select().from(COLLECTION_NAME)
                 .where(id.getName()).eq(id.get())
                 .build();
-        DocumentEntity entityFound = entityManager.select(query).get(0);
+        DocumentEntity entityFound = entityManager.select(query).collect(Collectors.toList()).get(0);
         Document subDocument = entityFound.find("phones").get();
         List<Document> documents = subDocument.get(new TypeReference<List<Document>>() {
         });