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

GH-2655 - Fix false-positive cycle detection.

Browse Source 
If multiple base class extending entities contain the very same target,
it was reported as a cycle.
Now it will get correctly detected as a directed graph.

Closes #2655
This commit is contained in:
Gerrit Meier
2023-01-18 11:30:10 +01:00
parent 1ac36603f7
commit 1338ce979e
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -600,19 +600,24 @@ final class DefaultNeo4jPersistentEntity<T> extends BasicPersistentEntity<T, Neo
private boolean calculatePossibleCircles(NodeDescription<?> nodeDescription, Set<NodeDescription<?>> visitedNodes, Predicate<PropertyFilter.RelaxedPropertyPath> includeField, PropertyFilter.RelaxedPropertyPath path) {
Collection<RelationshipDescription> relationships = ((DefaultNeo4jPersistentEntity<?>) nodeDescription).getRelationshipsInHierarchy(includeField, path);
Collection<NodeDescription<?>> visitedTargetNodes = new HashSet<>();
for (RelationshipDescription relationship : relationships) {
NodeDescription<?> targetNode = relationship.getTarget();
if (visitedNodes.contains(targetNode)) {
return true;
}
visitedNodes.add(targetNode);
visitedTargetNodes.add(targetNode);
// Branch out again for the sub-tree with all previously visited nodes
Set<NodeDescription<?>> branchedVisitedNodes = new HashSet<>(visitedNodes);
// Add the already visited target nodes for the next level,
// but don't (!) add them to the visitedNodes yet.
// Otherwise, the same "parallel" defined target nodes will report a false circle.
branchedVisitedNodes.addAll(visitedTargetNodes);
if (calculatePossibleCircles(targetNode, branchedVisitedNodes, includeField, path.append(relationship.getFieldName()))) {
return true;
}
}
visitedNodes.addAll(visitedTargetNodes);
return false;
}
}