GH-2698 - Upgrade CypherDSL to 2023.2.0.

Closes #2698.

Author: michael-simons

pom.xml

@@ -77,7 +77,7 @@
 		<checkstyle.skip>${skipTests}</checkstyle.skip>
 		<checkstyle.version>8.40</checkstyle.version>
 		<classgraph.version>4.8.149</classgraph.version>
-		<cypher-dsl.version>2023.0.0</cypher-dsl.version>
+		<cypher-dsl.version>2023.2.0</cypher-dsl.version>
 		<dist.id>spring-data-neo4j</dist.id>
 		<dist.key>SDNEO4J</dist.key>
 		<flatten-maven-plugin.version>1.2.5</flatten-maven-plugin.version>

src/main/java/org/springframework/data/neo4j/core/Neo4jTemplate.java

@@ -1161,7 +1161,7 @@ private NodesAndRelationshipsByIdStatementProvider createNodesAndRelationshipsBy
 					.returning(Constants.NAME_OF_SYNTHESIZED_ROOT_NODE).build();
 
 			Map<String, Object> usedParameters = new HashMap<>(parameters);
-			usedParameters.putAll(rootNodesStatement.getParameters());
+			usedParameters.putAll(rootNodesStatement.getCatalog().getParameters());
 
 			final Collection<Long> rootNodeIds = new HashSet<>(neo4jClient
 					.query(renderer.render(rootNodesStatement))
@@ -1186,7 +1186,7 @@ private NodesAndRelationshipsByIdStatementProvider createNodesAndRelationshipsBy
 						.returning(cypherGenerator.createReturnStatementForMatch(entityMetaData)).build();
 
 				usedParameters = new HashMap<>(parameters);
-				usedParameters.putAll(statement.getParameters());
+				usedParameters.putAll(statement.getCatalog().getParameters());
 				neo4jClient.query(renderer.render(statement))
 						.bindAll(usedParameters)
 						.fetch()

src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jTemplate.java

@@ -714,7 +714,7 @@ private Mono<NodesAndRelationshipsByIdStatementProvider> createNodesAndRelations
 									.returning(cypherGenerator.createReturnStatementForMatch(entityMetaData)).build();
 
 							Map<String, Object> usedParameters = new HashMap<>(parameters);
-							usedParameters.putAll(statement.getParameters());
+							usedParameters.putAll(statement.getCatalog().getParameters());
 							return neo4jClient.query(renderer.render(statement))
 									.bindAll(usedParameters)
 									.fetchAs(TupleOfLongsHolder.class)

src/main/java/org/springframework/data/neo4j/core/TemplateSupport.java

@@ -159,7 +159,7 @@ static void updateVersionPropertyIfPossible(
 	 */
 	static Map<String, Object> mergeParameters(Statement statement, @Nullable Map<String, Object> parameters) {
 
-		Map<String, Object> mergedParameters = new HashMap<>(statement.getParameters());
+		Map<String, Object> mergedParameters = new HashMap<>(statement.getCatalog().getParameters());
 		if (parameters != null) {
 			mergedParameters.putAll(parameters);
 		}

src/main/java/org/springframework/data/neo4j/repository/query/CypherdslBasedQuery.java

@@ -84,7 +84,7 @@ protected <T> PreparedQuery<T> prepareQuery(Class<T> returnedType,
 			statement = (Statement) parameters[0];
 		}
 
-		Map<String, Object> boundParameters = statement.getParameters();
+		Map<String, Object> boundParameters = statement.getCatalog().getParameters();
 		return PreparedQuery.queryFor(returnedType)
 				.withCypherQuery(statement.getCypher())
 				.withParameters(boundParameters)
@@ -99,6 +99,6 @@ protected Optional<PreparedQuery<Long>> getCountQuery(Neo4jParameterAccessor par
 		Statement countStatement = (Statement) parameterAccessor.getValues()[1];
 		return Optional.of(PreparedQuery.queryFor(Long.class)
 				.withCypherQuery(countStatement.getCypher())
-				.withParameters(countStatement.getParameters()).build());
+				.withParameters(countStatement.getCatalog().getParameters()).build());
 	}
 }

src/main/java/org/springframework/data/neo4j/repository/query/CypherdslConditionExecutorImpl.java

@@ -126,7 +126,7 @@ public long count(Condition condition) {
 
 		Statement statement = CypherGenerator.INSTANCE.prepareMatchOf(this.metaData, condition)
 				.returning(Functions.count(asterisk())).build();
-		return this.neo4jOperations.count(statement, statement.getParameters());
+		return this.neo4jOperations.count(statement, statement.getCatalog().getParameters());
 	}
 
 	@Override

src/main/java/org/springframework/data/neo4j/repository/query/ReactiveCypherdslBasedQuery.java

@@ -66,7 +66,7 @@ protected <T> PreparedQuery<T> prepareQuery(Class<T> returnedType, Collection<Pr
 				"The first parameter to a Cypher based method must be a statement");
 		Statement statement = (Statement) parameters[0];
 
-		Map<String, Object> boundParameters = statement.getParameters();
+		Map<String, Object> boundParameters = statement.getCatalog().getParameters();
 		return PreparedQuery.queryFor(returnedType)
 				.withCypherQuery(statement.getCypher())
 				.withParameters(boundParameters)

src/main/java/org/springframework/data/neo4j/repository/query/ReactiveCypherdslConditionExecutorImpl.java

@@ -113,7 +113,7 @@ public Mono<Long> count(Condition condition) {
 
 		Statement statement = CypherGenerator.INSTANCE.prepareMatchOf(this.metaData, condition)
 				.returning(Functions.count(asterisk())).build();
-		return this.neo4jOperations.count(statement, statement.getParameters());
+		return this.neo4jOperations.count(statement, statement.getCatalog().getParameters());
 	}
 
 	@Override

src/main/java/org/springframework/data/neo4j/repository/query/ReactiveQuerydslNeo4jPredicateExecutor.java

@@ -119,7 +119,7 @@ public Mono<Long> count(Predicate predicate) {
 		Statement statement = CypherGenerator.INSTANCE.prepareMatchOf(this.metaData,
 						Cypher.adapt(predicate).asCondition())
 				.returning(Functions.count(asterisk())).build();
-		return this.neo4jOperations.count(statement, statement.getParameters());
+		return this.neo4jOperations.count(statement, statement.getCatalog().getParameters());
 	}
 
 	@Override