Simplified forQueryId

Author: schauder

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

@@ -19,6 +19,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.function.Predicate;
 
 import org.springframework.data.jdbc.core.mapping.JdbcValue;
@@ -60,21 +61,19 @@ public SqlParametersFactory(RelationalMappingContext context, JdbcConverter conv
 	/**
 	 * Creates the parameters for a SQL insert operation.
 	 *
-	 * @param instance the entity to be inserted. Must not be {@code null}.
-	 * @param domainType the type of the instance. Must not be {@code null}.
-	 * @param identifier information about data that needs to be considered for the insert but which is not part of the
-	 *          entity. Namely references back to a parent entity and key/index columns for entities that are stored in a
-	 *          {@link Map} or {@link List}.
+	 * @param instance      the entity to be inserted. Must not be {@code null}.
+	 * @param domainType    the type of the instance. Must not be {@code null}.
+	 * @param identifier    information about data that needs to be considered for the insert but which is not part of the
+	 *                      entity. Namely references back to a parent entity and key/index columns for entities that are stored in a
+	 *                      {@link Map} or {@link List}.
 	 * @param idValueSource the {@link IdValueSource} for the insert.
 	 * @return the {@link SqlIdentifierParameterSource} for the insert. Guaranteed to not be {@code null}.
 	 * @since 2.4
 	 */
-	<T> SqlIdentifierParameterSource forInsert(T instance, Class<T> domainType, Identifier identifier,
-			IdValueSource idValueSource) {
+	<T> SqlIdentifierParameterSource forInsert(T instance, Class<T> domainType, Identifier identifier, IdValueSource idValueSource) {
 
 		RelationalPersistentEntity<T> persistentEntity = getRequiredPersistentEntity(domainType);
-		SqlIdentifierParameterSource parameterSource = getParameterSource(instance, persistentEntity, "",
-				PersistentProperty::isIdProperty);
+		SqlIdentifierParameterSource parameterSource = getParameterSource(instance, persistentEntity, "", PersistentProperty::isIdProperty);
 
 		identifier.forEach((name, value, type) -> addConvertedPropertyValue(parameterSource, name, value, type));
 
@@ -96,21 +95,20 @@ <T> SqlIdentifierParameterSource forInsert(T instance, Class<T> domainType, Iden
 	/**
 	 * Creates the parameters for a SQL update operation.
 	 *
-	 * @param instance the entity to be updated. Must not be {@code null}.
+	 * @param instance   the entity to be updated. Must not be {@code null}.
 	 * @param domainType the type of the instance. Must not be {@code null}.
 	 * @return the {@link SqlIdentifierParameterSource} for the update. Guaranteed to not be {@code null}.
 	 * @since 2.4
 	 */
 	<T> SqlIdentifierParameterSource forUpdate(T instance, Class<T> domainType) {
 
-		return getParameterSource(instance, getRequiredPersistentEntity(domainType), "",
-				RelationalPersistentProperty::isInsertOnly);
+		return getParameterSource(instance, getRequiredPersistentEntity(domainType), "", RelationalPersistentProperty::isInsertOnly);
 	}
 
 	/**
 	 * Creates the parameters for a SQL query by id.
 	 *
-	 * @param id the entity id. Must not be {@code null}.
+	 * @param id         the entity id. Must not be {@code null}.
 	 * @param domainType the type of the instance. Must not be {@code null}.
 	 * @return the {@link SqlIdentifierParameterSource} for the query. Guaranteed to not be {@code null}.
 	 * @since 2.4
@@ -122,37 +120,26 @@ <T> SqlIdentifierParameterSource forQueryById(Object id, Class<T> domainType) {
 		RelationalPersistentEntity<T> entity = getRequiredPersistentEntity(domainType);
 		RelationalPersistentProperty singleIdProperty = entity.getRequiredIdProperty();
 
-		if (singleIdProperty.isEntity()) {
-
-			RelationalPersistentEntity<?> complexId = context.getPersistentEntity(singleIdProperty);
-			PersistentPropertyPathAccessor<Object> accessor = complexId.getPropertyPathAccessor(id);
+		RelationalPersistentEntity<?> complexId = context.getPersistentEntity(singleIdProperty);
 
-			context.getAggregatePath(entity).getTableInfo().idColumnInfos().forEach((ap, ci) -> {
-				Object idValue = accessor.getProperty(ap.getRequiredPersistentPropertyPath());
+		Function<AggregatePath, Object> valueExtractor = complexId == null
+				? ap -> id
+				: ap -> complexId.getPropertyPathAccessor(id).getProperty(ap.getRequiredPersistentPropertyPath());
 
-				addConvertedPropertyValue( //
+		context.getAggregatePath(entity).getTableInfo().idColumnInfos() //
+				.forEach((ap, ci) -> addConvertedPropertyValue( //
 						parameterSource, //
 						ap.getRequiredLeafProperty(), //
-						idValue, //
+						valueExtractor.apply(ap), //
 						ci.name() //
-				);
-			});
-		} else {
-
-			addConvertedPropertyValue( //
-					parameterSource, //
-					singleIdProperty, //
-					id, //
-					singleIdProperty.getColumnName() //
-			);
-		}
+				));
 		return parameterSource;
 	}
 
 	/**
 	 * Creates the parameters for a SQL query by ids.
 	 *
-	 * @param ids the entity ids. Must not be {@code null}.
+	 * @param ids        the entity ids. Must not be {@code null}.
 	 * @param domainType the type of the instance. Must not be {@code null}.
 	 * @return the {@link SqlIdentifierParameterSource} for the query. Guaranteed to not be {@code null}.
 	 * @since 2.4
@@ -184,8 +171,7 @@ <T> SqlIdentifierParameterSource forQueryByIds(Iterable<?> ids, Class<T> domainT
 
 			parameterSource.addValue(SqlGenerator.IDS_SQL_PARAMETER, parameterValues);
 		} else {
-			addConvertedPropertyValuesAsList(parameterSource, getRequiredPersistentEntity(domainType).getRequiredIdProperty(),
-					ids);
+			addConvertedPropertyValuesAsList(parameterSource, getRequiredPersistentEntity(domainType).getRequiredIdProperty(), ids);
 		}
 		return parameterSource;
 	}
@@ -201,27 +187,22 @@ SqlIdentifierParameterSource forQueryByIdentifier(Identifier identifier) {
 
 		SqlIdentifierParameterSource parameterSource = new SqlIdentifierParameterSource();
 
-		identifier.toMap()
-				.forEach((name, value) -> addConvertedPropertyValue(parameterSource, name, value, value.getClass()));
+		identifier.toMap().forEach((name, value) -> addConvertedPropertyValue(parameterSource, name, value, value.getClass()));
 
 		return parameterSource;
 	}
 
-	private void addConvertedPropertyValue(SqlIdentifierParameterSource parameterSource,
-			RelationalPersistentProperty property, @Nullable Object value, SqlIdentifier name) {
+	private void addConvertedPropertyValue(SqlIdentifierParameterSource parameterSource, RelationalPersistentProperty property, @Nullable Object value, SqlIdentifier name) {
 
-		addConvertedValue(parameterSource, value, name, converter.getColumnType(property),
-				converter.getTargetSqlType(property));
+		addConvertedValue(parameterSource, value, name, converter.getColumnType(property), converter.getTargetSqlType(property));
 	}
 
-	private void addConvertedPropertyValue(SqlIdentifierParameterSource parameterSource, SqlIdentifier name, Object value,
-			Class<?> javaType) {
+	private void addConvertedPropertyValue(SqlIdentifierParameterSource parameterSource, SqlIdentifier name, Object value, Class<?> javaType) {
 
 		addConvertedValue(parameterSource, value, name, javaType, JdbcUtil.targetSqlTypeFor(javaType));
 	}
 
-	private void addConvertedValue(SqlIdentifierParameterSource parameterSource, @Nullable Object value,
-			SqlIdentifier paramName, Class<?> javaType, SQLType sqlType) {
+	private void addConvertedValue(SqlIdentifierParameterSource parameterSource, @Nullable Object value, SqlIdentifier paramName, Class<?> javaType, SQLType sqlType) {
 
 		JdbcValue jdbcValue = converter.writeJdbcValue( //
 				value, //
@@ -235,8 +216,7 @@ private void addConvertedValue(SqlIdentifierParameterSource parameterSource, @Nu
 				jdbcValue.getJdbcType().getVendorTypeNumber());
 	}
 
-	private void addConvertedPropertyValuesAsList(SqlIdentifierParameterSource parameterSource,
-			RelationalPersistentProperty property, Iterable<?> values) {
+	private void addConvertedPropertyValuesAsList(SqlIdentifierParameterSource parameterSource, RelationalPersistentProperty property, Iterable<?> values) {
 
 		List<Object> convertedIds = new ArrayList<>();
 		JdbcValue jdbcValue = null;
@@ -262,14 +242,11 @@ private <S> RelationalPersistentEntity<S> getRequiredPersistentEntity(Class<S> d
 		return (RelationalPersistentEntity<S>) context.getRequiredPersistentEntity(domainType);
 	}
 
-	private <S, T> SqlIdentifierParameterSource getParameterSource(@Nullable S instance,
-			RelationalPersistentEntity<S> persistentEntity, String prefix,
-			Predicate<RelationalPersistentProperty> skipProperty) {
+	private <S, T> SqlIdentifierParameterSource getParameterSource(@Nullable S instance, RelationalPersistentEntity<S> persistentEntity, String prefix, Predicate<RelationalPersistentProperty> skipProperty) {
 
 		SqlIdentifierParameterSource parameters = new SqlIdentifierParameterSource();
 
-		PersistentPropertyAccessor<S> propertyAccessor = instance != null ? persistentEntity.getPropertyAccessor(instance)
-				: NoValuePropertyAccessor.instance();
+		PersistentPropertyAccessor<S> propertyAccessor = instance != null ? persistentEntity.getPropertyAccessor(instance) : NoValuePropertyAccessor.instance();
 
 		persistentEntity.doWithAll(property -> {
 
@@ -284,8 +261,7 @@ private <S, T> SqlIdentifierParameterSource getParameterSource(@Nullable S insta
 
 				Object value = propertyAccessor.getProperty(property);
 				RelationalPersistentEntity<?> embeddedEntity = context.getPersistentEntity(property.getTypeInformation());
-				SqlIdentifierParameterSource additionalParameters = getParameterSource((T) value,
-						(RelationalPersistentEntity<T>) embeddedEntity, prefix + property.getEmbeddedPrefix(), skipProperty);
+				SqlIdentifierParameterSource additionalParameters = getParameterSource((T) value, (RelationalPersistentEntity<T>) embeddedEntity, prefix + property.getEmbeddedPrefix(), skipProperty);
 				parameters.addAll(additionalParameters);
 			} else {