prepare switch

Author: schauder

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/JdbcQueryCreator.java

@@ -18,6 +18,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Predicate;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -261,6 +262,8 @@ private SelectBuilder.SelectJoin selectBuilder(Table table) {
 		List<Expression> columnExpressions = new ArrayList<>();
 		RelationalPersistentEntity<?> entity = entityMetadata.getTableEntity();
 
+		Predicate<AggregatePath> filter = ap -> returnedType.needsCustomConstruction() && !returnedType.getInputProperties().contains(ap.getRequiredBaseProperty().getName());
+
 //		sqlGeneratorSource.getSqlGenerator(entity.getType()).createSelectBuilder(
 //
 //				, table)
@@ -274,11 +277,7 @@ private SelectBuilder.SelectJoin selectBuilder(Table table) {
 			AggregatePath aggregatePath = context.getAggregatePath(path);
 
 			// TODO: special handling for custom construction?
-			if (returnedType.needsCustomConstruction()) {
-				if (!returnedType.getInputProperties().contains(aggregatePath.getRequiredBaseProperty().getName())) {
-					continue;
-				}
-			}
+			if (filter.test(aggregatePath)) {	continue;}
 
 			// add a join if necessary
 			Join join = getJoin(sqlContext, aggregatePath);