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

GH-2661 - Detect entity in projection correctly.

Browse Source 
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
This commit is contained in:
Gerrit Meier
2023-01-24 10:59:16 +01:00
parent 12aa93f23d
commit 4dc2084128
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,7 +100,9 @@ public abstract class PropertyFilter {
}
// 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 abstract class PropertyFilter {
.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