GH-882 - Use a more unique bookmark separator.

neo4j · Jul 22, 2021 · 962edfc · 962edfc
1 parent 57d34f5
commit 962edfc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/bolt-driver/src/main/java/org/neo4j/ogm/drivers/bolt/transaction/BoltTransaction.java b/bolt-driver/src/main/java/org/neo4j/ogm/drivers/bolt/transaction/BoltTransaction.java
@@ -38,7 +38,7 @@
  */
 public class BoltTransaction extends AbstractTransaction {
 
-    public static final String BOOKMARK_SEPARATOR = "BS";
+    public static final String BOOKMARK_SEPARATOR = "/_BS_/";
     private static final String NEO_CLIENT_ERROR_SECURITY = "Neo.ClientError.Security";
     private final Transaction nativeTransaction;
     private final Session nativeSession;

diff --git a/...m-tests/neo4j-ogm-integration-tests/src/test/java/org/neo4j/ogm/session/BookmarkTest.java b/...m-tests/neo4j-ogm-integration-tests/src/test/java/org/neo4j/ogm/session/BookmarkTest.java
@@ -87,7 +87,7 @@ public void shouldPassBookmarksToDriver() {
 
     @Test
     public void shouldPassMultiValueBookmarksToDriver() {
-        Set<String> bookmarkStringRepresentation = new HashSet<>(Arrays.asList("bookmark1", "bookmark2", "bookmark3-part1BSbookmark3-part2"));
+        Set<String> bookmarkStringRepresentation = new HashSet<>(Arrays.asList("bookmark1", "bookmark2", "bookmark3-part1/_BS_/bookmark3-part2"));
 
         Transaction transaction = session.beginTransaction(Transaction.Type.READ_ONLY, bookmarkStringRepresentation);
         ArgumentCaptor<SessionConfig> argumentCaptor = ArgumentCaptor.forClass(SessionConfig.class);
@@ -142,6 +142,6 @@ public void shouldDealWithMultiValueBookmarks() {
         transaction.close();
 
         String lastBookmark = session.getLastBookmark();
-        assertThat(lastBookmark).isEqualTo("bookmark-part1BSbookmark-part2");
+        assertThat(lastBookmark).isEqualTo("bookmark-part1/_BS_/bookmark-part2");
     }
 }