From 55337dec4d94ffa5e63f07e592a1c46e29cee284 Mon Sep 17 00:00:00 2001
From: Oliver Drotbohm <odrotbohm@vmware.com>
Date: Tue, 4 Apr 2023 11:29:17 +0200
Subject: [PATCH] Move off deprecated methods of `PersistenPropertyPath`.

Fixes #2705.
---
 .../neo4j/repository/query/CypherQueryCreator.java     | 10 +++++-----
 .../data/neo4j/repository/query/PartValidator.java     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springframework/data/neo4j/repository/query/CypherQueryCreator.java b/src/main/java/org/springframework/data/neo4j/repository/query/CypherQueryCreator.java
index e6bef515b..b6f6e7b0f 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/query/CypherQueryCreator.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/query/CypherQueryCreator.java
@@ -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;
 
diff --git a/src/main/java/org/springframework/data/neo4j/repository/query/PartValidator.java b/src/main/java/org/springframework/data/neo4j/repository/query/PartValidator.java
index de086143b..40eb515b4 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/query/PartValidator.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/query/PartValidator.java
@@ -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");
 	}