GH-2138 - Clean up.

Author: meistermeier

src/main/java/org/springframework/data/neo4j/core/Neo4jTemplate.java

@@ -701,7 +701,7 @@ private GenericQueryAndParameters createQueryAndParameters(Neo4jPersistentEntity
 			final Set<Long> relationshipIds = new HashSet<>();
 			final Set<Long> relatedNodeIds = new HashSet<>();
 
-			for (RelationshipDescription relationshipDescription : entityMetaData.getRelationshipsUpAndDown(fieldName -> queryFragments.includeField(fieldName))) {
+			for (RelationshipDescription relationshipDescription : entityMetaData.getRelationshipsInHierarchy(fieldName -> queryFragments.includeField(fieldName))) {
 
 				Statement statement = cypherGenerator
 						.prepareMatchOf(entityMetaData, relationshipDescription, queryFragments.getMatchOn(), queryFragments.getCondition())
@@ -720,7 +720,7 @@ private GenericQueryAndParameters createQueryAndParameters(Neo4jPersistentEntity
 		private void iterateNextLevel(Collection<Long> nodeIds, Neo4jPersistentEntity<?> target, Set<Long> relationshipIds,
 									  Set<Long> relatedNodeIds) {
 
-			Collection<RelationshipDescription> relationships = target.getRelationshipsUpAndDown(s -> true);
+			Collection<RelationshipDescription> relationships = target.getRelationshipsInHierarchy(s -> true);
 			for (RelationshipDescription relationshipDescription : relationships) {
 
 				Node node = anyNode(Constants.NAME_OF_ROOT_NODE);

src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jTemplate.java

@@ -469,7 +469,7 @@ private Mono<GenericQueryAndParameters> createQueryAndParameters(Neo4jPersistent
 				Set<Long> rootNodeIds = ctx.get("rootNodes");
 				Set<Long> processedRelationshipIds = ctx.get("processedRelationships");
 				Set<Long> processedNodeIds = ctx.get("processedNodes");
-				return Flux.fromIterable(entityMetaData.getRelationshipsUpAndDown(fieldName -> queryFragments.includeField(fieldName)))
+				return Flux.fromIterable(entityMetaData.getRelationshipsInHierarchy(fieldName -> queryFragments.includeField(fieldName)))
 						.flatMap(relationshipDescription -> {
 
 							Statement statement = cypherGenerator.prepareMatchOf(entityMetaData, relationshipDescription,
@@ -509,7 +509,7 @@ private Flux<Tuple2<Collection<Long>, Collection<Long>>> iterateNextLevel(Collec
 
 		NodeDescription<?> target = relationshipDescription.getTarget();
 
-		return Flux.fromIterable(target.getRelationshipsUpAndDown(s -> true))
+		return Flux.fromIterable(target.getRelationshipsInHierarchy(s -> true))
 			.flatMap(relDe -> {
 				Node node = anyNode(Constants.NAME_OF_ROOT_NODE);
 

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

@@ -502,7 +502,7 @@ private MapProjection projectPropertiesAndRelationships(NodeDescription<?> nodeD
 		List<Object> propertiesProjection = projectNodeProperties(nodeDescription, nodeName, includedProperties);
 		List<Object> contentOfProjection = new ArrayList<>(propertiesProjection);
 
-		Collection<RelationshipDescription> relationships = nodeDescription.getRelationshipsUpAndDown(includedProperties);
+		Collection<RelationshipDescription> relationships = nodeDescription.getRelationshipsInHierarchy(includedProperties);
 		relationships.removeIf(r -> !includedProperties.test(r.getFieldName()));
 
 		contentOfProjection.addAll(generateListsFor(relationships, nodeName, processedRelationships));

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

@@ -251,7 +251,7 @@ private <ET> ET map(MapAccessor queryResult, MapAccessor allValues, Neo4jPersist
 			Predicate<String> includeAllFields = (field) -> true;
 
 			Collection<RelationshipDescription> relationships = nodeDescription
-					.getRelationshipsUpAndDown(includeAllFields);
+					.getRelationshipsInHierarchy(includeAllFields);
 
 			ET instance = instantiate(concreteNodeDescription, queryResult, allValues, relationships,
 					nodeDescriptionAndLabels.getDynamicLabels(), lastMappedEntity);
@@ -299,6 +299,17 @@ private Long getInternalId(@NonNull MapAccessor queryResult) {
 				: queryResult.get(Constants.NAME_OF_INTERNAL_ID).asLong();
 	}
 
+	@NonNull
+	private Neo4jPersistentEntity<?> getMostConcreteTargetNodeDescription(
+			Neo4jPersistentEntity<?> genericTargetNodeDescription, MapAccessor possibleValueNode) {
+
+		List<String> allLabels = getLabels(possibleValueNode, null);
+		NodeDescriptionAndLabels nodeDescriptionAndLabels = NodeDescriptionStore
+				.deriveConcreteNodeDescription(genericTargetNodeDescription, allLabels);
+		return (Neo4jPersistentEntity<?>) nodeDescriptionAndLabels
+				.getNodeDescription();
+	}
+
 	/**
 	 * Returns the list of labels for the entity to be created from the "main" node returned.
 	 *
@@ -458,11 +469,8 @@ private Optional<Object> createInstanceOfRelationships(Neo4jPersistentProperty p
 				for (Relationship possibleRelationship : allMatchingTypeRelationshipsInResult) {
 					if (targetIdSelector.apply(possibleRelationship) == targetNodeId && sourceIdSelector.apply(possibleRelationship).equals(sourceNodeId)) {
 
-						List<String> allLabels = getLabels(possibleValueNode, null);
-						NodeDescriptionAndLabels nodeDescriptionAndLabels = NodeDescriptionStore
-								.deriveConcreteNodeDescription(genericTargetNodeDescription, allLabels);
-						Neo4jPersistentEntity<?> concreteTargetNodeDescription = (Neo4jPersistentEntity<?>) nodeDescriptionAndLabels
-								.getNodeDescription();
+						Neo4jPersistentEntity<?> concreteTargetNodeDescription =
+								getMostConcreteTargetNodeDescription(genericTargetNodeDescription, possibleValueNode);
 
 						Object mappedObject = map(possibleValueNode, allValues, concreteTargetNodeDescription);
 						if (relationshipDescription.hasRelationshipProperties()) {
@@ -483,11 +491,8 @@ private Optional<Object> createInstanceOfRelationships(Neo4jPersistentProperty p
 		} else {
 			for (Value relatedEntity : list.asList(Function.identity())) {
 
-				List<String> allLabels = getLabels(relatedEntity, null);
-				NodeDescriptionAndLabels nodeDescriptionAndLabels = NodeDescriptionStore
-						.deriveConcreteNodeDescription(genericTargetNodeDescription, allLabels);
-				Neo4jPersistentEntity<?> concreteTargetNodeDescription = (Neo4jPersistentEntity<?>) nodeDescriptionAndLabels
-						.getNodeDescription();
+				Neo4jPersistentEntity<?> concreteTargetNodeDescription =
+						getMostConcreteTargetNodeDescription(genericTargetNodeDescription, relatedEntity);
 
 				Object valueEntry = map(relatedEntity, allValues, concreteTargetNodeDescription);
 

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

@@ -422,7 +422,7 @@ public Collection<RelationshipDescription> getRelationships() {
 	}
 
 	@NonNull
-	public Collection<RelationshipDescription> getRelationshipsUpAndDown(Predicate<String> propertyFilter) {
+	public Collection<RelationshipDescription> getRelationshipsInHierarchy(Predicate<String> propertyFilter) {
 
 		Collection<RelationshipDescription> relationships = new HashSet<>(getRelationships());
 		for (NodeDescription<?> childDescription : getChildNodeDescriptionsInHierarchy()) {
@@ -496,7 +496,7 @@ public boolean containsPossibleCircles(Predicate<String> includeField) {
 	}
 
 	private boolean calculatePossibleCircles(Predicate<String> includeField) {
-		Collection<RelationshipDescription> relationships = new HashSet<>(getRelationshipsUpAndDown(includeField));
+		Collection<RelationshipDescription> relationships = new HashSet<>(getRelationshipsInHierarchy(includeField));
 
 		Set<RelationshipDescription> processedRelationships = new HashSet<>();
 		for (RelationshipDescription relationship : relationships) {
@@ -515,7 +515,7 @@ private boolean calculatePossibleCircles(Predicate<String> includeField) {
 	}
 
 	private boolean calculatePossibleCircles(NodeDescription<?> nodeDescription, Set<RelationshipDescription> processedRelationships) {
-		Collection<RelationshipDescription> relationships = nodeDescription.getRelationshipsUpAndDown(s -> true);
+		Collection<RelationshipDescription> relationships = nodeDescription.getRelationshipsInHierarchy(s -> true);
 
 		for (RelationshipDescription relationship : relationships) {
 			if (processedRelationships.contains(relationship)) {

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

@@ -124,7 +124,7 @@ public static NestedRelationshipContext of(Association<Neo4jPersistentProperty>
 		Object value = propertyAccessor.getProperty(inverse);
 		boolean inverseValueIsEmpty = value == null;
 
-		RelationshipDescription relationship = neo4jPersistentEntity.getRelationshipsUpAndDown(s -> true).stream()
+		RelationshipDescription relationship = neo4jPersistentEntity.getRelationshipsInHierarchy(s -> true).stream()
 				.filter(r -> r.getFieldName().equals(inverse.getName())).findFirst().get();
 
 		// if we have a relationship with properties, the targetNodeType is the map key

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

@@ -103,7 +103,13 @@ default boolean isUsingInternalIds() {
 	 */
 	Collection<RelationshipDescription> getRelationships();
 
-	Collection<RelationshipDescription> getRelationshipsUpAndDown(Predicate<String> propertyPredicate);
+	/**
+	 * This returns the relationships this node, its parent and child has to other nodes.
+	 *
+	 * @param propertyPredicate - Predicate to filter the fields on this node description to
+	 * @return The relationships defined by instances of this node.
+	 */
+	Collection<RelationshipDescription> getRelationshipsInHierarchy(Predicate<String> propertyPredicate);
 
 	/**
 	 * Register a direct child node description for this entity.

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

@@ -78,10 +78,11 @@ public NodeDescription<?> getNodeDescription(Class<?> targetType) {
 
 	public static NodeDescriptionAndLabels deriveConcreteNodeDescription(Neo4jPersistentEntity<?> entityDescription,
 			List<String> labels) {
+
 		if (labels == null || labels.isEmpty()) {
 			return new NodeDescriptionAndLabels(entityDescription, Collections.emptyList());
 		}
-		NodeDescriptionAndLabels nodeDescriptionAndLabels = null;
+
 		for (NodeDescription<?> childNodeDescription : entityDescription.getChildNodeDescriptionsInHierarchy()) {
 			String primaryLabel = childNodeDescription.getPrimaryLabel();
 			List<String> additionalLabels = new ArrayList<>(childNodeDescription.getAdditionalLabels());
@@ -90,20 +91,10 @@ public static NodeDescriptionAndLabels deriveConcreteNodeDescription(Neo4jPersis
 				Set<String> surplusLabels = new HashSet<>(labels);
 				surplusLabels.remove(primaryLabel);
 				surplusLabels.removeAll(additionalLabels);
-				// if we find more than one, we have to distinguish between the options in the mapping logic later.
-				if (nodeDescriptionAndLabels == null) {
-					nodeDescriptionAndLabels = new NodeDescriptionAndLabels(childNodeDescription, surplusLabels);
-				} else {
-					surplusLabels = new HashSet<>(labels);
-					surplusLabels.remove(entityDescription.getPrimaryLabel());
-					surplusLabels.removeAll(entityDescription.getAdditionalLabels());
-					return new NodeDescriptionAndLabels(entityDescription, surplusLabels);
-				}
+
+				return new NodeDescriptionAndLabels(childNodeDescription, surplusLabels);
 			}
 		}
-		if (nodeDescriptionAndLabels != null) {
-			return nodeDescriptionAndLabels;
-		}
 
 		Set<String> surplusLabels = new HashSet<>(labels);
 		surplusLabels.remove(entityDescription.getPrimaryLabel());