GH-2228 - Fix multiple relationships properties to same node.

When using relationship properties, it is possible to map towards the same node multiple times.
While loading this was not supported because the logic assumed that after one relationship was found, the mapping to this node is done.

Author: meistermeier

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

@@ -23,6 +23,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.function.BiConsumer;
@@ -482,7 +483,7 @@ private Optional<Object> createInstanceOfRelationships(Neo4jPersistentProperty p
 			Long sourceNodeId = getInternalId(values);
 			for (Node possibleValueNode : allNodesWithMatchingLabelInResult) {
 				long targetNodeId = possibleValueNode.id();
-
+				Set<Relationship> relationshipsProcessed = new HashSet<>();
 				for (Relationship possibleRelationship : allMatchingTypeRelationshipsInResult) {
 					if (targetIdSelector.apply(possibleRelationship) == targetNodeId && sourceIdSelector.apply(possibleRelationship).equals(sourceNodeId)) {
 
@@ -500,10 +501,10 @@ private Optional<Object> createInstanceOfRelationships(Neo4jPersistentProperty p
 						} else {
 							mappedObjectHandler.accept(possibleRelationship.type(), mappedObject);
 						}
-						allMatchingTypeRelationshipsInResult.remove(possibleRelationship);
-						break;
+						relationshipsProcessed.add(possibleRelationship);
 					}
 				}
+				allMatchingTypeRelationshipsInResult.removeAll(relationshipsProcessed);
 			}
 		} else {
 			for (Value relatedEntity : list.asList(Function.identity())) {

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

@@ -1581,6 +1581,14 @@ void loadSameNodeWithDoubleRelationship(@Autowired HobbyWithRelationshipWithProp
 			rel2.setAltPerson(altPerson);
 
 			assertThat(likedBy).containsExactlyInAnyOrder(rel1, rel2);
+
+			Optional<AltHobby> optHobby = repository.findById(hobby.getId());
+			assertThat(optHobby.isPresent()).isTrue();
+			hobby = optHobby.get();
+			assertThat(hobby.getName()).isEqualTo("Music");
+			likedBy = hobby.getLikedBy();
+			assertThat(likedBy).hasSize(2);
+			assertThat(likedBy).containsExactlyInAnyOrder(rel1, rel2);
 		}
 
 		@Test // DATAGRAPH-1434

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

@@ -35,6 +35,12 @@ public class AltHobby {
 	@Relationship(type = "LIKES", direction = Relationship.Direction.INCOMING)
 	private List<AltLikedByPersonRelationship> likedBy = new ArrayList<>();
 
+	@Relationship(type = "CHILD", direction = Relationship.Direction.INCOMING)
+	private List<AltHobby> memberOf = new ArrayList<>();
+
+	public List<AltHobby> getMemberOf() {
+		return memberOf;
+	}
 	public Long getId() {
 		return id;
 	}