fixes remove list at graph

eclipse · Sep 9, 2019 · c8e59b4 · c8e59b4
1 parent b9f7e62
commit c8e59b4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/.../artemis-graph/src/main/java/org/eclipse/jnosql/artemis/graph/DefaultVertexTraversal.java b/.../artemis-graph/src/main/java/org/eclipse/jnosql/artemis/graph/DefaultVertexTraversal.java
@@ -24,12 +24,12 @@
 import org.apache.tinkerpop.gremlin.structure.T;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 
+import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static java.util.Objects.requireNonNull;
@@ -194,12 +194,15 @@ public <T> Stream<T> stream() {
 
     @Override
     public <T> Optional<T> getSingleResult() {
-        List<T> result = getResultList();
+        final Stream<T> stream = stream();
+        final Iterator<T> iterator = stream.iterator();
 
-        if (result.isEmpty()) {
+        if (!iterator.hasNext()) {
             return Optional.empty();
-        } else if (result.size() == 1) {
-            return Optional.of(result.get(0));
+        }
+        final T entity = iterator.next();
+        if (!iterator.hasNext()) {
+            return Optional.of(entity);
         }
         throw new NonUniqueResultException("The Vertex traversal query returns more than one result");
     }
@@ -212,12 +215,6 @@ public <T> Page<T> page(Pagination pagination) {
         return GraphPage.of(pagination, converter, graphTraversal);
     }
 
-    @Override
-    public <T> List<T> getResultList() {
-        Stream<T> stream = stream();
-        return stream.collect(Collectors.toList());
-    }
-
     @Override
     public <T> Stream<T> next(int limit) {
         return flow.apply(supplier.get())

diff --git a/...emis-graph/src/test/java/org/eclipse/jnosql/artemis/graph/DefaultVertexTraversalTest.java b/...emis-graph/src/test/java/org/eclipse/jnosql/artemis/graph/DefaultVertexTraversalTest.java
@@ -30,6 +30,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static java.util.stream.Collectors.toList;
@@ -434,7 +435,9 @@ public void shouldReturnHasLabel() {
 
     @Test
     public void shouldReturnResultAsList() {
-        List<Person> people = graphTemplate.getTraversalVertex().hasLabel("Person").getResultList();
+        List<Person> people = graphTemplate.getTraversalVertex().hasLabel("Person")
+                .<Person>stream()
+                .collect(Collectors.toList());
         assertEquals(3, people.size());
     }
 
@@ -482,14 +485,15 @@ public void shouldDedup() {
 
         List<Person> people = graphTemplate.getTraversalVertex()
                 .hasLabel(Person.class)
-                .in("knows").getResultList();
+                .in("knows").<Person>stream()
+                .collect(Collectors.toList());
 
         assertEquals(6, people.size());
 
         people = graphTemplate.getTraversalVertex()
                 .hasLabel(Person.class)
-                .in("knows").dedup()
-                .getResultList();
+                .in("knows").dedup().<Person>stream()
+                .collect(Collectors.toList());
 
         assertEquals(3, people.size());
     }