Polishing.

Introduce ColumnInfos.reduce(…) operation.

Author: mp911de

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/Identifier.java

@@ -99,6 +99,25 @@ public static Identifier from(Map<SqlIdentifier, Object> map) {
 		return new Identifier(Collections.unmodifiableList(values));
 	}
 
+	/**
+	 * Creates a new {@link Identifier} from the current instance and sets the value from {@link Identifier}. Existing key
+	 * definitions for {@code name} are overwritten if they already exist.
+	 *
+	 * @param identifier the identifier to append.
+	 * @return the {@link Identifier} containing all existing keys and the key part for {@code name}, {@code value}, and a
+	 *         {@link Class target type}.
+	 * @since 3.5
+	 */
+	public Identifier withPart(Identifier identifier) {
+
+		Identifier result = this;
+		for (SingleIdentifierValue part : identifier.getParts()) {
+			result = result.withPart(part.getName(), part.getValue(), part.getTargetType());
+		}
+
+		return result;
+	}
+
 	/**
 	 * Creates a new {@link Identifier} from the current instance and sets the value for {@code key}. Existing key
 	 * definitions for {@code name} are overwritten if they already exist.
@@ -188,6 +207,7 @@ public Object get(SqlIdentifier columnName) {
 		return null;
 	}
 
+
 	/**
 	 * A single value of an Identifier consisting of the column name, the value and the target type which is to be used to
 	 * store the element in the database.

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/JdbcIdentifierBuilder.java

@@ -48,7 +48,7 @@ public static JdbcIdentifierBuilder empty() {
 	public static JdbcIdentifierBuilder forBackReferences(JdbcConverter converter, AggregatePath path, Object value) {
 
 		RelationalPersistentProperty idProperty = path.getIdDefiningParentPath().getRequiredIdProperty();
-		AggregatePath.ColumnInfos reverseColumnInfos = path.getTableInfo().reverseColumnInfos();
+		AggregatePath.ColumnInfos infos = path.getTableInfo().reverseColumnInfos();
 
 		// create property accessor
 		RelationalMappingContext mappingContext = converter.getMappingContext();
@@ -62,16 +62,14 @@ public static JdbcIdentifierBuilder forBackReferences(JdbcConverter converter, A
 			valueProvider = ap -> propertyPathAccessor.getProperty(ap.getRequiredPersistentPropertyPath());
 		}
 
-		final Identifier[] identifierHolder = new Identifier[] { Identifier.empty() };
-
-		reverseColumnInfos.forEach((ap, ci) -> {
+		Identifier identifierHolder = infos.reduce(Identifier.empty(), (ap, ci) -> {
 
 			RelationalPersistentProperty property = ap.getRequiredLeafProperty();
-			identifierHolder[0] = identifierHolder[0].withPart(ci.name(), valueProvider.apply(ap),
+			return Identifier.of(ci.name(), valueProvider.apply(ap),
 					converter.getColumnType(property));
-		});
+		}, Identifier::withPart);
 
-		return new JdbcIdentifierBuilder(identifierHolder[0]);
+		return new JdbcIdentifierBuilder(identifierHolder);
 	}
 
 	/**

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

@@ -23,6 +23,7 @@
 import java.util.TreeMap;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
+import java.util.function.BinaryOperator;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
@@ -475,14 +476,44 @@ public <T> List<T> toList(Function<ColumnInfo, T> mapper) {
 			return columnInfos.values().stream().map(mapper).toList();
 		}
 
+		/**
+		 * Performs a {@link Stream#reduce(Object, BiFunction, BinaryOperator)} on {@link ColumnInfo} and
+		 * {@link AggregatePath} to reduce the results into a single {@code T} return value.
+		 * <p>
+		 * If {@code ColumnInfos} is empty, then {@code identity} is returned. Without invoking {@code combiner}. The
+		 * {@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 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.
+		 * @return result of the function.
+		 * @param <T> type of the result.
+		 * @since 3.5
+		 */
+		public <T> T reduce(T identity, BiFunction<AggregatePath, ColumnInfo, T> accumulator, BinaryOperator<T> combiner) {
+
+			T result = identity;
+
+			for (Map.Entry<AggregatePath, ColumnInfo> entry : columnInfos.entrySet()) {
+
+				T mapped = accumulator.apply(entry.getKey(), entry.getValue());
+				result = combiner.apply(result, mapped);
+			}
+
+			return result;
+		}
+
 		public void forEach(BiConsumer<AggregatePath, ColumnInfo> consumer) {
 			columnInfos.forEach(consumer);
 		}
 
-		public <T> T any(BiFunction<AggregatePath, ColumnInfo, T> consumer) {
+		public <T> T any(BiFunction<AggregatePath, ColumnInfo, T> mapper) {
 
 			Map.Entry<AggregatePath, ColumnInfo> any = columnInfos.entrySet().iterator().next();
-			return consumer.apply(any.getKey(), any.getValue());
+			return mapper.apply(any.getKey(), any.getValue());
 		}
 
 		public ColumnInfo get(AggregatePath path) {