Spring/spring-data-neo4j
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Driver 4.0.0-beta03.

Browse Source 
This closes #97.
This commit is contained in:
Michael Simons
2019-11-15 06:54:40 +01:00
committed by GitHub
parent 97b600c2eb
commit 452d7a24f2
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -103,7 +103,7 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<mockito.version>2.28.2</mockito.version>
<neo4j-java-driver.version>4.0.0-beta02</neo4j-java-driver.version>
<neo4j-java-driver.version>4.0.0-beta03</neo4j-java-driver.version>
<neo4j.version>3.5.8</neo4j.version>
<objenesis.version>3.0.1</objenesis.version> <!-- mockk requires objenesis >= 3 -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

2
spring-data-neo4j/src/main/java/org/neo4j/springframework/data/core/DefaultReactiveNeo4jClient.java
View File

@@ -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())));
}
}

8
spring-data-neo4j/src/test/java/org/neo4j/springframework/data/core/ReactiveNeo4jClientTest.java
View File

@@ -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();

8
spring-data-neo4j/src/test/kotlin/org/neo4j/springframework/data/integration/imperative/Neo4jClientKotlinInteropIT.kt
View File

@@ -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)
}
}

8
spring-data-neo4j/src/test/kotlin/org/neo4j/springframework/data/integration/reactive/ReactiveNeo4jClientKotlinInteropIT.kt
View File

@@ -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)
}
}