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

GH-2698 - Upgrade CypherDSL to 2023.2.0.

Browse Source 
Closes #2698.
This commit is contained in:
Michael Simons
2023-03-22 15:16:16 +01:00
parent d9a35eece6
commit 18bc92db29
9 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

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

4
src/main/java/org/springframework/data/neo4j/core/Neo4jTemplate.java
View File

@@ -1161,7 +1161,7 @@ public final class Neo4jTemplate implements
.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 @@ 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()

2
src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jTemplate.java
View File

@@ -714,7 +714,7 @@ public final class ReactiveNeo4jTemplate implements
.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)

2
src/main/java/org/springframework/data/neo4j/core/TemplateSupport.java
View File

@@ -159,7 +159,7 @@ public final class TemplateSupport {
*/
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);
}

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

@@ -84,7 +84,7 @@ final class CypherdslBasedQuery extends AbstractNeo4jQuery {
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 @@ 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());
}
}

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

@@ -126,7 +126,7 @@ public final class CypherdslConditionExecutorImpl<T> 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

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

@@ -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<String, Object> boundParameters = statement.getParameters();
Map<String, Object> boundParameters = statement.getCatalog().getParameters();
return PreparedQuery.queryFor(returnedType)
.withCypherQuery(statement.getCypher())
.withParameters(boundParameters)

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

@@ -113,7 +113,7 @@ public final class ReactiveCypherdslConditionExecutorImpl<T> 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

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

@@ -119,7 +119,7 @@ public final class ReactiveQuerydslNeo4jPredicateExecutor<T> 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