Values should handle iterators

pontusmelke · pontusmelke · commit adab5d9a3e49 · 2016-03-15T16:30:59.000+01:00
diff --git a/driver/src/main/java/org/neo4j/driver/v1/Values.java b/driver/src/main/java/org/neo4j/driver/v1/Values.java
@@ -23,6 +23,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -81,6 +82,7 @@ public static Value value( Object value )
         if ( value instanceof List<?> ) { return value( (List<Object>) value ); }
         if ( value instanceof Iterable<?> ) { return value( (Iterable<Object>) value ); }
         if ( value instanceof Map<?, ?> ) { return value( (Map<String,Object>) value ); }
+        if ( value instanceof Iterator<?> ) { return value( (Iterator<Object>) value ); }
 
         if ( value instanceof boolean[] ) { return value( (boolean[]) value ); }
         if ( value instanceof String[] ) { return value( (String[]) value ); }
@@ -183,11 +185,16 @@ public static Value value( List<Object> vals )
     }
 
     public static Value value( Iterable<Object> val )
+    {
+        return value( val.iterator() );
+    }
+
+    public static Value value( Iterator<Object> val )
     {
         List<Value> values = new ArrayList<>();
-        for ( Object v : val )
+        while ( val.hasNext() )
         {
-            values.add( value( v ) );
+            values.add( value( val.next() ) );
         }
         return new ListValue( values.toArray( new Value[values.size()] ) );
     }
diff --git a/driver/src/test/java/org/neo4j/driver/internal/ValuesTest.java b/driver/src/test/java/org/neo4j/driver/internal/ValuesTest.java
@@ -270,4 +270,15 @@ public void shouldHandleCollection() throws Throwable
         // When/Then
         assertThat( val.asList(), Matchers.<Object>containsInAnyOrder( "hello", "world" ));
     }
+
+    @Test
+    public void shouldHandleIterator() throws Throwable
+    {
+        // Given
+        Iterator<String> iterator = asList( "hello", "world" ).iterator();
+        Value val = value( iterator );
+
+        // When/Then
+        assertThat( val.asList(), Matchers.<Object>containsInAnyOrder( "hello", "world" ));
+    }
 }
diff --git a/driver/src/test/java/org/neo4j/driver/v1/integration/StatementIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/StatementIT.java
@@ -22,6 +22,7 @@
 import org.junit.Test;
 
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 
 import org.neo4j.driver.v1.Record;
@@ -82,6 +83,16 @@ public void shouldRunWithCollectionAsParameter() throws Throwable
         // Then nothing should've failed
     }
 
+    @Test
+    public void shouldRunWithIteratorAsParameter() throws Throwable
+    {
+        Iterator<String> values = asList( "FOO", "BAR", "BAZ" ).iterator();
+        // When
+        session.run( "RETURN {param}", parameters( "param", values ) );
+
+        // Then nothing should've failed
+    }
+
     @Test
     public void shouldRun() throws Throwable
     {
