Skip to content

Commit 4633115

Browse files
authored
Rename Driver.queryBookmarkManager() to Driver.queryTaskBookmarkManager() (#1373)
1 parent 1c9a650 commit 4633115

File tree

5 files changed

+11
-5
lines changed

5 files changed

+11
-5
lines changed

driver/clirr-ignored-differences.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,4 +421,10 @@
421421
<method>org.neo4j.driver.BookmarkManager queryBookmarkManager()</method>
422422
</difference>
423423

424+
<difference>
425+
<className>org/neo4j/driver/Driver</className>
426+
<differenceType>7012</differenceType>
427+
<method>org.neo4j.driver.BookmarkManager queryTaskBookmarkManager()</method>
428+
</difference>
429+
424430
</differences>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ public interface Driver extends AutoCloseable {
7878
* Returns an instance of {@link BookmarkManager} used by {@link QueryTask} instances by default.
7979
*
8080
* @return bookmark manager, must not be {@code null}
81-
* @since 5.5
81+
* @since 5.6
8282
*/
8383
@Experimental
84-
BookmarkManager queryBookmarkManager();
84+
BookmarkManager queryTaskBookmarkManager();
8585

8686
/**
8787
* Return a flag to indicate whether or not encryption is used for this driver.

driver/src/main/java/org/neo4j/driver/internal/InternalDriver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public QueryTask queryTask(String query) {
7474
}
7575

7676
@Override
77-
public BookmarkManager queryBookmarkManager() {
77+
public BookmarkManager queryTaskBookmarkManager() {
7878
return queryBookmarkManager;
7979
}
8080

driver/src/main/java/org/neo4j/driver/internal/InternalQueryTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public <A, R, T> T execute(Collector<Record, A, R> recordCollector, ResultFinish
6161
var sessionConfigBuilder = SessionConfig.builder();
6262
config.database().ifPresent(sessionConfigBuilder::withDatabase);
6363
config.impersonatedUser().ifPresent(sessionConfigBuilder::withImpersonatedUser);
64-
config.bookmarkManager(driver.queryBookmarkManager()).ifPresent(sessionConfigBuilder::withBookmarkManager);
64+
config.bookmarkManager(driver.queryTaskBookmarkManager()).ifPresent(sessionConfigBuilder::withBookmarkManager);
6565
var supplier = recordCollector.supplier();
6666
var accumulator = recordCollector.accumulator();
6767
var finisher = recordCollector.finisher();

driver/src/test/java/org/neo4j/driver/internal/InternalQueryTaskTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ void shouldExecuteAndReturnResult(RoutingControl routingControl) {
118118
// GIVEN
119119
var driver = mock(Driver.class);
120120
var bookmarkManager = mock(BookmarkManager.class);
121-
given(driver.queryBookmarkManager()).willReturn(bookmarkManager);
121+
given(driver.queryTaskBookmarkManager()).willReturn(bookmarkManager);
122122
var session = mock(Session.class);
123123
given(driver.session(any(SessionConfig.class))).willReturn(session);
124124
var txContext = mock(TransactionContext.class);

0 commit comments

Comments
 (0)