Make defensive copy of bookmarks in SessionConfig builder

Author: injectives

driver/src/main/java/org/neo4j/driver/SessionConfig.java

@@ -23,9 +23,12 @@
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.stream.StreamSupport;
 import org.neo4j.driver.async.AsyncSession;
 import org.neo4j.driver.exceptions.UnsupportedFeatureException;
 import org.neo4j.driver.reactive.ReactiveSession;
@@ -236,7 +239,9 @@ public Builder withBookmarks(Bookmark... bookmarks) {
             if (bookmarks == null) {
                 this.bookmarks = null;
             } else {
-                this.bookmarks = Arrays.asList(bookmarks);
+                // must accept null values as well
+                //noinspection Java9CollectionFactory
+                this.bookmarks = Collections.unmodifiableList(new ArrayList<>(Arrays.asList(bookmarks)));
             }
             return this;
         }
@@ -261,7 +266,10 @@ public Builder withBookmarks(Bookmark... bookmarks) {
          * @return this builder
          */
         public Builder withBookmarks(Iterable<Bookmark> bookmarks) {
-            this.bookmarks = bookmarks;
+            if (bookmarks != null) {
+                this.bookmarks =
+                        StreamSupport.stream(bookmarks.spliterator(), false).toList();
+            }
             return this;
         }
 

driver/src/test/java/org/neo4j/driver/SessionConfigTest.java

@@ -148,6 +148,32 @@ void shouldAcceptNullInBookmarks() {
         assertEquals(Arrays.asList(one, two, null), config2.bookmarks());
     }
 
+    @Test
+    void shouldMakeACopyOfBookmarksArray() {
+        var bookmark1 = parse("one");
+        var bookmark2 = parse("two");
+        var bookmarks = new Bookmark[] {bookmark1, bookmark2};
+        var config = builder().withBookmarks(bookmarks).build();
+        assertEquals(List.of(bookmark1, bookmark2), config.bookmarks());
+
+        bookmarks[0] = parse("three");
+
+        assertEquals(List.of(bookmark1, bookmark2), config.bookmarks());
+    }
+
+    @Test
+    void shouldMakeACopyOfBookmarksIterable() {
+        var bookmark1 = parse("one");
+        var bookmark2 = parse("two");
+        var bookmarks = new ArrayList<>(List.of(bookmark1, bookmark2));
+        var config = builder().withBookmarks(bookmarks).build();
+        assertEquals(List.of(bookmark1, bookmark2), config.bookmarks());
+
+        bookmarks.add(parse("three"));
+
+        assertEquals(List.of(bookmark1, bookmark2), config.bookmarks());
+    }
+
     @ParameterizedTest
     @ValueSource(longs = {100, 1, 1000, Long.MAX_VALUE, -1})
     void shouldChangeFetchSize(long value) {