partially fixing formatting

Author: schauder

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

@@ -15,6 +15,9 @@
  */
 package org.springframework.data.jdbc.repository.query;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jdbc.core.convert.JdbcConverter;
 import org.springframework.data.jdbc.core.convert.QueryMapper;
@@ -26,17 +29,9 @@
 import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
 import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
 import org.springframework.data.relational.core.query.Criteria;
-import org.springframework.data.relational.core.sql.Column;
-import org.springframework.data.relational.core.sql.Condition;
-import org.springframework.data.relational.core.sql.Conditions;
-import org.springframework.data.relational.core.sql.Delete;
+import org.springframework.data.relational.core.sql.*;
 import org.springframework.data.relational.core.sql.DeleteBuilder.DeleteWhere;
-import org.springframework.data.relational.core.sql.Expression;
-import org.springframework.data.relational.core.sql.Expressions;
-import org.springframework.data.relational.core.sql.Select;
 import org.springframework.data.relational.core.sql.SelectBuilder.SelectWhere;
-import org.springframework.data.relational.core.sql.StatementBuilder;
-import org.springframework.data.relational.core.sql.Table;
 import org.springframework.data.relational.core.sql.render.SqlRenderer;
 import org.springframework.data.relational.repository.query.RelationalEntityMetadata;
 import org.springframework.data.relational.repository.query.RelationalParameterAccessor;
@@ -46,9 +41,6 @@
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Implementation of {@link RelationalQueryCreator} that creates {@link List} of deletion {@link ParametrizedQuery} from
  * a {@link PartTree}.
@@ -101,7 +93,7 @@ protected List<ParametrizedQuery> complete(@Nullable Criteria criteria, Sort sor
 				: queryMapper.getMappedObject(parameterSource, criteria, table, entity);
 
 		List<Column> idColumns = context.getAggregatePath(entity).getTableInfo().idColumnInfos()
-				.toColumnList(table);
+				.toList(ci -> table.column(ci.name()));
 
 		// create select criteria query for subselect
 		SelectWhere selectBuilder = StatementBuilder.select(idColumns).from(table);
@@ -143,17 +135,17 @@ private void deleteRelations(List<Delete> deleteChain, RelationalPersistentEntit
 
 				SqlContext sqlContext = new SqlContext();
 
-				// MariaDB prior to 11.6 does not  support aliases for delete statements
+				// MariaDB prior to 11.6 does not support aliases for delete statements
 				Table table = sqlContext.getUnaliasedTable(aggregatePath);
 
 				List<Column> reverseColumns = aggregatePath.getTableInfo().backReferenceColumnInfos()
-						.toColumnList(table);
+						.toList(ci -> table.column(ci.name()));
 				Expression expression = Expressions.of(reverseColumns);
 
 				Condition inCondition = Conditions.in(expression, parentSelect);
 
 				List<Column> parentIdColumns = aggregatePath.getIdDefiningParentPath().getTableInfo().idColumnInfos()
-						.toColumnList(table);
+						.toList(ci -> table.column(ci.name()));
 
 				Select select = StatementBuilder.select( //
 						parentIdColumns //

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

@@ -326,8 +326,7 @@ Join getJoin(SqlContext sqlContext, AggregatePath path) {
 		Table parentTable = sqlContext.getTable(idDefiningParentPath);
 
 		List<Column> reverseColumns = path.getTableInfo().backReferenceColumnInfos().toColumnList(currentTable);
-		List<Column> idColumns = idDefiningParentPath.getTableInfo().idColumnInfos()
-				.toColumnList(parentTable);
+		List<Column> idColumns = idDefiningParentPath.getTableInfo().idColumnInfos().toColumnList(parentTable);
 		return new Join( //
 				currentTable, //
 				reverseColumns, //

spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/AggregatePath.java

@@ -42,7 +42,8 @@
  * Represents a path within an aggregate starting from the aggregate root. The path can be iterated from the leaf to its
  * root.
  * <p>
- * It implements {@link Comparable} so that collections of {@code AggregatePath} instances can be sorted in a consistent way.
+ * It implements {@link Comparable} so that collections of {@code AggregatePath} instances can be sorted in a consistent
+ * way.
  *
  * @author Jens Schauder
  * @author Mark Paluch
@@ -246,7 +247,7 @@ default Stream<AggregatePath> stream() {
 	 * Returns the longest ancestor path that has an {@link org.springframework.data.annotation.Id} property.
 	 *
 	 * @return A path that starts just as this path but is shorter. Guaranteed to be not {@literal null}. TODO: throws
-	 * NoSuchElementException: No value present for empty paths
+	 *         NoSuchElementException: No value present for empty paths
 	 */
 	AggregatePath getIdDefiningParentPath();
 
@@ -259,24 +260,26 @@ default Stream<AggregatePath> stream() {
 	@Nullable
 	AggregatePath getTail();
 
-
 	/**
-	 * Subtract the {@literal basePath} from {@literal this} {@literal AggregatePath} by removing the {@literal basePath} from the beginning of {@literal this}.
+	 * Subtract the {@literal basePath} from {@literal this} {@literal AggregatePath} by removing the {@literal basePath}
+	 * from the beginning of {@literal this}.
 	 *
 	 * @param basePath the path to be removed.
-	 * @return an AggregatePath that ends like the original {@literal AggregatePath} but has {@literal basePath} removed from the beginning.
+	 * @return an AggregatePath that ends like the original {@literal AggregatePath} but has {@literal basePath} removed
+	 *         from the beginning.
 	 */
 	@Nullable
 	AggregatePath subtract(@Nullable AggregatePath basePath);
 
 	/**
 	 * Compares this {@code AggregatePath} to another {@code AggregatePath} based on their dot path notation.
 	 * <p>
-	 * This is used to get {@code AggregatePath} instances sorted in a consistent way. Since this order affects generated SQL this also affects query caches and similar.
+	 * This is used to get {@code AggregatePath} instances sorted in a consistent way. Since this order affects generated
+	 * SQL this also affects query caches and similar.
 	 *
 	 * @param other the {@code AggregatePath} to compare to. Must not be {@literal null}.
-	 * @return a negative integer, zero, or a positive integer as this object's path is less than,
-	 * equal to, or greater than the specified object's path.
+	 * @return a negative integer, zero, or a positive integer as this object's path is less than, equal to, or greater
+	 *         than the specified object's path.
 	 */
 	@Override
 	default int compareTo(@NonNull AggregatePath other) {
@@ -286,21 +289,21 @@ default int compareTo(@NonNull AggregatePath other) {
 	/**
 	 * Information about a table underlying an entity.
 	 *
-	 * @param qualifiedTableName       the fully qualified name of the table this path is tied to or of the longest ancestor path that is actually
-	 *                                 tied to a table. Must not be {@literal null}.
-	 * @param tableAlias               the alias used for the table on which this path is based. May be {@literal null}.
-	 * @param backReferenceColumnInfos information about the columns used to reference back to the owning entity. Must not be {@literal null}. Since 3.5.
-	 * @param qualifierColumnInfo      the column used for the list index or map key of the leaf property of this path. May be {@literal null}.
-	 * @param qualifierColumnType      the type of the qualifier column of the leaf property of this path or {@literal null} if this is not applicable. May be {@literal null}.
-	 * @param idColumnInfos            the column name of the id column of the ancestor path that represents an actual table. Must not be {@literal null}.
+	 * @param qualifiedTableName the fully qualified name of the table this path is tied to or of the longest ancestor
+	 *          path that is actually tied to a table. Must not be {@literal null}.
+	 * @param tableAlias the alias used for the table on which this path is based. May be {@literal null}.
+	 * @param backReferenceColumnInfos information about the columns used to reference back to the owning entity. Must not
+	 *          be {@literal null}. Since 3.5.
+	 * @param qualifierColumnInfo the column used for the list index or map key of the leaf property of this path. May be
+	 *          {@literal null}.
+	 * @param qualifierColumnType the type of the qualifier column of the leaf property of this path or {@literal null} if
+	 *          this is not applicable. May be {@literal null}.
+	 * @param idColumnInfos the column name of the id column of the ancestor path that represents an actual table. Must
+	 *          not be {@literal null}.
 	 */
-	record TableInfo(
-			SqlIdentifier qualifiedTableName,
-			@Nullable SqlIdentifier tableAlias,
-			ColumnInfos backReferenceColumnInfos,
-			@Nullable ColumnInfo qualifierColumnInfo,
-			@Nullable Class<?> qualifierColumnType,
-			ColumnInfos idColumnInfos) {
+	record TableInfo(SqlIdentifier qualifiedTableName, @Nullable SqlIdentifier tableAlias,
+			ColumnInfos backReferenceColumnInfos, @Nullable ColumnInfo qualifierColumnInfo,
+			@Nullable Class<?> qualifierColumnType, ColumnInfos idColumnInfos) {
 
 		static TableInfo of(AggregatePath path) {
 
@@ -329,13 +332,13 @@ static TableInfo of(AggregatePath path) {
 
 			ColumnInfos idColumnInfos = computeIdColumnInfos(tableOwner, leafEntity);
 
-			return new TableInfo(qualifiedTableName, tableAlias, backReferenceColumnInfos, qualifierColumnInfo, qualifierColumnType,
-					idColumnInfos);
+			return new TableInfo(qualifiedTableName, tableAlias, backReferenceColumnInfos, qualifierColumnInfo,
+					qualifierColumnType, idColumnInfos);
 
 		}
 
 		private static ColumnInfos computeIdColumnInfos(AggregatePath tableOwner,
-														RelationalPersistentEntity<?> leafEntity) {
+				RelationalPersistentEntity<?> leafEntity) {
 
 			ColumnInfos idColumnInfos = ColumnInfos.empty(tableOwner);
 			if (!leafEntity.hasIdProperty()) {
@@ -370,8 +373,7 @@ private static ColumnInfos computeBackReferenceColumnInfos(AggregatePath path) {
 			AggregatePath idDefiningParentPath = tableOwner.getIdDefiningParentPath();
 			RelationalPersistentProperty idProperty = idDefiningParentPath.getRequiredLeafEntity().getIdProperty();
 
-			AggregatePath basePath = idProperty != null && idProperty.isEntity()
-					? idDefiningParentPath.append(idProperty)
+			AggregatePath basePath = idProperty != null && idProperty.isEntity() ? idDefiningParentPath.append(idProperty)
 					: idDefiningParentPath;
 			ColumInfosBuilder ciBuilder = new ColumInfosBuilder(basePath);
 
@@ -394,11 +396,9 @@ private static ColumnInfos computeBackReferenceColumnInfos(AggregatePath path) {
 				SqlIdentifier alias = AggregatePathTableUtils.prefixWithTableAlias(path, reverseColumnName);
 
 				if (idProperty != null) {
-					ciBuilder.add(idProperty, reverseColumnName,
-							alias);
+					ciBuilder.add(idProperty, reverseColumnName, alias);
 				} else {
-					ciBuilder.add(idDefiningParentPath, reverseColumnName,
-							alias);
+					ciBuilder.add(idDefiningParentPath, reverseColumnName, alias);
 				}
 			}
 			return ciBuilder.build();
@@ -414,7 +414,8 @@ public ColumnInfos backReferenceColumnInfos() {
 		 *
 		 * @return guaranteed not to be {@literal null}.
 		 * @throws IllegalStateException if there is not exactly one back referencing column.
-		 * @deprecated since there might be more than one reverse column instead. Use {@link #backReferenceColumnInfos()} instead.
+		 * @deprecated since there might be more than one reverse column instead. Use {@link #backReferenceColumnInfos()}
+		 *             instead.
 		 */
 		@Deprecated(forRemoval = true)
 		public ColumnInfo reverseColumnInfo() {
@@ -425,10 +426,12 @@ public ColumnInfo reverseColumnInfo() {
 		 * The id columns of the underlying table.
 		 * <p>
 		 * These might be:
-		 * <ul><li>the columns representing the id of the entity in question.
-		 * </li><li> the columns representing the id of a parent entity, which _owns_ the table. Note that this case also covers the first case.
-		 * </li><li> or the backReferenceColumns.
-		 * </li></ul>
+		 * <ul>
+		 * <li>the columns representing the id of the entity in question.</li>
+		 * <li>the columns representing the id of a parent entity, which _owns_ the table. Note that this case also covers
+		 * the first case.</li>
+		 * <li>or the backReferenceColumns.</li>
+		 * </ul>
 		 *
 		 * @return ColumnInfos representing the effective id of this entity. Guaranteed not to be {@literal null}.
 		 */
@@ -438,7 +441,7 @@ public ColumnInfos effectiveIdColumnInfos() {
 	}
 
 	/**
-	 * @param name  the name of the column used to represent this property in the database.
+	 * @param name the name of the column used to represent this property in the database.
 	 * @param alias the alias for the column used to represent this property in the database.
 	 * @since 3.2
 	 */
@@ -451,7 +454,7 @@ record ColumnInfo(SqlIdentifier name, SqlIdentifier alias) {
 		 * @param path the path to the {@literal ColumnInfo} for.
 		 * @return the {@link ColumnInfo}.
 		 * @throws IllegalArgumentException if the path is {@link #isRoot()}, {@link #isEmbedded()} or
-		 *                                  {@link #isMultiValued()}.
+		 *           {@link #isMultiValued()}.
 		 */
 		static ColumnInfo of(AggregatePath path) {
 
@@ -483,8 +486,8 @@ class ColumnInfos {
 		/**
 		 * Creates a new ColumnInfos instances based on the arguments.
 		 *
-		 * @param basePath    The path on which all other paths in the other argument are based on. For the typical case of a
-		 *                    composite id, this would be the path to the composite ids.
+		 * @param basePath The path on which all other paths in the other argument are based on. For the typical case of a
+		 *          composite id, this would be the path to the composite ids.
 		 * @param columnInfos A map, mapping {@literal AggregatePath} instances to the respective {@literal ColumnInfo}
 		 */
 		ColumnInfos(AggregatePath basePath, Map<AggregatePath, ColumnInfo> columnInfos) {
@@ -542,7 +545,7 @@ public boolean isEmpty() {
 		 * Applies a function to all the {@link ColumnInfo} instances and returns the result in a list.
 		 *
 		 * @param mapper the function to be applied
-		 * @param <T>    the type returned by {@literal mapper} and contained in the resulting {@literal List}
+		 * @param <T> the type returned by {@literal mapper} and contained in the resulting {@literal List}
 		 * @return the list of results from mapper.
 		 */
 		public <T> List<T> toList(Function<ColumnInfo, T> mapper) {
@@ -561,12 +564,12 @@ public List<Column> toColumnList(Table table) {
 		 * {@link BinaryOperator combiner} is called with the current state (or initial {@code identity}) and the
 		 * accumulated {@code T} state to combine both into a single return value.
 		 *
-		 * @param identity    the identity (initial) value for the combiner function.
+		 * @param identity the identity (initial) value for the combiner function.
 		 * @param accumulator an associative, non-interfering (free of side effects), stateless function for incorporating
-		 *                    an additional element into a result.
-		 * @param combiner    an associative, non-interfering, stateless function for combining two values, which must be
-		 *                    compatible with the {@code accumulator} function.
-		 * @param <T>         type of the result.
+		 *          an additional element into a result.
+		 * @param combiner an associative, non-interfering, stateless function for combining two values, which must be
+		 *          compatible with the {@code accumulator} function.
+		 * @param <T> type of the result.
 		 * @return result of the function.
 		 * @since 3.5
 		 */