GH-2647 - Upgrade Java Driver to 5.4.0

Closes #2647.

Author: michael-simons

pom.xml

@@ -101,7 +101,7 @@
 		<maven.compiler.release>${java.version}</maven.compiler.release>
 		<mockito>${mockito.version}</mockito>
 		<mockito.version>4.4.0</mockito.version>
-		<neo4j-java-driver.version>5.3.1</neo4j-java-driver.version>
+		<neo4j-java-driver.version>5.4.0</neo4j-java-driver.version>
 		<neo4j-migrations.version>1.13.1</neo4j-migrations.version>
 		<neo4j.version>4.4.8</neo4j.version>
 		<objenesis.version>3.0.1</objenesis.version>

src/test/java/org/springframework/data/neo4j/integration/conversion_imperative/compose_as_ids/CompositeIdsIT.java

@@ -69,7 +69,7 @@ public void prepareDatabase(@Autowired Driver driver, @Autowired BookmarkCapture
 		try (Session session = driver.session()) {
 			session.run("MATCH (n:ThingWithCompositeProperty) DETACH DELETE n").consume();
 			session.run("MATCH (n:ThingWithCompositeId) DETACH DELETE n").consume();
-			bookmarkCapture.seedWith(session.lastBookmark());
+			bookmarkCapture.seedWith(session.lastBookmarks());
 		}
 	}
 

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

@@ -64,7 +64,7 @@ protected void setupData(@Autowired Driver driver, @Autowired BookmarkCapture bo
 				var transaction = session.beginTransaction()) {
 			transaction.run("MATCH (n) detach delete n");
 			transaction.commit();
-			bookmarkCapture.seedWith(session.lastBookmark());
+			bookmarkCapture.seedWith(session.lastBookmarks());
 		}
 	}
 

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

@@ -1691,6 +1691,7 @@ void findAndMapMultipleLevelRelationshipProperties(
 		@Test
 		void updateAndCreateRelationshipProperties(@Autowired HobbyWithRelationshipWithPropertiesRepository repository) {
 
+			@SuppressWarnings("deprecation")
 			long hobbyId = doWithSession(
 					session -> session.run("CREATE (n:AltPerson{name:'Freddie'}), (n)-[l1:LIKES {rating: 5}]->(h1:AltHobby{name:'Music'}) RETURN n, h1").single().get("h1").asNode().id());
 

src/test/java/org/springframework/data/neo4j/integration/issues/events/EventsPublisherIT.java

@@ -65,7 +65,7 @@ void setupData(@Autowired Driver driver, @Autowired BookmarkCapture bookmarkCapt
 
 		try (Session session = driver.session()) {
 			session.run("MATCH (n) DETACH DELETE n").consume();
-			bookmarkCapture.seedWith(session.lastBookmark());
+			bookmarkCapture.seedWith(session.lastBookmarks());
 		}
 	}
 

src/test/java/org/springframework/data/neo4j/integration/issues/gh2640/PersistentPropertyCharacteristicsIT.java

@@ -61,7 +61,7 @@ void setupData(@Autowired Driver driver, @Autowired BookmarkCapture bookmarkCapt
 
 		try (Session session = driver.session()) {
 			session.run("MATCH (n) DETACH DELETE n").consume();
-			bookmarkCapture.seedWith(session.lastBookmark());
+			bookmarkCapture.seedWith(session.lastBookmarks());
 		}
 	}
 

src/test/java/org/springframework/data/neo4j/integration/issues/projections/NestedProjectionsIT.java

@@ -57,7 +57,7 @@ static void setupData(@Autowired Driver driver, @Autowired BookmarkCapture bookm
 		try (Session session = driver.session()) {
 			session.run("MATCH (n) DETACH DELETE n").consume();
 			session.run("CREATE (l:SourceNodeA {id: 'L-l1', version: 1})-[:A_TO_CENTRAL]->(e:CentralNode {id: 'E-l1', version: 1})<-[:B_TO_CENTRAL]-(c:SourceNodeB {id: 'C-l1', version: 1}) RETURN id(l)").consume();
-			bookmarkCapture.seedWith(session.lastBookmark());
+			bookmarkCapture.seedWith(session.lastBookmarks());
 		}
 	}
 
@@ -66,7 +66,7 @@ void clearChangedProperties(@Autowired Driver driver, @Autowired BookmarkCapture
 		try (Session session = driver.session()) {
 			session.run("MATCH (n:SourceNodeA) SET n.value = null").consume();
 			session.run("MATCH (n:CentralNode) SET n.name = null").consume();
-			bookmarkCapture.seedWith(session.lastBookmark());
+			bookmarkCapture.seedWith(session.lastBookmarks());
 		}
 	}
 

src/test/java/org/springframework/data/neo4j/integration/reactive/ReactiveCypherdslConditionExecutorIT.java

@@ -68,7 +68,7 @@ protected static void setupData(@Autowired BookmarkCapture bookmarkCapture) {
 					.run("CREATE (p:Person{firstName: 'Helge', lastName: 'Schneider'}) -[:LIVES_AT]-> (a:Address {city: 'Mülheim an der Ruhr'})");
 			transaction.run("CREATE (p:Person{firstName: 'Bela', lastName: 'B.'})");
 			transaction.commit();
-			bookmarkCapture.seedWith(session.lastBookmark());
+			bookmarkCapture.seedWith(session.lastBookmarks());
 		}
 	}
 

src/test/java/org/springframework/data/neo4j/integration/reactive/ReactiveDynamicLabelsIT.java

@@ -20,6 +20,7 @@
 import org.neo4j.cypherdsl.core.Functions;
 import org.neo4j.driver.TransactionContext;
 import org.junit.jupiter.api.RepeatedTest;
+import org.neo4j.driver.reactive.ReactiveSession;
 import org.springframework.data.neo4j.core.mapping.Neo4jMappingContext;
 import org.springframework.data.neo4j.integration.shared.common.CounterMetric;
 import org.springframework.data.neo4j.integration.shared.common.GaugeMetric;
@@ -480,7 +481,7 @@ protected final Flux<String> getLabels(Condition idCondition, Object id) {
 			String cypher = Renderer.getDefaultRenderer().render(Cypher.match(n).where(idCondition)
 					.and(n.property("moreLabels").isNull()).unwind(n.labels()).as("label").returning("label").build());
 			return Flux
-					.usingWhen(Mono.fromSupplier(() -> driver.reactiveSession(bookmarkCapture.createSessionConfig())),
+					.usingWhen(Mono.fromSupplier(() -> driver.session(ReactiveSession.class, bookmarkCapture.createSessionConfig())),
 							s -> JdkFlowAdapter.flowPublisherToFlux(s.run(cypher, Collections.singletonMap("id", id))).flatMap(r -> JdkFlowAdapter.flowPublisherToFlux(r.records())), rs -> JdkFlowAdapter.flowPublisherToFlux(rs.close()))
 					.map(r -> r.get("label").asString());
 		}