GH-2325 - Respect first level projection with SpEL.

Author: meistermeier

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

@@ -44,16 +44,18 @@ public static List<PropertyPath> getInputProperties(ResultProcessor resultProces
 		List<PropertyPath> filteredProperties = new ArrayList<>();
 
 		boolean isProjecting = returnedType.isProjecting();
+		boolean isClosedProjection = factory.getProjectionInformation(returnedType.getReturnedType()).isClosed();
+
+		if (!isProjecting || !isClosedProjection) {
+			return Collections.emptyList();
+		}
+
 		for (String inputProperty : returnedType.getInputProperties()) {
-			if (isProjecting) {
-				addPropertiesFrom(returnedType.getDomainType(), returnedType.getReturnedType(), factory,
-						filteredProperties, inputProperty, mappingContext);
-			} else {
-				addPropertiesFromEntity(filteredProperties, PropertyPath.from(inputProperty, returnedType.getDomainType()),
-						returnedType.getReturnedType(), mappingContext, new HashSet<>());
-			}
+			addPropertiesFrom(returnedType.getDomainType(), returnedType.getReturnedType(), factory,
+					filteredProperties, inputProperty, mappingContext);
 		}
-		return isProjecting ? filteredProperties : Collections.emptyList();
+
+		return filteredProperties;
 	}
 
 	public static List<PropertyPath> addPropertiesFrom(Class<?> returnType, Class<?> domainType,
@@ -161,11 +163,11 @@ private static void takeAllPropertiesFromEntity(Collection<PropertyPath> filtere
 		filteredProperties.add(propertyPath);
 
 		persistentEntityFromProperty.doWithAll(neo4jPersistentProperty -> {
-			addPropertiesFrom(filteredProperties, propertyPath.nested(neo4jPersistentProperty.getFieldName()), mappingContext, processedEntities);
+			addPropertiesFromEntity(filteredProperties, propertyPath.nested(neo4jPersistentProperty.getFieldName()), mappingContext, processedEntities);
 		});
 	}
 
-	private static void addPropertiesFrom(Collection<PropertyPath> filteredProperties, PropertyPath propertyPath,
+	private static void addPropertiesFromEntity(Collection<PropertyPath> filteredProperties, PropertyPath propertyPath,
 										  Neo4jMappingContext mappingContext,
 										  Collection<Neo4jPersistentEntity<?>> processedEntities) {
 

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

@@ -48,6 +48,7 @@
 import org.springframework.data.neo4j.core.transaction.Neo4jTransactionManager;
 import org.springframework.data.neo4j.integration.shared.common.NamesOnly;
 import org.springframework.data.neo4j.integration.shared.common.NamesOnlyDto;
+import org.springframework.data.neo4j.integration.shared.common.NamesWithSpELCity;
 import org.springframework.data.neo4j.integration.shared.common.Person;
 import org.springframework.data.neo4j.integration.shared.common.PersonSummary;
 import org.springframework.data.neo4j.integration.shared.common.ProjectionTest1O1;
@@ -143,6 +144,18 @@ void loadNamesOnlyProjection(@Autowired ProjectionPersonRepository repository) {
 		assertThat(people).extracting(NamesOnly::getFullName).containsExactlyInAnyOrder(FIRST_NAME + " " + LAST_NAME, FIRST_NAME2 + " " + LAST_NAME);
 	}
 
+	@Test // GH-2325
+	void loadNamesWithCityProjection(@Autowired ProjectionPersonRepository repository) {
+
+		Collection<NamesWithSpELCity> people = repository.findProjectionByLastName(LAST_NAME);
+		assertThat(people).hasSize(2);
+
+		assertThat(people).extracting(NamesWithSpELCity::getFirstName).containsExactlyInAnyOrder(FIRST_NAME, FIRST_NAME2);
+		assertThat(people).extracting(NamesWithSpELCity::getLastName).containsOnly(LAST_NAME);
+
+		assertThat(people).extracting(NamesWithSpELCity::getCity).containsExactlyInAnyOrder(CITY, CITY);
+	}
+
 	@Test
 	void loadPersonSummaryProjection(@Autowired ProjectionPersonRepository repository) {
 		Collection<PersonSummary> people = repository.findByFirstName(FIRST_NAME);
@@ -338,6 +351,8 @@ interface ProjectionPersonRepository extends Neo4jRepository<Person, Long>, Cyph
 
 		Collection<NamesOnly> findByLastName(String lastName);
 
+		Collection<NamesWithSpELCity> findProjectionByLastName(String lastName);
+
 		Page<NamesOnly> findAllProjectedBy(Pageable pageable);
 
 		Slice<NamesOnly> findSliceProjectedBy(Pageable pageable);

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

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2011-2021 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.beans.factory.annotation.Value;
+
+/**
+ * @author Gerrit Meier
+ */
+public interface NamesWithSpELCity {
+
+	String getFirstName();
+
+	String getLastName();
+
+	@Value("#{target.address.city}")
+	String getCity();
+}