fixes solr

Author: otaviojava

solr-driver/src/main/java/org/jnosql/diana/solr/document/DefaultSolrDocumentCollectionManager.java

@@ -34,6 +34,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Objects;
+import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
 import static java.util.stream.Collectors.toList;
@@ -119,7 +120,7 @@ public void delete(DocumentDeleteQuery query) {
     }
 
     @Override
-    public List<DocumentEntity> select(DocumentQuery query) {
+    public Stream<DocumentEntity> select(DocumentQuery query) {
         Objects.requireNonNull(query, "query is required");
         try {
             SolrQuery solrQuery = new SolrQuery();
@@ -137,7 +138,7 @@ public List<DocumentEntity> select(DocumentQuery query) {
             solrQuery.setSorts(sorts);
             final QueryResponse response = solrClient.query(solrQuery);
             final SolrDocumentList documents = response.getResults();
-            return SolrUtils.of(documents);
+            return SolrUtils.of(documents).stream();
         } catch (SolrServerException | IOException e) {
             throw new SolrException("Error to query at Solr", e);
         }

solr-driver/src/test/java/org/jnosql/diana/solr/document/DefaultSolrDocumentCollectionManagerTest.java

@@ -94,7 +94,7 @@ public void shouldRemoveEntity() {
                 .build();
 
         entityManager.delete(deleteQuery);
-        assertTrue(entityManager.select(query).isEmpty());
+        assertTrue(entityManager.select(query).collect(Collectors.toList()).isEmpty());
     }
 
     @Test
@@ -106,7 +106,7 @@ 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());
         final DocumentEntity result = entities.get(0);
 
@@ -126,7 +126,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());
         final DocumentEntity result = entities.get(0);
 
@@ -144,7 +144,7 @@ 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());
         final DocumentEntity result = entities.get(0);
         assertEquals(entity.find("name").get(), result.find("name").get());
@@ -163,7 +163,7 @@ public void shouldFindDocumentGreaterThan() {
                 .and("type").eq("V")
                 .build();
 
-        List<DocumentEntity> entitiesFound = entityManager.select(query);
+        List<DocumentEntity> entitiesFound = entityManager.select(query).collect(Collectors.toList());
         assertEquals(3, entitiesFound.size());
     }
 
@@ -174,7 +174,7 @@ public void shouldFindNot() {
         entityManager.insert(getEntitiesWithValues());
         DocumentQuery query = select().from(COLLECTION_NAME)
                 .where("name").not().eq("Lucas").build();
-        List<DocumentEntity> entitiesFound = entityManager.select(query);
+        List<DocumentEntity> entitiesFound = entityManager.select(query).collect(Collectors.toList());
         assertEquals(2, entitiesFound.size());
     }
 
@@ -190,7 +190,7 @@ public void shouldFindDocumentGreaterEqualsThan() {
                 .and("type").eq("V")
                 .build();
 
-        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))));
     }
@@ -206,7 +206,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(2, entitiesFound.size());
     }
 
@@ -222,7 +222,7 @@ public void shouldFindDocumentLesserEqualsThan() {
                 .and("type").eq("V")
                 .build();
 
-        List<DocumentEntity> entitiesFound = entityManager.select(query);
+        List<DocumentEntity> entitiesFound = entityManager.select(query).collect(Collectors.toList());
         assertEquals(2, entitiesFound.size());
     }
 
@@ -237,7 +237,7 @@ public void shouldFindDocumentLike() {
                 .and("type").eq("V")
                 .build();
 
-        List<DocumentEntity> entitiesFound = entityManager.select(query);
+        List<DocumentEntity> entitiesFound = entityManager.select(query).collect(Collectors.toList());
         assertEquals(2, entitiesFound.size());
     }
 
@@ -253,7 +253,7 @@ public void shouldFindDocumentIn() {
                 .and("type").eq("V")
                 .build();
 
-        assertEquals(3, entityManager.select(query).size());
+        assertEquals(3, entityManager.select(query).collect(Collectors.toList()).size());
     }
 
     @Test
@@ -269,7 +269,7 @@ public void shouldFindDocumentStart() {
                 .skip(1L)
                 .build();
 
-        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))));
 
@@ -279,7 +279,7 @@ public void shouldFindDocumentStart() {
                 .skip(3L)
                 .build();
 
-        entitiesFound = entityManager.select(query);
+        entitiesFound = entityManager.select(query).collect(Collectors.toList());
         assertTrue(entitiesFound.isEmpty());
 
     }
@@ -297,7 +297,7 @@ public void shouldFindDocumentLimit() {
                 .limit(1L)
                 .build();
 
-        List<DocumentEntity> entitiesFound = entityManager.select(query);
+        List<DocumentEntity> entitiesFound = entityManager.select(query).collect(Collectors.toList());
         assertEquals(1, entitiesFound.size());
         assertThat(entitiesFound, not(contains(entities.get(0))));
 
@@ -307,7 +307,7 @@ public void shouldFindDocumentLimit() {
                 .limit(2L)
                 .build();
 
-        entitiesFound = entityManager.select(query);
+        entitiesFound = entityManager.select(query).collect(Collectors.toList());
         assertEquals(2, entitiesFound.size());
         entityManager.delete(deleteQuery);
     }
@@ -325,7 +325,7 @@ public void shouldFindDocumentSort() {
                 .orderBy("age").asc()
                 .build();
 
-        List<DocumentEntity> entitiesFound = entityManager.select(query);
+        List<DocumentEntity> entitiesFound = entityManager.select(query).collect(Collectors.toList());
         List<Integer> ages = entitiesFound.stream()
                 .map(e -> e.find("age").get().get(Integer.class))
                 .collect(Collectors.toList());