fix(values): Add support for multiple iterations over values of List Value (#1716)

injectives · web-flow · commit 45066112bc68 · 2025-11-10T15:48:06.000Z
diff --git a/driver/src/main/java/org/neo4j/driver/internal/value/ListValue.java b/driver/src/main/java/org/neo4j/driver/internal/value/ListValue.java
@@ -112,17 +112,19 @@ public Value get(int index) {
 
     @Override
     public <T> Iterable<T> values(final Function<Value, T> mapFunction) {
-        var iterator = values.iterator();
-        return () -> new Iterator<>() {
-            @Override
-            public boolean hasNext() {
-                return iterator.hasNext();
-            }
+        return () -> {
+            var iterator = values.iterator();
+            return new Iterator<>() {
+                @Override
+                public boolean hasNext() {
+                    return iterator.hasNext();
+                }
 
-            @Override
-            public T next() {
-                return mapFunction.apply(iterator.next());
-            }
+                @Override
+                public T next() {
+                    return mapFunction.apply(iterator.next());
+                }
+            };
         };
     }
 
diff --git a/driver/src/test/java/org/neo4j/driver/internal/value/ListValueTest.java b/driver/src/test/java/org/neo4j/driver/internal/value/ListValueTest.java
@@ -20,6 +20,8 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.neo4j.driver.Values.value;
 
 import java.time.LocalDateTime;
@@ -157,6 +159,20 @@ void shouldMapMatrixValuesToArrays() {
         assertArrayEquals(array, values.as(long[][].class));
     }
 
+    @Test
+    void shouldSupportMultipleIterations() {
+        var list = Values.value("a", "b");
+        var values = list.values();
+        for (var i = 0; i < 2; i++) {
+            var iterator = values.iterator();
+            assertTrue(iterator.hasNext());
+            assertEquals("a", iterator.next().asString());
+            assertTrue(iterator.hasNext());
+            assertEquals("b", iterator.next().asString());
+            assertFalse(iterator.hasNext());
+        }
+    }
+
     private ListValue listValue(Value... values) {
         return new ListValue(Arrays.asList(values));
     }
