DATAGRAPH-1431 - Fix relationship mapping.

Author: meistermeier

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

@@ -391,7 +391,7 @@ private Optional<Object> createInstanceOfRelationships(Neo4jPersistentProperty p
 			mappedObjectHandler = (type, mappedObject) -> value.add(mappedObject);
 		}
 
-		Value list = allValues.get(relationshipDescription.generateRelatedNodesCollectionName());
+		Value list = values.get(relationshipDescription.generateRelatedNodesCollectionName());
 
 		List<Object> relationshipsAndProperties = new ArrayList<>();
 

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

@@ -110,6 +110,7 @@
 import org.springframework.data.neo4j.integration.shared.common.PersonWithWither;
 import org.springframework.data.neo4j.integration.shared.common.Pet;
 import org.springframework.data.neo4j.integration.shared.common.SimilarThing;
+import org.springframework.data.neo4j.integration.shared.common.SimpleEntityWithRelationshipA;
 import org.springframework.data.neo4j.integration.shared.common.ThingWithAssignedId;
 import org.springframework.data.neo4j.integration.shared.common.ThingWithGeneratedId;
 import org.springframework.data.neo4j.integration.shared.common.WorksInClubRelationship;
@@ -1025,6 +1026,22 @@ void findEntityWithRelationshipWithAssignedId(@Autowired PetRepository repositor
 			assertThat(relatedThing.getName()).isEqualTo("Thing1");
 		}
 
+		@Test // DATAGRAPH-1431
+		void findAndMapMultipleLevelsOfSimpleRelationships(@Autowired SimpleEntityWithRelationshipARepository repository) {
+			Long aId = null;
+			try (Session session = createSession()) {
+				aId = session.writeTransaction(tx -> tx.run("CREATE (a:SimpleEntityWithRelationshipA)" +
+						"-[:TO_B]->(:SimpleEntityWithRelationshipB)" +
+						"-[:TO_C]->(:SimpleEntityWithRelationshipC)" +
+						" RETURN id(a) as aId").single().get("aId").asLong());
+			}
+
+			SimpleEntityWithRelationshipA entityA = repository.findById(aId).get();
+			assertThat(entityA).isNotNull();
+			assertThat(entityA.getBs()).hasSize(1);
+			assertThat(entityA.getBs().get(0).getCs()).hasSize(1);
+		}
+
 	}
 
 	@Nested
@@ -3322,6 +3339,8 @@ interface ParentRepository extends Neo4jRepository<ParentNode, Long> {
 		Optional<ExtendedParentNode> findExtendedParentNodeBySomeOtherAttribute(String someOtherAttribute);
 	}
 
+	interface SimpleEntityWithRelationshipARepository extends Neo4jRepository<SimpleEntityWithRelationshipA, Long> {}
+
 	@SpringJUnitConfig(Config.class)
 	static abstract class IntegrationTestBase {
 

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

@@ -0,0 +1,39 @@
+/*
+ * 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 java.util.List;
+
+/**
+ * @author Gerrit Meier
+ */
+@Node
+public class SimpleEntityWithRelationshipA {
+
+	@Id @GeneratedValue private Long id;
+
+	@Relationship("TO_B")
+	private List<SimpleEntityWithRelationshipB> bs;
+
+	public List<SimpleEntityWithRelationshipB> getBs() {
+		return bs;
+	}
+}

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

@@ -0,0 +1,39 @@
+/*
+ * 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 java.util.List;
+
+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;
+
+/**
+ * @author Gerrit Meier
+ */
+@Node
+public class SimpleEntityWithRelationshipB {
+
+	@Id @GeneratedValue private Long id;
+
+	@Relationship("TO_C")
+	private List<SimpleEntityWithRelationshipC> cs;
+
+	public List<SimpleEntityWithRelationshipC> getCs() {
+		return cs;
+	}
+}

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

@@ -0,0 +1,30 @@
+/*
+ * 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;
+
+/**
+ * @author Gerrit Meier
+ */
+@Node
+public class SimpleEntityWithRelationshipC {
+
+	@Id @GeneratedValue private Long id;
+
+}