diff --git a/src/test/java/org/springframework/data/neo4j/integration/imperative/Neo4jClientIT.java b/src/test/java/org/springframework/data/neo4j/integration/imperative/Neo4jClientIT.java index 8bdda4491..7b44d0344 100644 --- a/src/test/java/org/springframework/data/neo4j/integration/imperative/Neo4jClientIT.java +++ b/src/test/java/org/springframework/data/neo4j/integration/imperative/Neo4jClientIT.java @@ -19,8 +19,7 @@ import org.junit.jupiter.api.BeforeEach; 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 @@ class Neo4jClientIT { 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 records = statement.fetchWith(client.getQueryRunner()); + List records = client.getQueryRunner().run(statement.getCypher()).list(); assertThat(records).hasSize(1) .first().extracting(r -> r.get("n").get("value").asLong()).isEqualTo(42L); diff --git a/src/test/java/org/springframework/data/neo4j/integration/versioned_self_references/TestBase.java b/src/test/java/org/springframework/data/neo4j/integration/versioned_self_references/TestBase.java index a7a3e8c21..1e465f582 100644 --- a/src/test/java/org/springframework/data/neo4j/integration/versioned_self_references/TestBase.java +++ b/src/test/java/org/springframework/data/neo4j/integration/versioned_self_references/TestBase.java @@ -34,7 +34,6 @@ import org.neo4j.cypherdsl.core.Cypher; 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 @@ abstract class TestBase { 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 @@ abstract class TestBase { .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 @@ abstract class TestBase { private void assertImpl(Long expectedVersion, ResultStatement resultStatement) { try (Session session = driver.session(bookmarkCapture.createSessionConfig())) { - List result = ExecutableStatement.makeExecutable(resultStatement).fetchWith(session); + List result = session.run(resultStatement.getCypher(), resultStatement.getCatalog().getParameters()).list(); assertThat(result).hasSize(1) .first().satisfies(record -> { long version = record.get(0).asLong();