DATAGRAPH-1434 - Fix naming of relationships in query.

Author: meistermeier

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

@@ -566,8 +566,10 @@ private void generateListFor(RelationshipDescription relationshipDescription, Sy
 
 		String relationshipType = relationshipDescription.getType();
 		String relationshipTargetName = relationshipDescription.generateRelatedNodesCollectionName();
+		String sourcePrimaryLabel = relationshipDescription.getSource().getPrimaryLabel();
 		String targetPrimaryLabel = relationshipDescription.getTarget().getPrimaryLabel();
 		List<String> targetAdditionalLabels = relationshipDescription.getTarget().getAdditionalLabels();
+		String relationshipSymbolicName = sourcePrimaryLabel + RelationshipDescription.NAME_OF_RELATIONSHIP + targetPrimaryLabel;
 
 		Node startNode = anyNode(nodeName);
 		SymbolicName relationshipFieldName = nodeName.concat("_" + fieldName);
@@ -586,7 +588,7 @@ private void generateListFor(RelationshipDescription relationshipDescription, Sy
 					new ArrayList<>(processedRelationships));
 
 			if (relationshipDescription.hasRelationshipProperties()) {
-				relationship = relationship.named(RelationshipDescription.NAME_OF_RELATIONSHIP);
+				relationship = relationship.named(relationshipSymbolicName);
 				mapProjection = mapProjection.and(relationship);
 			}
 
@@ -604,7 +606,7 @@ private void generateListFor(RelationshipDescription relationshipDescription, Sy
 					new ArrayList<>(processedRelationships));
 
 			if (relationshipDescription.hasRelationshipProperties()) {
-				relationship = relationship.named(RelationshipDescription.NAME_OF_RELATIONSHIP);
+				relationship = relationship.named(relationshipSymbolicName);
 				mapProjection = mapProjection.and(relationship);
 			}
 

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

@@ -356,6 +356,7 @@ private Optional<Object> createInstanceOfRelationships(Neo4jPersistentProperty p
 				.filter(r -> r.getFieldName().equals(persistentProperty.getName())).findFirst().get();
 
 		String relationshipType = relationshipDescription.getType();
+		String sourceLabel = relationshipDescription.getSource().getPrimaryLabel();
 		String targetLabel = relationshipDescription.getTarget().getPrimaryLabel();
 
 		Neo4jPersistentEntity<?> genericTargetNodeDescription = (Neo4jPersistentEntity<?>) relationshipDescription
@@ -491,7 +492,9 @@ private Optional<Object> createInstanceOfRelationships(Neo4jPersistentProperty p
 				Object valueEntry = map(relatedEntity, allValues, concreteTargetNodeDescription, knownObjects, processedSegments);
 
 				if (relationshipDescription.hasRelationshipProperties()) {
-					Relationship relatedEntityRelationship = relatedEntity.get(RelationshipDescription.NAME_OF_RELATIONSHIP)
+					String relationshipSymbolicName = sourceLabel
+							+ RelationshipDescription.NAME_OF_RELATIONSHIP + targetLabel;
+					Relationship relatedEntityRelationship = relatedEntity.get(relationshipSymbolicName)
 							.asRelationship();
 
 					Object relationshipProperties = map(relatedEntityRelationship, allValues,

src/test/java/org/springframework/data/neo4j/integration/imperative/RepositoryIT.java

@@ -91,6 +91,7 @@
 import org.springframework.data.neo4j.integration.shared.common.DtoPersonProjection;
 import org.springframework.data.neo4j.integration.shared.common.DtoPersonProjectionContainingAdditionalFields;
 import org.springframework.data.neo4j.integration.shared.common.EntityWithConvertedId;
+import org.springframework.data.neo4j.integration.shared.common.EntityWithRelationshipPropertiesPath;
 import org.springframework.data.neo4j.integration.shared.common.ExtendedParentNode;
 import org.springframework.data.neo4j.integration.shared.common.Friend;
 import org.springframework.data.neo4j.integration.shared.common.FriendshipRelationship;
@@ -1392,6 +1393,27 @@ void loadSameNodeWithDoubleRelationship(@Autowired HobbyWithRelationshipWithProp
 
 			assertThat(likedBy).containsExactlyInAnyOrder(rel1, rel2);
 		}
+
+		@Test // DATAGRAPH-1434
+		void findAndMapMultipleLevelRelationshipProperties(
+				@Autowired EntityWithRelationshipPropertiesPathRepository repository) {
+
+			long eId;
+
+			try (Session session = createSession()) {
+				eId = session.run("CREATE (n:EntityWithRelationshipPropertiesPath)-[:RelationshipA]->(:EntityA)" +
+						"-[:RelationshipB]->(:EntityB)" +
+						" RETURN id(n) as eId").single().get("eId").asLong();
+			}
+
+			EntityWithRelationshipPropertiesPath entity = repository.findById(eId).get();
+			assertThat(entity).isNotNull();
+			assertThat(entity.getRelationshipA()).isNotNull();
+			assertThat(entity.getRelationshipA().getEntityA()).isNotNull();
+			assertThat(entity.getRelationshipA().getEntityA().getRelationshipB()).isNotNull();
+			assertThat(entity.getRelationshipA().getEntityA().getRelationshipB().getEntityB()).isNotNull();
+		}
+
 	}
 
 	@Nested
@@ -3475,6 +3497,9 @@ interface SimpleEntityWithRelationshipARepository extends Neo4jRepository<Simple
 
 	interface ThingWithFixedGeneratedIdRepository extends Neo4jRepository<ThingWithFixedGeneratedId, String> {}
 
+	interface EntityWithRelationshipPropertiesPathRepository
+			extends Neo4jRepository<EntityWithRelationshipPropertiesPath, Long> {}
+
 	@SpringJUnitConfig(Config.class)
 	static abstract class IntegrationTestBase {
 

src/test/java/org/springframework/data/neo4j/integration/shared/common/EntityWithRelationshipPropertiesPath.java

@@ -0,0 +1,93 @@
+/*
+ * Copyright 2011-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.neo4j.integration.shared.common;
+
+import org.springframework.data.neo4j.core.schema.GeneratedValue;
+import org.springframework.data.neo4j.core.schema.Id;
+import org.springframework.data.neo4j.core.schema.Node;
+import org.springframework.data.neo4j.core.schema.Relationship;
+import org.springframework.data.neo4j.core.schema.RelationshipProperties;
+import org.springframework.data.neo4j.core.schema.TargetNode;
+
+/**
+ * @author Gerrit Meier
+ */
+@Node
+public class EntityWithRelationshipPropertiesPath {
+
+	@Id @GeneratedValue private Long id;
+
+	@Relationship("RelationshipA")
+	private RelationshipPropertyA relationshipA;
+
+	public RelationshipPropertyA getRelationshipA() {
+		return relationshipA;
+	}
+
+	/**
+	 * From EntityWithRelationshipPropertiesPath to EntityA
+	 */
+	@RelationshipProperties
+	public static class RelationshipPropertyA {
+
+		@TargetNode
+		private EntityA entityA;
+
+		public EntityA getEntityA() {
+			return entityA;
+		}
+	}
+
+	/**
+	 * From EntityA to EntityB
+	 */
+	@RelationshipProperties
+	public static class RelationshipPropertyB {
+
+		@TargetNode
+		private EntityB entityB;
+
+		public EntityB getEntityB() {
+			return entityB;
+		}
+	}
+
+	/**
+	 * EntityA
+	 */
+	@Node
+	public static class EntityA {
+		@Id @GeneratedValue private Long id;
+
+		@Relationship("RelationshipB")
+		private RelationshipPropertyB relationshipB;
+
+		public RelationshipPropertyB getRelationshipB() {
+			return relationshipB;
+		}
+	}
+
+	/**
+	 * EntityB
+	 */
+	@Node
+	public static class EntityB {
+		@Id @GeneratedValue private Long id;
+
+	}
+
+
+}