Skip to content

Make a copy of bookmarks in SessionConfig builder #1465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 21, 2023
Merged

Make a copy of bookmarks in SessionConfig builder #1465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions driver/src/main/java/org/neo4j/driver/SessionConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.util.Arrays;
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;
Expand Down Expand Up @@ -236,7 +237,7 @@ public Builder withBookmarks(Bookmark... bookmarks) {
if (bookmarks == null) {
this.bookmarks = null;
} else {
this.bookmarks = Arrays.asList(bookmarks);
this.bookmarks = Arrays.stream(bookmarks).toList();
}
return this;
}
Expand All @@ -261,7 +262,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;
}

Expand Down
26 changes: 26 additions & 0 deletions driver/src/test/java/org/neo4j/driver/SessionConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,32 @@ void shouldAcceptNullInBookmarks() {
assertEquals(Arrays.asList(one, two, null), config2.bookmarks());
}

@Test
void shouldSaveBookmarksCopyFromArray() {
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 shouldSaveBookmarksCopyFromIterable() {
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) {
Expand Down