GH-2661 - Detect entity in projection correctly.

There was a random picking of correct property paths
if they represented the very same length (1).
Added a `isEntity` filter to be sure that only the interesting
property paths get returned.

Closes #2661

Author: meistermeier

src/main/java/org/springframework/data/neo4j/core/mapping/PropertyFilter.java

@@ -100,7 +100,9 @@ public boolean contains(String dotPath, Class<?> typeToCheck) {
 			}
 
 			// create a sorted list of the deepest paths first
-			Optional<String> candidate = projectingPropertyPaths.stream().map(pp -> pp.propertyPath.toDotPath()).sorted((o1, o2) -> {
+			Optional<String> candidate = projectingPropertyPaths.stream()
+						.filter(pp -> pp.isEntity)
+						.map(pp -> pp.propertyPath.toDotPath()).sorted((o1, o2) -> {
 						int depth1 = StringUtils.countOccurrencesOf(o1, ".");
 						int depth2 = StringUtils.countOccurrencesOf(o2, ".");
 
@@ -109,12 +111,9 @@ public boolean contains(String dotPath, Class<?> typeToCheck) {
 					.filter(d -> dotPath.contains(d) && dotPath.startsWith(d))
 					.findFirst();
 
-			//noinspection OptionalGetWithoutIsPresent
 			return projectingPropertyPaths.stream().map(pp -> pp.propertyPath.toDotPath())
 						.anyMatch(ppDotPath -> ppDotPath.equals(dotPath))
-					|| (dotPath.contains(".") && candidate.isPresent() &&
-						projectingPropertyPaths.stream()
-						.filter(pp -> pp.propertyPath.toDotPath().equals(candidate.get())).findFirst().get().isEntity);
+					|| (dotPath.contains(".") && candidate.isPresent());
 		}
 
 		@Override