GH-2290 - Simplify relationship determination logic.

Closes #2290

Author: meistermeier

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

@@ -278,7 +278,7 @@ private <ET> ET map(MapAccessor queryResult, MapAccessor allValues, Neo4jPersist
 				knownObjects.storeObject(internalId, instance);
 				// Fill associations
 				concreteNodeDescription.doWithAssociations(
-						populateFrom(queryResult, allValues, propertyAccessor, isConstructorParameter, relationships));
+						populateFrom(queryResult, allValues, propertyAccessor, isConstructorParameter));
 			}
 			ET bean = propertyAccessor.getBean();
 
@@ -363,7 +363,12 @@ public Object getParameterValue(PreferredConstructor.Parameter parameter) {
 				Neo4jPersistentProperty matchingProperty = nodeDescription.getRequiredPersistentProperty(parameter.getName());
 
 				if (matchingProperty.isRelationship()) {
-					return createInstanceOfRelationships(matchingProperty, values, allValues, relationships).orElse(null);
+					RelationshipDescription relationshipDescription = nodeDescription.getRelationships().stream()
+							.filter(r -> {
+								String propertyFieldName = matchingProperty.getFieldName();
+								return r.getFieldName().equals(propertyFieldName);
+							}).findFirst().get();
+					return createInstanceOfRelationships(matchingProperty, values, allValues, relationshipDescription).orElse(null);
 				} else if (matchingProperty.isDynamicLabels()) {
 					return createDynamicLabelsProperty(matchingProperty.getTypeInformation(), surplusLabels);
 				} else if (matchingProperty.isEntityWithRelationshipProperties()) {
@@ -399,25 +404,21 @@ private PropertyHandler<Neo4jPersistentProperty> populateFrom(MapAccessor queryR
 	}
 
 	private AssociationHandler<Neo4jPersistentProperty> populateFrom(MapAccessor queryResult, MapAccessor allValues,
-			PersistentPropertyAccessor<?> propertyAccessor, Predicate<Neo4jPersistentProperty> isConstructorParameter,
-			Collection<RelationshipDescription> relationshipDescriptions) {
+			PersistentPropertyAccessor<?> propertyAccessor, Predicate<Neo4jPersistentProperty> isConstructorParameter) {
 		return association -> {
 
 			Neo4jPersistentProperty persistentProperty = association.getInverse();
 			if (isConstructorParameter.test(persistentProperty)) {
 				return;
 			}
 
-			createInstanceOfRelationships(persistentProperty, queryResult, allValues, relationshipDescriptions)
+			createInstanceOfRelationships(persistentProperty, queryResult, allValues, (RelationshipDescription) association)
 					.ifPresent(value -> propertyAccessor.setProperty(persistentProperty, value));
 		};
 	}
 
 	private Optional<Object> createInstanceOfRelationships(Neo4jPersistentProperty persistentProperty, MapAccessor values,
-			MapAccessor allValues, Collection<RelationshipDescription> relationshipDescriptions) {
-
-		RelationshipDescription relationshipDescription = relationshipDescriptions.stream()
-				.filter(r -> r.getFieldName().equals(persistentProperty.getName())).findFirst().get();
+			MapAccessor allValues, RelationshipDescription relationshipDescription) {
 
 		String typeOfRelationship = relationshipDescription.getType();
 		String sourceLabel = relationshipDescription.getSource().getPrimaryLabel();