From 18bc92db29fac432a368b655e1364a0dabd30315 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 22 Mar 2023 15:16:16 +0100 Subject: [PATCH] GH-2698 - Upgrade CypherDSL to 2023.2.0. Closes #2698. --- pom.xml | 2 +- .../org/springframework/data/neo4j/core/Neo4jTemplate.java | 4 ++-- .../data/neo4j/core/ReactiveNeo4jTemplate.java | 2 +- .../org/springframework/data/neo4j/core/TemplateSupport.java | 2 +- .../data/neo4j/repository/query/CypherdslBasedQuery.java | 4 ++-- .../repository/query/CypherdslConditionExecutorImpl.java | 2 +- .../neo4j/repository/query/ReactiveCypherdslBasedQuery.java | 2 +- .../query/ReactiveCypherdslConditionExecutorImpl.java | 2 +- .../query/ReactiveQuerydslNeo4jPredicateExecutor.java | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 565028454..b65df92ed 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ ${skipTests} 8.40 4.8.149 - 2023.0.0 + 2023.2.0 spring-data-neo4j SDNEO4J 1.2.5 diff --git a/src/main/java/org/springframework/data/neo4j/core/Neo4jTemplate.java b/src/main/java/org/springframework/data/neo4j/core/Neo4jTemplate.java index 4fc728fc7..078ea1ac1 100644 --- a/src/main/java/org/springframework/data/neo4j/core/Neo4jTemplate.java +++ b/src/main/java/org/springframework/data/neo4j/core/Neo4jTemplate.java @@ -1161,7 +1161,7 @@ public final class Neo4jTemplate implements .returning(Constants.NAME_OF_SYNTHESIZED_ROOT_NODE).build(); Map usedParameters = new HashMap<>(parameters); - usedParameters.putAll(rootNodesStatement.getParameters()); + usedParameters.putAll(rootNodesStatement.getCatalog().getParameters()); final Collection rootNodeIds = new HashSet<>(neo4jClient .query(renderer.render(rootNodesStatement)) @@ -1186,7 +1186,7 @@ public final class Neo4jTemplate implements .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() diff --git a/src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jTemplate.java b/src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jTemplate.java index c33665f6d..2cf3bd0e9 100644 --- a/src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jTemplate.java +++ b/src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jTemplate.java @@ -714,7 +714,7 @@ public final class ReactiveNeo4jTemplate implements .returning(cypherGenerator.createReturnStatementForMatch(entityMetaData)).build(); Map usedParameters = new HashMap<>(parameters); - usedParameters.putAll(statement.getParameters()); + usedParameters.putAll(statement.getCatalog().getParameters()); return neo4jClient.query(renderer.render(statement)) .bindAll(usedParameters) .fetchAs(TupleOfLongsHolder.class) diff --git a/src/main/java/org/springframework/data/neo4j/core/TemplateSupport.java b/src/main/java/org/springframework/data/neo4j/core/TemplateSupport.java index bceab0821..2073da0b3 100644 --- a/src/main/java/org/springframework/data/neo4j/core/TemplateSupport.java +++ b/src/main/java/org/springframework/data/neo4j/core/TemplateSupport.java @@ -159,7 +159,7 @@ public final class TemplateSupport { */ static Map mergeParameters(Statement statement, @Nullable Map parameters) { - Map mergedParameters = new HashMap<>(statement.getParameters()); + Map mergedParameters = new HashMap<>(statement.getCatalog().getParameters()); if (parameters != null) { mergedParameters.putAll(parameters); } diff --git a/src/main/java/org/springframework/data/neo4j/repository/query/CypherdslBasedQuery.java b/src/main/java/org/springframework/data/neo4j/repository/query/CypherdslBasedQuery.java index 1381686f8..17af00d2a 100644 --- a/src/main/java/org/springframework/data/neo4j/repository/query/CypherdslBasedQuery.java +++ b/src/main/java/org/springframework/data/neo4j/repository/query/CypherdslBasedQuery.java @@ -84,7 +84,7 @@ final class CypherdslBasedQuery extends AbstractNeo4jQuery { statement = (Statement) parameters[0]; } - Map boundParameters = statement.getParameters(); + Map boundParameters = statement.getCatalog().getParameters(); return PreparedQuery.queryFor(returnedType) .withCypherQuery(statement.getCypher()) .withParameters(boundParameters) @@ -99,6 +99,6 @@ final class CypherdslBasedQuery extends AbstractNeo4jQuery { 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()); } } diff --git a/src/main/java/org/springframework/data/neo4j/repository/query/CypherdslConditionExecutorImpl.java b/src/main/java/org/springframework/data/neo4j/repository/query/CypherdslConditionExecutorImpl.java index d1fb637af..8e48344ed 100644 --- a/src/main/java/org/springframework/data/neo4j/repository/query/CypherdslConditionExecutorImpl.java +++ b/src/main/java/org/springframework/data/neo4j/repository/query/CypherdslConditionExecutorImpl.java @@ -126,7 +126,7 @@ public final class CypherdslConditionExecutorImpl implements CypherdslConditi 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 diff --git a/src/main/java/org/springframework/data/neo4j/repository/query/ReactiveCypherdslBasedQuery.java b/src/main/java/org/springframework/data/neo4j/repository/query/ReactiveCypherdslBasedQuery.java index 3da64d9dd..9679be823 100644 --- a/src/main/java/org/springframework/data/neo4j/repository/query/ReactiveCypherdslBasedQuery.java +++ b/src/main/java/org/springframework/data/neo4j/repository/query/ReactiveCypherdslBasedQuery.java @@ -66,7 +66,7 @@ final class ReactiveCypherdslBasedQuery extends AbstractReactiveNeo4jQuery { "The first parameter to a Cypher based method must be a statement"); Statement statement = (Statement) parameters[0]; - Map boundParameters = statement.getParameters(); + Map boundParameters = statement.getCatalog().getParameters(); return PreparedQuery.queryFor(returnedType) .withCypherQuery(statement.getCypher()) .withParameters(boundParameters) diff --git a/src/main/java/org/springframework/data/neo4j/repository/query/ReactiveCypherdslConditionExecutorImpl.java b/src/main/java/org/springframework/data/neo4j/repository/query/ReactiveCypherdslConditionExecutorImpl.java index b509a2de2..a1f7d5272 100644 --- a/src/main/java/org/springframework/data/neo4j/repository/query/ReactiveCypherdslConditionExecutorImpl.java +++ b/src/main/java/org/springframework/data/neo4j/repository/query/ReactiveCypherdslConditionExecutorImpl.java @@ -113,7 +113,7 @@ public final class ReactiveCypherdslConditionExecutorImpl implements Reactive 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 diff --git a/src/main/java/org/springframework/data/neo4j/repository/query/ReactiveQuerydslNeo4jPredicateExecutor.java b/src/main/java/org/springframework/data/neo4j/repository/query/ReactiveQuerydslNeo4jPredicateExecutor.java index 8960c612c..b7e7ff7dc 100644 --- a/src/main/java/org/springframework/data/neo4j/repository/query/ReactiveQuerydslNeo4jPredicateExecutor.java +++ b/src/main/java/org/springframework/data/neo4j/repository/query/ReactiveQuerydslNeo4jPredicateExecutor.java @@ -119,7 +119,7 @@ public final class ReactiveQuerydslNeo4jPredicateExecutor implements Reactive 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