refactor: Remove usage of Cypher-DSL driver integrations.

Signed-off-by: Michael Simons <[email protected]>

Author: michael-simons

src/test/java/org/springframework/data/neo4j/integration/imperative/Neo4jClientIT.java

@@ -19,8 +19,7 @@
 import org.junit.jupiter.api.Test;
 import org.neo4j.cypherdsl.core.Cypher;
 import org.neo4j.cypherdsl.core.Node;
-import org.neo4j.cypherdsl.core.executables.ExecutableResultStatement;
-import org.neo4j.cypherdsl.core.executables.ExecutableStatement;
+import org.neo4j.cypherdsl.core.Statement;
 import org.neo4j.driver.Driver;
 import org.neo4j.driver.Record;
 import org.neo4j.driver.Session;
@@ -75,12 +74,12 @@ void clientShouldIntegrateWithCypherDSL(@Autowired TransactionTemplate transacti
 
 		Node namedAnswer = Cypher.node("TheAnswer", Cypher.mapOf("value",
 				Cypher.literalOf(23).multiply(Cypher.literalOf(2)).subtract(Cypher.literalOf(4)))).named("n");
-		ExecutableResultStatement statement = ExecutableStatement.makeExecutable(Cypher.create(namedAnswer)
+		Statement statement = Cypher.create(namedAnswer)
 				.returning(namedAnswer)
-				.build());
+				.build();
 
 		Long vanishedId = transactionTemplate.execute(transactionStatus -> {
-			List<Record> records = statement.fetchWith(client.getQueryRunner());
+			List<Record> records = client.getQueryRunner().run(statement.getCypher()).list();
 			assertThat(records).hasSize(1)
 					.first().extracting(r -> r.get("n").get("value").asLong()).isEqualTo(42L);
 

src/test/java/org/springframework/data/neo4j/integration/versioned_self_references/TestBase.java

@@ -34,7 +34,6 @@
 
 import org.neo4j.cypherdsl.core.Node;
 import org.neo4j.cypherdsl.core.ResultStatement;
-import org.neo4j.cypherdsl.core.executables.ExecutableStatement;
 import org.neo4j.driver.Driver;
 import org.neo4j.driver.Record;
 import org.neo4j.driver.Session;
@@ -140,7 +139,7 @@ Long createInstance(Class<?> type) {
 				statement = Cypher.create(nodeTemplate).returning(nodeTemplate.internalId()).build();
 			}
 
-			long id = ExecutableStatement.makeExecutable(statement).fetchWith(tx).get(0).get(0).asLong();
+			long id = tx.run(statement.getCypher(), statement.getCatalog().getParameters()).single().get(0).asLong();
 
 			tx.commit();
 			return id;
@@ -182,7 +181,7 @@ long[] createRelatedInstances(Class<?> type) {
 						.build();
 			}
 
-			Record record = ExecutableStatement.makeExecutable(statement).fetchWith(tx).get(0);
+			Record record = tx.run(statement.getCypher(), statement.getCatalog().getParameters()).single();
 			long id1 = record.get(0).asLong();
 			long id2 = record.get(1).asLong();
 
@@ -270,7 +269,7 @@ private void assertInternal(Long expectedVersion, Class<?> type, Long id) {
 
 	private void assertImpl(Long expectedVersion, ResultStatement resultStatement) {
 		try (Session session = driver.session(bookmarkCapture.createSessionConfig())) {
-			List<Record> result = ExecutableStatement.makeExecutable(resultStatement).fetchWith(session);
+			List<Record> result = session.run(resultStatement.getCypher(), resultStatement.getCatalog().getParameters()).list();
 			assertThat(result).hasSize(1)
 					.first().satisfies(record -> {
 						long version = record.get(0).asLong();