parameters);
/**
* Sets {@link QueryConfig}.
*
- * By default, {@link QueryTask} has {@link QueryConfig#defaultConfig()} value.
+ * By default, {@link ExecutableQuery} has {@link QueryConfig#defaultConfig()} value.
*
* @param config query config, must not be {@code null}
- * @return a new query task
+ * @return a new executable query
*/
- QueryTask withConfig(QueryConfig config);
+ ExecutableQuery withConfig(QueryConfig config);
/**
* Executes query, collects all results eagerly and returns a result.
diff --git a/driver/src/main/java/org/neo4j/driver/QueryConfig.java b/driver/src/main/java/org/neo4j/driver/QueryConfig.java
index 6c40c395f9..d9fd3dce8b 100644
--- a/driver/src/main/java/org/neo4j/driver/QueryConfig.java
+++ b/driver/src/main/java/org/neo4j/driver/QueryConfig.java
@@ -27,7 +27,7 @@
import org.neo4j.driver.util.Preview;
/**
- * Query configuration used by {@link Driver#queryTask(String)} and its variants.
+ * Query configuration used by {@link Driver#executableQuery(String)} and its variants.
* @since 5.5
*/
@Preview(name = "Driver Level Queries")
@@ -116,7 +116,6 @@ public Optional impersonatedUser() {
* Returns bookmark manager for the query.
*
* @param defaultBookmarkManager default bookmark manager to use when none has been configured explicitly,
- * {@link Config#queryTaskBookmarkManager()} as a default value by the driver
* @return bookmark manager
*/
public Optional bookmarkManager(BookmarkManager defaultBookmarkManager) {
diff --git a/driver/src/main/java/org/neo4j/driver/internal/DriverFactory.java b/driver/src/main/java/org/neo4j/driver/internal/DriverFactory.java
index 8a9056311f..1c9d682c68 100644
--- a/driver/src/main/java/org/neo4j/driver/internal/DriverFactory.java
+++ b/driver/src/main/java/org/neo4j/driver/internal/DriverFactory.java
@@ -275,8 +275,7 @@ protected InternalDriver createRoutingDriver(
*/
protected InternalDriver createDriver(
SecurityPlan securityPlan, SessionFactory sessionFactory, MetricsProvider metricsProvider, Config config) {
- return new InternalDriver(
- config.queryTaskBookmarkManager(), securityPlan, sessionFactory, metricsProvider, config.logging());
+ return new InternalDriver(securityPlan, sessionFactory, metricsProvider, config.logging());
}
/**
diff --git a/driver/src/main/java/org/neo4j/driver/internal/InternalDriver.java b/driver/src/main/java/org/neo4j/driver/internal/InternalDriver.java
index fc55eebc93..a5e9981c4c 100644
--- a/driver/src/main/java/org/neo4j/driver/internal/InternalDriver.java
+++ b/driver/src/main/java/org/neo4j/driver/internal/InternalDriver.java
@@ -25,13 +25,15 @@
import java.util.concurrent.atomic.AtomicBoolean;
import org.neo4j.driver.BaseSession;
import org.neo4j.driver.BookmarkManager;
+import org.neo4j.driver.BookmarkManagerConfig;
+import org.neo4j.driver.BookmarkManagers;
import org.neo4j.driver.Driver;
+import org.neo4j.driver.ExecutableQuery;
import org.neo4j.driver.Logger;
import org.neo4j.driver.Logging;
import org.neo4j.driver.Metrics;
import org.neo4j.driver.Query;
import org.neo4j.driver.QueryConfig;
-import org.neo4j.driver.QueryTask;
import org.neo4j.driver.Session;
import org.neo4j.driver.SessionConfig;
import org.neo4j.driver.async.AsyncSession;
@@ -47,7 +49,8 @@
import org.neo4j.driver.types.TypeSystem;
public class InternalDriver implements Driver {
- private final BookmarkManager queryBookmarkManager;
+ private final BookmarkManager queryBookmarkManager =
+ BookmarkManagers.defaultManager(BookmarkManagerConfig.builder().build());
private final SecurityPlan securityPlan;
private final SessionFactory sessionFactory;
private final Logger log;
@@ -56,12 +59,10 @@ public class InternalDriver implements Driver {
private final MetricsProvider metricsProvider;
InternalDriver(
- BookmarkManager queryBookmarkManager,
SecurityPlan securityPlan,
SessionFactory sessionFactory,
MetricsProvider metricsProvider,
Logging logging) {
- this.queryBookmarkManager = queryBookmarkManager;
this.securityPlan = securityPlan;
this.sessionFactory = sessionFactory;
this.metricsProvider = metricsProvider;
@@ -69,12 +70,12 @@ public class InternalDriver implements Driver {
}
@Override
- public QueryTask queryTask(String query) {
- return new InternalQueryTask(this, new Query(query), QueryConfig.defaultConfig());
+ public ExecutableQuery executableQuery(String query) {
+ return new InternalExecutableQuery(this, new Query(query), QueryConfig.defaultConfig());
}
@Override
- public BookmarkManager queryTaskBookmarkManager() {
+ public BookmarkManager executableQueryBookmarkManager() {
return queryBookmarkManager;
}
diff --git a/driver/src/main/java/org/neo4j/driver/internal/InternalQueryTask.java b/driver/src/main/java/org/neo4j/driver/internal/InternalExecutableQuery.java
similarity index 83%
rename from driver/src/main/java/org/neo4j/driver/internal/InternalQueryTask.java
rename to driver/src/main/java/org/neo4j/driver/internal/InternalExecutableQuery.java
index 11db4e76f5..85e918d576 100644
--- a/driver/src/main/java/org/neo4j/driver/internal/InternalQueryTask.java
+++ b/driver/src/main/java/org/neo4j/driver/internal/InternalExecutableQuery.java
@@ -23,19 +23,19 @@
import java.util.Map;
import java.util.stream.Collector;
import org.neo4j.driver.Driver;
+import org.neo4j.driver.ExecutableQuery;
import org.neo4j.driver.Query;
import org.neo4j.driver.QueryConfig;
-import org.neo4j.driver.QueryTask;
import org.neo4j.driver.Record;
import org.neo4j.driver.SessionConfig;
import org.neo4j.driver.TransactionCallback;
-public class InternalQueryTask implements QueryTask {
+public class InternalExecutableQuery implements ExecutableQuery {
private final Driver driver;
private final Query query;
private final QueryConfig config;
- public InternalQueryTask(Driver driver, Query query, QueryConfig config) {
+ public InternalExecutableQuery(Driver driver, Query query, QueryConfig config) {
requireNonNull(driver, "driver must not be null");
requireNonNull(query, "query must not be null");
requireNonNull(config, "config must not be null");
@@ -45,15 +45,15 @@ public InternalQueryTask(Driver driver, Query query, QueryConfig config) {
}
@Override
- public QueryTask withParameters(Map parameters) {
+ public ExecutableQuery withParameters(Map parameters) {
requireNonNull(parameters, "parameters must not be null");
- return new InternalQueryTask(driver, query.withParameters(parameters), config);
+ return new InternalExecutableQuery(driver, query.withParameters(parameters), config);
}
@Override
- public QueryTask withConfig(QueryConfig config) {
+ public ExecutableQuery withConfig(QueryConfig config) {
requireNonNull(config, "config must not be null");
- return new InternalQueryTask(driver, query, config);
+ return new InternalExecutableQuery(driver, query, config);
}
@Override
@@ -61,7 +61,8 @@ public T execute(Collector recordCollector, ResultFinish
var sessionConfigBuilder = SessionConfig.builder();
config.database().ifPresent(sessionConfigBuilder::withDatabase);
config.impersonatedUser().ifPresent(sessionConfigBuilder::withImpersonatedUser);
- config.bookmarkManager(driver.queryTaskBookmarkManager()).ifPresent(sessionConfigBuilder::withBookmarkManager);
+ config.bookmarkManager(driver.executableQueryBookmarkManager())
+ .ifPresent(sessionConfigBuilder::withBookmarkManager);
var supplier = recordCollector.supplier();
var accumulator = recordCollector.accumulator();
var finisher = recordCollector.finisher();
diff --git a/driver/src/test/java/org/neo4j/driver/ConfigTest.java b/driver/src/test/java/org/neo4j/driver/ConfigTest.java
index c105cce4c5..f07089b1e6 100644
--- a/driver/src/test/java/org/neo4j/driver/ConfigTest.java
+++ b/driver/src/test/java/org/neo4j/driver/ConfigTest.java
@@ -52,37 +52,6 @@
import org.neo4j.driver.testutil.TestUtil;
class ConfigTest {
- @Test
- void shouldReturnDefaultBookmarkManager() {
- // Given
- var config = Config.defaultConfig();
-
- // When
- var manager = config.queryTaskBookmarkManager();
-
- // Then
- assertEquals(
- BookmarkManagers.defaultManager(BookmarkManagerConfig.builder().build())
- .getClass(),
- manager.getClass());
- }
-
- @Test
- void shouldUpdateBookmarkManager() {
- // Given
- var manager = mock(BookmarkManager.class);
-
- // When
- var config = Config.builder().withQueryTaskBookmarkManager(manager).build();
-
- // Then
- assertEquals(manager, config.queryTaskBookmarkManager());
- }
-
- @Test
- void shouldNotAllowNullBookmarkManager() {
- assertThrows(NullPointerException.class, () -> Config.builder().withQueryTaskBookmarkManager(null));
- }
@Test
void shouldDefaultToKnownCerts() {
diff --git a/driver/src/test/java/org/neo4j/driver/internal/InternalDriverTest.java b/driver/src/test/java/org/neo4j/driver/internal/InternalDriverTest.java
index b6805fd74d..71626faa01 100644
--- a/driver/src/test/java/org/neo4j/driver/internal/InternalDriverTest.java
+++ b/driver/src/test/java/org/neo4j/driver/internal/InternalDriverTest.java
@@ -35,8 +35,6 @@
import java.util.Collections;
import java.util.concurrent.CompletableFuture;
import org.junit.jupiter.api.Test;
-import org.neo4j.driver.BookmarkManagerConfig;
-import org.neo4j.driver.BookmarkManagers;
import org.neo4j.driver.Config;
import org.neo4j.driver.Metrics;
import org.neo4j.driver.QueryConfig;
@@ -116,29 +114,25 @@ void shouldReturnMetricsIfMetricsEnabled() {
}
@Test
- void shouldCreateQueryTask() {
+ void shouldCreateExecutableQuery() {
// Given
var driver = newDriver(true);
var query = "string";
// When
- var queryTask = (InternalQueryTask) driver.queryTask(query);
+ var executableQuery = (InternalExecutableQuery) driver.executableQuery(query);
// Then
- assertNotNull(queryTask);
- assertEquals(driver, queryTask.driver());
- assertEquals(query, queryTask.query());
- assertEquals(Collections.emptyMap(), queryTask.parameters());
- assertEquals(QueryConfig.defaultConfig(), queryTask.config());
+ assertNotNull(executableQuery);
+ assertEquals(driver, executableQuery.driver());
+ assertEquals(query, executableQuery.query());
+ assertEquals(Collections.emptyMap(), executableQuery.parameters());
+ assertEquals(QueryConfig.defaultConfig(), executableQuery.config());
}
private static InternalDriver newDriver(SessionFactory sessionFactory) {
return new InternalDriver(
- BookmarkManagers.defaultManager(BookmarkManagerConfig.builder().build()),
- SecurityPlanImpl.insecure(),
- sessionFactory,
- DevNullMetricsProvider.INSTANCE,
- DEV_NULL_LOGGING);
+ SecurityPlanImpl.insecure(), sessionFactory, DevNullMetricsProvider.INSTANCE, DEV_NULL_LOGGING);
}
private static SessionFactory sessionFactoryMock() {
@@ -155,11 +149,6 @@ private static InternalDriver newDriver(boolean isMetricsEnabled) {
}
MetricsProvider metricsProvider = DriverFactory.getOrCreateMetricsProvider(config, Clock.systemUTC());
- return new InternalDriver(
- BookmarkManagers.defaultManager(BookmarkManagerConfig.builder().build()),
- SecurityPlanImpl.insecure(),
- sessionFactory,
- metricsProvider,
- DEV_NULL_LOGGING);
+ return new InternalDriver(SecurityPlanImpl.insecure(), sessionFactory, metricsProvider, DEV_NULL_LOGGING);
}
}
diff --git a/driver/src/test/java/org/neo4j/driver/internal/InternalQueryTaskTest.java b/driver/src/test/java/org/neo4j/driver/internal/InternalExecutableQueryTest.java
similarity index 78%
rename from driver/src/test/java/org/neo4j/driver/internal/InternalQueryTaskTest.java
rename to driver/src/test/java/org/neo4j/driver/internal/InternalExecutableQueryTest.java
index 8be3702bbc..2c1fc78c30 100644
--- a/driver/src/test/java/org/neo4j/driver/internal/InternalQueryTaskTest.java
+++ b/driver/src/test/java/org/neo4j/driver/internal/InternalExecutableQueryTest.java
@@ -38,9 +38,9 @@
import org.mockito.ArgumentCaptor;
import org.neo4j.driver.BookmarkManager;
import org.neo4j.driver.Driver;
+import org.neo4j.driver.ExecutableQuery;
import org.neo4j.driver.Query;
import org.neo4j.driver.QueryConfig;
-import org.neo4j.driver.QueryTask;
import org.neo4j.driver.Record;
import org.neo4j.driver.Result;
import org.neo4j.driver.RoutingControl;
@@ -50,31 +50,33 @@
import org.neo4j.driver.TransactionContext;
import org.neo4j.driver.summary.ResultSummary;
-class InternalQueryTaskTest {
+class InternalExecutableQueryTest {
@Test
void shouldNotAcceptNullDriverOnInstantiation() {
assertThrows(
NullPointerException.class,
- () -> new InternalQueryTask(null, new Query("string"), QueryConfig.defaultConfig()));
+ () -> new InternalExecutableQuery(null, new Query("string"), QueryConfig.defaultConfig()));
}
@Test
void shouldNotAcceptNullQueryOnInstantiation() {
assertThrows(
NullPointerException.class,
- () -> new InternalQueryTask(mock(Driver.class), null, QueryConfig.defaultConfig()));
+ () -> new InternalExecutableQuery(mock(Driver.class), null, QueryConfig.defaultConfig()));
}
@Test
void shouldNotAcceptNullConfigOnInstantiation() {
assertThrows(
- NullPointerException.class, () -> new InternalQueryTask(mock(Driver.class), new Query("string"), null));
+ NullPointerException.class,
+ () -> new InternalExecutableQuery(mock(Driver.class), new Query("string"), null));
}
@Test
void shouldNotAcceptNullParameters() {
- var queryTask = new InternalQueryTask(mock(Driver.class), new Query("string"), QueryConfig.defaultConfig());
- assertThrows(NullPointerException.class, () -> queryTask.withParameters(null));
+ var executableQuery =
+ new InternalExecutableQuery(mock(Driver.class), new Query("string"), QueryConfig.defaultConfig());
+ assertThrows(NullPointerException.class, () -> executableQuery.withParameters(null));
}
@Test
@@ -82,33 +84,34 @@ void shouldUpdateParameters() {
// GIVEN
var query = new Query("string");
var params = Map.of("$param", "value");
- var queryTask = new InternalQueryTask(mock(Driver.class), query, QueryConfig.defaultConfig());
+ var executableQuery = new InternalExecutableQuery(mock(Driver.class), query, QueryConfig.defaultConfig());
// WHEN
- queryTask = (InternalQueryTask) queryTask.withParameters(params);
+ executableQuery = (InternalExecutableQuery) executableQuery.withParameters(params);
// THEN
- assertEquals(params, queryTask.parameters());
+ assertEquals(params, executableQuery.parameters());
}
@Test
void shouldNotAcceptNullConfig() {
- var queryTask = new InternalQueryTask(mock(Driver.class), new Query("string"), QueryConfig.defaultConfig());
- assertThrows(NullPointerException.class, () -> queryTask.withConfig(null));
+ var executableQuery =
+ new InternalExecutableQuery(mock(Driver.class), new Query("string"), QueryConfig.defaultConfig());
+ assertThrows(NullPointerException.class, () -> executableQuery.withConfig(null));
}
@Test
void shouldUpdateConfig() {
// GIVEN
var query = new Query("string");
- var queryTask = new InternalQueryTask(mock(Driver.class), query, QueryConfig.defaultConfig());
+ var executableQuery = new InternalExecutableQuery(mock(Driver.class), query, QueryConfig.defaultConfig());
var config = QueryConfig.builder().withDatabase("database").build();
// WHEN
- queryTask = (InternalQueryTask) queryTask.withConfig(config);
+ executableQuery = (InternalExecutableQuery) executableQuery.withConfig(config);
// THEN
- assertEquals(config, queryTask.config());
+ assertEquals(config, executableQuery.config());
}
@ParameterizedTest
@@ -118,7 +121,7 @@ void shouldExecuteAndReturnResult(RoutingControl routingControl) {
// GIVEN
var driver = mock(Driver.class);
var bookmarkManager = mock(BookmarkManager.class);
- given(driver.queryTaskBookmarkManager()).willReturn(bookmarkManager);
+ given(driver.executableQueryBookmarkManager()).willReturn(bookmarkManager);
var session = mock(Session.class);
given(driver.session(any(SessionConfig.class))).willReturn(session);
var txContext = mock(TransactionContext.class);
@@ -156,14 +159,14 @@ var record = mock(Record.class);
Function finisher = mock(Function.class);
given(finisher.apply(resultContainer)).willReturn(collectorResult);
given(recordCollector.finisher()).willReturn(finisher);
- QueryTask.ResultFinisher finisherWithSummary = mock(QueryTask.ResultFinisher.class);
+ ExecutableQuery.ResultFinisher finisherWithSummary = mock(ExecutableQuery.ResultFinisher.class);
var expectedExecuteResult = "1";
given(finisherWithSummary.finish(any(List.class), any(String.class), any(ResultSummary.class)))
.willReturn(expectedExecuteResult);
- var queryTask = new InternalQueryTask(driver, query, config).withParameters(params);
+ var executableQuery = new InternalExecutableQuery(driver, query, config).withParameters(params);
// WHEN
- var executeResult = queryTask.execute(recordCollector, finisherWithSummary);
+ var executeResult = executableQuery.execute(recordCollector, finisherWithSummary);
// THEN
ArgumentCaptor sessionConfigCapture = ArgumentCaptor.forClass(SessionConfig.class);
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ExecuteQuery.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ExecuteQuery.java
index 4def2736fa..bfc75a7931 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ExecuteQuery.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ExecuteQuery.java
@@ -65,7 +65,7 @@ public TestkitResponse process(TestkitState testkitState) {
configBuilder.withBookmarkManager(bookmarkManager);
}
var params = data.getParams() != null ? data.getParams() : Collections.emptyMap();
- var eagerResult = driver.queryTask(data.getCypher())
+ var eagerResult = driver.executableQuery(data.getCypher())
.withParameters(params)
.withConfig(configBuilder.build())
.execute();