diff --git a/pom.xml b/pom.xml index 7b36a51c5..a23d375ed 100644 --- a/pom.xml +++ b/pom.xml @@ -103,7 +103,7 @@ ${java.version} ${java.version} 2.28.2 - 4.0.0-beta02 + 4.0.0-beta03 3.5.8 3.0.1 UTF-8 diff --git a/spring-data-neo4j/src/main/java/org/neo4j/springframework/data/core/DefaultReactiveNeo4jClient.java b/spring-data-neo4j/src/main/java/org/neo4j/springframework/data/core/DefaultReactiveNeo4jClient.java index a07b92bc5..649f40ba4 100644 --- a/spring-data-neo4j/src/main/java/org/neo4j/springframework/data/core/DefaultReactiveNeo4jClient.java +++ b/spring-data-neo4j/src/main/java/org/neo4j/springframework/data/core/DefaultReactiveNeo4jClient.java @@ -269,7 +269,7 @@ class DefaultReactiveNeo4jClient implements ReactiveNeo4jClient { return doInStatementRunnerForMono( targetDatabase, - runner -> prepareStatement().flatMap(t -> Mono.from(runner.run(t.getT1(), t.getT2()).summary()))); + runner -> prepareStatement().flatMap(t -> Mono.from(runner.run(t.getT1(), t.getT2()).consume()))); } } diff --git a/spring-data-neo4j/src/test/java/org/neo4j/springframework/data/core/ReactiveNeo4jClientTest.java b/spring-data-neo4j/src/test/java/org/neo4j/springframework/data/core/ReactiveNeo4jClientTest.java index 54503acc4..102953ef3 100644 --- a/spring-data-neo4j/src/test/java/org/neo4j/springframework/data/core/ReactiveNeo4jClientTest.java +++ b/spring-data-neo4j/src/test/java/org/neo4j/springframework/data/core/ReactiveNeo4jClientTest.java @@ -348,7 +348,7 @@ class ReactiveNeo4jClientTest { when(transaction.run(anyString(), anyMap())).thenReturn(statementResult); when(transaction.commit()).thenReturn(Mono.empty()); - when(statementResult.summary()).thenReturn(Mono.just(resultSummary)); + when(statementResult.consume()).thenReturn(Mono.just(resultSummary)); ReactiveNeo4jClient client = ReactiveNeo4jClient.create(driver); @@ -373,7 +373,7 @@ class ReactiveNeo4jClientTest { expectedParameters.put("name", "Michael"); verify(transaction).run(eq(cypher), argThat(new MapAssertionMatcher(expectedParameters))); - verify(statementResult).summary(); + verify(statementResult).consume(); verify(transaction).commit(); verify(transaction).rollback(); verify(session).close(); @@ -420,7 +420,7 @@ class ReactiveNeo4jClientTest { when(transaction.run(anyString(), anyMap())).thenReturn(statementResult); when(transaction.commit()).thenReturn(Mono.empty()); - when(statementResult.summary()).thenReturn(Mono.just(resultSummary)); + when(statementResult.consume()).thenReturn(Mono.just(resultSummary)); ReactiveNeo4jClient client = ReactiveNeo4jClient.create(driver); @@ -441,7 +441,7 @@ class ReactiveNeo4jClientTest { expectedParameters.put("name", "fixie"); verify(transaction).run(eq(cypher), argThat(new MapAssertionMatcher(expectedParameters))); - verify(statementResult).summary(); + verify(statementResult).consume(); verify(transaction).commit(); verify(transaction).rollback(); verify(session).close(); diff --git a/spring-data-neo4j/src/test/kotlin/org/neo4j/springframework/data/integration/imperative/Neo4jClientKotlinInteropIT.kt b/spring-data-neo4j/src/test/kotlin/org/neo4j/springframework/data/integration/imperative/Neo4jClientKotlinInteropIT.kt index db7b59fd9..a56c458b1 100644 --- a/spring-data-neo4j/src/test/kotlin/org/neo4j/springframework/data/integration/imperative/Neo4jClientKotlinInteropIT.kt +++ b/spring-data-neo4j/src/test/kotlin/org/neo4j/springframework/data/integration/imperative/Neo4jClientKotlinInteropIT.kt @@ -63,10 +63,10 @@ class Neo4jClientKotlinInteropIT @Autowired constructor( bands.forEach { b, m -> val summary = it.run(""" - CREATE (b:Band {name: ${'$'}band}) - WITH b - UNWIND ${'$'}names AS name CREATE (n:Member {name: name}) <- [:HAS_MEMBER] - (b) - """.trimIndent(), Values.parameters("band", b, "names", m)).summary() + CREATE (b:Band {name: ${'$'}band}) + WITH b + UNWIND ${'$'}names AS name CREATE (n:Member {name: name}) <- [:HAS_MEMBER] - (b) + """.trimIndent(), Values.parameters("band", b, "names", m)).consume() assertThat(summary.counters().nodesCreated()).isGreaterThan(0) } } diff --git a/spring-data-neo4j/src/test/kotlin/org/neo4j/springframework/data/integration/reactive/ReactiveNeo4jClientKotlinInteropIT.kt b/spring-data-neo4j/src/test/kotlin/org/neo4j/springframework/data/integration/reactive/ReactiveNeo4jClientKotlinInteropIT.kt index 6ce47c40b..4d8390074 100644 --- a/spring-data-neo4j/src/test/kotlin/org/neo4j/springframework/data/integration/reactive/ReactiveNeo4jClientKotlinInteropIT.kt +++ b/spring-data-neo4j/src/test/kotlin/org/neo4j/springframework/data/integration/reactive/ReactiveNeo4jClientKotlinInteropIT.kt @@ -71,10 +71,10 @@ class ReactiveNeo4jClientKotlinInteropIT @Autowired constructor( bands.forEach { b, m -> val summary = it.run(""" - CREATE (b:Band {name: ${'$'}band}) - WITH b - UNWIND ${'$'}names AS name CREATE (n:Member {name: name}) <- [:HAS_MEMBER] - (b) - """.trimIndent(), Values.parameters("band", b, "names", m)).summary() + CREATE (b:Band {name: ${'$'}band}) + WITH b + UNWIND ${'$'}names AS name CREATE (n:Member {name: name}) <- [:HAS_MEMBER] - (b) + """.trimIndent(), Values.parameters("band", b, "names", m)).consume() assertThat(summary.counters().nodesCreated()).isGreaterThan(0) } }