GH-2313 - Extract property iteration.

Author: meistermeier

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

@@ -19,7 +19,6 @@
 import static org.neo4j.cypherdsl.core.Cypher.asterisk;
 import static org.neo4j.cypherdsl.core.Cypher.parameter;
 
-import java.beans.PropertyDescriptor;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -333,11 +332,9 @@ public <T, R> R saveAs(T instance, Class<R> resultType) {
 		}
 
 		ProjectionInformation projectionInformation = projectionFactory.getProjectionInformation(resultType);
-		List<PropertyDescriptor> inputProperties = projectionInformation.getInputProperties();
-		Set<PropertyPath> pps = new HashSet<>();
-		for (PropertyDescriptor inputProperty : inputProperties) {
-			PropertyFilterSupport.addPropertiesFrom(resultType, resultType, projectionFactory, pps, inputProperty.getName(), neo4jMappingContext);
-		}
+		Collection<PropertyPath> pps = PropertyFilterSupport.addPropertiesFrom(resultType, resultType,
+				projectionFactory, neo4jMappingContext);
+
 		T savedInstance = saveImpl(instance, pps);
 		if (projectionInformation.isClosed()) {
 			return projectionFactory.createProjection(resultType, savedInstance);
@@ -499,11 +496,11 @@ public <T, R> List<R> saveAllAs(Iterable<T> instances, Class<R> resultType) {
 		}
 
 		ProjectionInformation projectionInformation = projectionFactory.getProjectionInformation(resultType);
-		List<PropertyPath> pps = new ArrayList<>();
-		for (PropertyDescriptor inputProperty : projectionInformation.getInputProperties()) {
-			PropertyFilterSupport.addPropertiesFrom(commonElementType, resultType, projectionFactory, pps, inputProperty.getName(), neo4jMappingContext);
-		}
-		List<T> savedInstances = saveAllImpl(instances, pps);
+
+		Collection<PropertyPath> pps = PropertyFilterSupport.addPropertiesFrom(resultType, commonElementType,
+				projectionFactory, neo4jMappingContext);
+
+		List<T> savedInstances = saveAllImpl(instances, new ArrayList<>(pps));
 
 		if (projectionInformation.isClosed()) {
 			return savedInstances.stream().map(instance -> projectionFactory.createProjection(resultType, instance))
@@ -898,12 +895,9 @@ <T, R> List<R> doSave(Iterable<R> instances, Class<T> domainType) {
 
 		Class<?> resultType = TemplateSupport.findCommonElementType(instances);
 
-		ProjectionInformation projectionInformation = projectionFactory.getProjectionInformation(resultType);
-		List<PropertyDescriptor> inputProperties = projectionInformation.getInputProperties();
-		Set<PropertyPath> pps = new HashSet<>();
-		for (PropertyDescriptor inputProperty : inputProperties) {
-			PropertyFilterSupport.addPropertiesFrom(domainType, resultType, projectionFactory, pps, inputProperty.getName(), neo4jMappingContext);
-		}
+		Collection<PropertyPath> pps = PropertyFilterSupport.addPropertiesFrom(resultType, domainType,
+				projectionFactory, neo4jMappingContext);
+
 		List<R> results = new ArrayList<>();
 		for (R instance : instances) {
 			EntityFromDtoInstantiatingConverter<T> converter = new EntityFromDtoInstantiatingConverter<>(domainType, neo4jMappingContext);

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

@@ -59,7 +59,19 @@ public static List<PropertyPath> getInputProperties(ResultProcessor resultProces
 		return returnedType.isProjecting() ? filteredProperties : Collections.emptyList();
 	}
 
-	public static void addPropertiesFrom(Class<?> domainType, Class<?> returnedType, ProjectionFactory factory,
+	public static List<PropertyPath> addPropertiesFrom(Class<?> returnType, Class<?> domainType,
+													   ProjectionFactory projectionFactory,
+													   Neo4jMappingContext neo4jMappingContext) {
+
+		ProjectionInformation projectionInformation = projectionFactory.getProjectionInformation(returnType);
+		List<PropertyPath> pps = new ArrayList<>();
+		for (PropertyDescriptor inputProperty : projectionInformation.getInputProperties()) {
+			addPropertiesFrom(returnType, domainType, projectionFactory, pps, inputProperty.getName(), neo4jMappingContext);
+		}
+		return pps;
+	}
+
+	private static void addPropertiesFrom(Class<?> domainType, Class<?> returnedType, ProjectionFactory factory,
 										 Collection<PropertyPath> filteredProperties, String inputProperty,
 										 Neo4jMappingContext mappingContext) {
 

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

@@ -27,12 +27,10 @@
 import reactor.util.function.Tuple2;
 import reactor.util.function.Tuples;
 
-import java.beans.PropertyDescriptor;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -317,10 +315,9 @@ public <T, R> Mono<R> saveAs(T instance, Class<R> resultType) {
 		}
 
 		ProjectionInformation projectionInformation = projectionFactory.getProjectionInformation(resultType);
-		List<PropertyPath> pps = new ArrayList<>();
-		for (PropertyDescriptor inputProperty : projectionInformation.getInputProperties()) {
-			PropertyFilterSupport.addPropertiesFrom(instance.getClass(), resultType, projectionFactory, pps, inputProperty.getName(), neo4jMappingContext);
-		}
+		Collection<PropertyPath> pps = PropertyFilterSupport.addPropertiesFrom(resultType, instance.getClass(),
+				projectionFactory, neo4jMappingContext);
+
 		Mono<T> savingPublisher = saveImpl(instance, pps);
 		if (projectionInformation.isClosed()) {
 			return savingPublisher.map(savedInstance -> projectionFactory.createProjection(resultType, savedInstance));
@@ -344,12 +341,9 @@ <T, R> Flux<R> doSave(Iterable<R> instances, Class<T> domainType) {
 
 		Class<?> resultType = TemplateSupport.findCommonElementType(instances);
 
-		ProjectionInformation projectionInformation = projectionFactory.getProjectionInformation(resultType);
-		List<PropertyDescriptor> inputProperties = projectionInformation.getInputProperties();
-		Set<PropertyPath> pps = new HashSet<>();
-		for (PropertyDescriptor inputProperty : inputProperties) {
-			PropertyFilterSupport.addPropertiesFrom(domainType, resultType, projectionFactory, pps, inputProperty.getName(), neo4jMappingContext);
-		}
+		Collection<PropertyPath> pps = PropertyFilterSupport.addPropertiesFrom(resultType, domainType,
+				projectionFactory, neo4jMappingContext);
+
 		return Flux.fromIterable(instances)
 			.flatMap(instance -> {
 				EntityFromDtoInstantiatingConverter<T> converter = new EntityFromDtoInstantiatingConverter<>(domainType, neo4jMappingContext);
@@ -448,10 +442,9 @@ public <T, R> Flux<R> saveAllAs(Iterable<T> instances, Class<R> resultType) {
 		}
 
 		ProjectionInformation projectionInformation = projectionFactory.getProjectionInformation(resultType);
-		List<PropertyPath> pps = new ArrayList<>();
-		for (PropertyDescriptor inputProperty : projectionInformation.getInputProperties()) {
-			PropertyFilterSupport.addPropertiesFrom(commonElementType, resultType, projectionFactory, pps, inputProperty.getName(), neo4jMappingContext);
-		}
+		List<PropertyPath> pps = PropertyFilterSupport.addPropertiesFrom(resultType, commonElementType,
+				projectionFactory, neo4jMappingContext);
+
 		Flux<T> savedInstances = saveAllImpl(instances, pps);
 		if (projectionInformation.isClosed()) {
 			return savedInstances.map(instance -> projectionFactory.createProjection(resultType, instance));