removed duplication

Author: schauder

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

@@ -264,53 +264,52 @@ private SelectBuilder.SelectJoin selectBuilder(Table table) {
 
 		Predicate<AggregatePath> filter = ap -> returnedType.needsCustomConstruction() && !returnedType.getInputProperties().contains(ap.getRequiredBaseProperty().getName());
 
-//		sqlGeneratorSource.getSqlGenerator(entity.getType()).createSelectBuilder(
+		return (SelectBuilder.SelectJoin) sqlGeneratorSource.getSqlGenerator(entity.getType()).createSelectBuilder(
+				filter
+				, table);
 //
-//				, table)
-
-		SqlContext sqlContext = new SqlContext();
-
-		List<Join> joinTables = new ArrayList<>();
-		for (PersistentPropertyPath<RelationalPersistentProperty> path : context
-				.findPersistentPropertyPaths(entity.getType(), p -> true)) {
-
-			AggregatePath aggregatePath = context.getAggregatePath(path);
-
-			// TODO: special handling for custom construction?
-			if (filter.test(aggregatePath)) {	continue;}
-
-			// add a join if necessary
-			Join join = getJoin(sqlContext, aggregatePath);
-			if (join != null) {
-				joinTables.add(join);
-			}
-
-			Column column = getColumn(sqlContext, aggregatePath);
-			if (column != null) {
-				columnExpressions.add(column);
-			}
-		}
-
-		SelectBuilder.SelectJoin baseSelect = StatementBuilder.select(columnExpressions).from(table);
-
-		// TODO: included in SqlGenerator.Join
-		for (Join join : joinTables) {
-
-			Condition condition = null;
-
-			for (int i = 0; i < join.joinColumns.size(); i++) {
-				Column parentColumn = join.parentId.get(i);
-				Column joinColumn = join.joinColumns.get(i);
-				Comparison singleCondition = joinColumn.isEqualTo(parentColumn);
-				condition = condition == null ? singleCondition : condition.and(singleCondition);
-			}
-
-			Assert.state(condition != null, "No condition found");
-
-			baseSelect = baseSelect.leftOuterJoin(join.joinTable).on(condition);
-		}
-
-		return baseSelect;
+//		SqlContext sqlContext = new SqlContext();
+//
+//		List<Join> joinTables = new ArrayList<>();
+//		for (PersistentPropertyPath<RelationalPersistentProperty> path : context
+//				.findPersistentPropertyPaths(entity.getType(), p -> true)) {
+//
+//			AggregatePath aggregatePath = context.getAggregatePath(path);
+//
+//			if (filter.test(aggregatePath)) {	continue;}
+//
+//			// add a join if necessary
+//			Join join = getJoin(sqlContext, aggregatePath);
+//			if (join != null) {
+//				joinTables.add(join);
+//			}
+//
+//			Column column = getColumn(sqlContext, aggregatePath);
+//			if (column != null) {
+//				columnExpressions.add(column);
+//			}
+//		}
+//
+//		SelectBuilder.SelectJoin baseSelect = StatementBuilder.select(columnExpressions).from(table);
+//
+//		// TODO: included in SqlGenerator.Join
+//		for (Join join : joinTables) {
+//
+//			Condition condition = null;
+//
+//			for (int i = 0; i < join.joinColumns.size(); i++) {
+//				Column parentColumn = join.parentId.get(i);
+//				Column joinColumn = join.joinColumns.get(i);
+//				Comparison singleCondition = joinColumn.isEqualTo(parentColumn);
+//				condition = condition == null ? singleCondition : condition.and(singleCondition);
+//			}
+//
+//			Assert.state(condition != null, "No condition found");
+//
+//			baseSelect = baseSelect.leftOuterJoin(join.joinTable).on(condition);
+//		}
+//
+//		return baseSelect;
 	}
 
 	/**