Skip to content

Setting most generic class for source of relationship #2527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Setting most generic class for source of relationship #2527

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
103c3c2
Test-Case for #2526 (Projecting rich relation for inherited nodes fails)
Andy2003 Nov 9, 2021
ad16b0b
Setting most generic class for source of relationship.
Andy2003 Apr 27, 2022
73261d4
Setting most generic class for source of relationship
Andy2003 Apr 29, 2022
6ada466
GH-2526 - extend tests
meistermeier May 9, 2022
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Setting most generic class for source of relationship 
resolves #2526
  • Loading branch information
@Andy2003
Andy2003 committed Apr 29, 2022
commit 73261d4b2482bc5e5fb8bb9511b581413ac0fbf9
15 changes: 9 additions & 6 deletions ...main/java/org/springframework/data/neo4j/core/mapping/DefaultRelationshipDescription.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import org.springframework.data.mapping.Association;
import org.springframework.data.neo4j.core.schema.Relationship;
import org.springframework.data.util.Lazy;
import org.springframework.lang.Nullable;

/**
Expand All @@ -27,13 +28,14 @@
* @author Andreas Berger
* @since 6.0
*/
final class DefaultRelationshipDescription extends Association<Neo4jPersistentProperty> implements RelationshipDescription {
final class DefaultRelationshipDescription extends Association<Neo4jPersistentProperty>
implements RelationshipDescription {

private final String type;

private final boolean dynamic;

private final NodeDescription<?> source;
private final Lazy<NodeDescription<?>> source;

private final NodeDescription<?> target;

Expand All @@ -56,7 +58,7 @@ final class DefaultRelationshipDescription extends Association<Neo4jPersistentPr
this.relationshipObverse = relationshipObverse;
this.type = type;
this.dynamic = dynamic;
this.source = getSourceForField(source, type, dynamic, target, direction, relationshipProperties);
this.source = Lazy.of(() -> getSourceForField(source, type, dynamic, target, direction, relationshipProperties));
this.fieldName = fieldName;
this.target = target;
this.direction = direction;
Expand Down Expand Up @@ -97,7 +99,7 @@ public NodeDescription<?> getTarget() {

@Override
public NodeDescription<?> getSource() {
return source;
return source.get();
}

@Override
Expand Down Expand Up @@ -150,8 +152,9 @@ public boolean equals(Object o) {
return false;
}
DefaultRelationshipDescription that = (DefaultRelationshipDescription) o;
return (isDynamic() ? getFieldName().equals(that.getFieldName()) : getType().equals(that.getType())) && getTarget().equals(that.getTarget())
&& getSource().equals(that.getSource()) && getDirection().equals(that.getDirection());
return (isDynamic() ? getFieldName().equals(that.getFieldName()) : getType().equals(that.getType()))
&& getTarget().equals(that.getTarget()) && getSource().equals(that.getSource())
&& getDirection().equals(that.getDirection());
}

@Override
Expand Down