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

Move off deprecated methods of PersistenPropertyPath.

Browse Source 
Fixes #2705.
This commit is contained in:
Oliver Drotbohm
2023-04-04 11:29:17 +02:00
parent c31bd5d7b0
commit 55337dec4d
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/springframework/data/neo4j/repository/query/CypherQueryCreator.java
View File

@@ -264,7 +264,7 @@ final class CypherQueryCreator extends AbstractQueryCreator<QueryFragmentsAndPar
private Condition createImpl(Part part, Iterator<Object> actualParameters) {
PersistentPropertyPath<Neo4jPersistentProperty> path = mappingContext.getPersistentPropertyPath(part.getProperty());
Neo4jPersistentProperty property = path.getRequiredLeafProperty();
Neo4jPersistentProperty property = path.getLeafProperty();
boolean ignoreCase = ignoreCase(part);
@@ -327,7 +327,7 @@ final class CypherQueryCreator extends AbstractQueryCreator<QueryFragmentsAndPar
Expression cypherProperty = toCypherProperty(path, ignoreCase);
if (property.isDynamicLabels()) {
Neo4jPersistentProperty leafProperty = path.getRequiredLeafProperty();
Neo4jPersistentProperty leafProperty = path.getLeafProperty();
Neo4jPersistentEntity<?> owner = (Neo4jPersistentEntity<?>) leafProperty.getOwner();
String containerName = getContainerName(path, owner);
return toCypherParameter(nextRequiredParameter(actualParameters, property), ignoreCase)
@@ -381,7 +381,7 @@ final class CypherQueryCreator extends AbstractQueryCreator<QueryFragmentsAndPar
private Condition createNearCondition(PersistentPropertyPath<Neo4jPersistentProperty> path, Iterator<Object> actualParameters) {
Neo4jPersistentProperty leafProperty = path.getRequiredLeafProperty();
Neo4jPersistentProperty leafProperty = path.getLeafProperty();
Parameter p1 = nextRequiredParameter(actualParameters, leafProperty);
Optional<Parameter> p2 = nextOptionalParameter(actualParameters, leafProperty);
@@ -418,7 +418,7 @@ final class CypherQueryCreator extends AbstractQueryCreator<QueryFragmentsAndPar
private Condition createWithinCondition(PersistentPropertyPath<Neo4jPersistentProperty> path, Iterator<Object> actualParameters) {
Neo4jPersistentProperty leafProperty = path.getRequiredLeafProperty();
Neo4jPersistentProperty leafProperty = path.getLeafProperty();
Parameter area = nextRequiredParameter(actualParameters, leafProperty);
if (area.hasValueOfType(Circle.class)) {
// We don't know the CRS of the point, so we assume the same as the reference toCypherProperty
@@ -477,7 +477,7 @@ final class CypherQueryCreator extends AbstractQueryCreator<QueryFragmentsAndPar
private Expression toCypherProperty(PersistentPropertyPath<Neo4jPersistentProperty> path, boolean addToLower) {
Neo4jPersistentProperty leafProperty = path.getRequiredLeafProperty();
Neo4jPersistentProperty leafProperty = path.getLeafProperty();
Neo4jPersistentEntity<?> owner = (Neo4jPersistentEntity<?>) leafProperty.getOwner();
Expression expression;

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

@@ -91,7 +91,7 @@ class PartValidator {
PersistentPropertyPath<Neo4jPersistentProperty> path = mappingContext
.getPersistentPropertyPath(part.getProperty());
Neo4jPersistentProperty property = path.getRequiredLeafProperty();
Neo4jPersistentProperty property = path.getLeafProperty();
Assert.isTrue(!property.isComposite(), "Can not derive query for '%s': Derived queries are not supported for composite properties");
}