DATAJDBC-352 - Support for embedded composite id.

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-relational-parent</artifactId>
-	<version>2.1.0-SNAPSHOT</version>
+	<version>2.1.0.DATAJDBC-352-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data Relational Parent</name>

spring-data-jdbc-distribution/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-relational-parent</artifactId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>2.1.0.DATAJDBC-352-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-jdbc/pom.xml

@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-data-jdbc</artifactId>
-	<version>2.1.0-SNAPSHOT</version>
+	<version>2.1.0.DATAJDBC-352-SNAPSHOT</version>
 
 	<name>Spring Data JDBC</name>
 	<description>Spring Data module for JDBC repositories.</description>
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-relational-parent</artifactId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>2.1.0.DATAJDBC-352-SNAPSHOT</version>
 	</parent>
 
 	<properties>

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

@@ -55,6 +55,7 @@
  * @author Jens Schauder
  * @author Christoph Strobl
  * @author Myeonghyeon Lee
+ * @author Yunyoung LEE
  * @see MappingContext
  * @see SimpleTypeHolder
  * @see CustomConversions
@@ -436,7 +437,7 @@ private Iterable<Object> resolveRelation(@Nullable Object id, RelationalPersiste
 
 			Identifier identifier = id == null //
 					? this.identifier.withPart(rootPath.getQualifierColumn(), key, Object.class) //
-					: Identifier.of(rootPath.extendBy(property).getReverseColumnName(), id, Object.class);
+					: JdbcIdentifierBuilder.forBackReferences(BasicJdbcConverter.this, rootPath.extendBy(property), id).build();
 
 			PersistentPropertyPath<? extends RelationalPersistentProperty> propertyPath = path.extendBy(property)
 					.getRequiredPersistentPropertyPath();
@@ -512,6 +513,11 @@ private Object readEntityFrom(RelationalPersistentProperty property) {
 
 			if (idProperty != null) {
 				idValue = newContext.readFrom(idProperty);
+			} else if (property.isEmbedded()) {
+				return createInstance(entity, parameter -> {
+					RelationalPersistentProperty parameterProperty = entity.getRequiredPersistentProperty(parameter.getName());
+					return newContext.propertyValueProvider.getPropertyValue(parameterProperty);
+				});
 			} else {
 				idValue = backReferencePropertyValueProvider.getPropertyValue(property);
 			}

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

@@ -37,7 +37,6 @@
 import org.springframework.data.mapping.PersistentPropertyAccessor;
 import org.springframework.data.mapping.PersistentPropertyPath;
 import org.springframework.data.mapping.PropertyHandler;
-import org.springframework.data.relational.core.dialect.LockClause;
 import org.springframework.data.relational.core.mapping.PersistentPropertyPathExtension;
 import org.springframework.data.relational.core.mapping.RelationalMappingContext;
 import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
@@ -66,6 +65,7 @@
  * @author Tyler Van Gorder
  * @author Milan Milanov
  * @author Myeonghyeon Lee
+ * @author Yunyoung LEE
  * @since 1.1
  */
 public class DefaultDataAccessStrategy implements DataAccessStrategy {
@@ -117,7 +117,7 @@ public <T> Object insert(T instance, Class<T> domainType, Identifier identifier)
 		if (idValue != null) {
 
 			RelationalPersistentProperty idProperty = persistentEntity.getRequiredIdProperty();
-			addConvertedPropertyValue(parameterSource, idProperty, idValue, idProperty.getColumnName());
+			addConvertedIdPropertyValue(parameterSource, idProperty, idValue, idProperty.getColumnName());
 		}
 
 		KeyHolder holder = new GeneratedKeyHolder();
@@ -218,7 +218,18 @@ public void delete(Object rootId, PersistentPropertyPath<RelationalPersistentPro
 		String delete = sql(rootEntity.getType()).createDeleteByPath(propertyPath);
 
 		SqlIdentifierParameterSource parameters = new SqlIdentifierParameterSource(getIdentifierProcessing());
-		parameters.addValue(ROOT_ID_PARAMETER, rootId);
+		if (referencingProperty.isEmbedded()) {
+
+			PersistentPropertyAccessor<Object> accessor = rootEntity.getPropertyAccessor(rootId);
+			for (RelationalPersistentProperty property : rootEntity) {
+				parameters.addValue(property.getColumnName(), accessor.getProperty(property));
+			}
+		} else {
+
+			parameters.addValue(new PersistentPropertyPathExtension(context, propertyPath).getEffectiveIdColumnName(),
+					rootId);
+		}
+
 		operations.update(delete, parameters);
 	}
 
@@ -322,13 +333,42 @@ public <T> Iterable<T> findAllById(Iterable<?> ids, Class<T> domainType) {
 		RelationalPersistentProperty idProperty = getRequiredPersistentEntity(domainType).getRequiredIdProperty();
 		SqlIdentifierParameterSource parameterSource = new SqlIdentifierParameterSource(getIdentifierProcessing());
 
-		addConvertedPropertyValuesAsList(parameterSource, idProperty, ids, IDS_SQL_PARAMETER);
+		if (idProperty.isEmbedded()) {
+
+			// NamedParamterUtils#substituteNamedParameters handles Object[] parameterSource as multiple parameter value
+			List<Object[]> idParameters = new ArrayList<>();
+			for (Object id : ids) {
+				List<Object> parameters = new ArrayList<>();
+				extractEmbeddedParameters(parameters, idProperty, id);
+				idParameters.add(parameters.toArray());
+			}
+
+			parameterSource.addValue(IDS_SQL_PARAMETER, idParameters);
+		} else {
+
+			addConvertedPropertyValuesAsList(parameterSource, idProperty, ids, IDS_SQL_PARAMETER);
+		}
 
 		String findAllInListSql = sql(domainType).getFindAllInList();
 
 		return operations.query(findAllInListSql, parameterSource, (RowMapper<T>) getEntityRowMapper(domainType));
 	}
 
+	private void extractEmbeddedParameters(List<Object> parameters, RelationalPersistentProperty property, Object value) {
+
+		if (property.isEmbedded()) {
+
+			final RelationalPersistentEntity<?> embeddedEntity = context.getPersistentEntity(property);
+			final PersistentPropertyAccessor<Object> embeddedAccessor = embeddedEntity.getPropertyAccessor(value);
+
+			embeddedEntity.doWithProperties((PropertyHandler<RelationalPersistentProperty>) embeddedProperty -> //
+			extractEmbeddedParameters(parameters, embeddedProperty, embeddedAccessor.getProperty(embeddedProperty)));
+		} else {
+
+			parameters.add(value);
+		}
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.jdbc.core.RelationResolver#findAllByPath(org.springframework.data.jdbc.support.Identifier, org.springframework.data.mapping.PersistentPropertyPath)
@@ -496,7 +536,7 @@ private <T> SqlIdentifierParameterSource createIdParameterSource(Object id, Clas
 
 		SqlIdentifierParameterSource parameterSource = new SqlIdentifierParameterSource(getIdentifierProcessing());
 
-		addConvertedPropertyValue( //
+		addConvertedIdPropertyValue( //
 				parameterSource, //
 				getRequiredPersistentEntity(domainType).getRequiredIdProperty(), //
 				id, //
@@ -505,6 +545,23 @@ private <T> SqlIdentifierParameterSource createIdParameterSource(Object id, Clas
 		return parameterSource;
 	}
 
+	private void addConvertedIdPropertyValue(SqlIdentifierParameterSource parameterSource,
+			RelationalPersistentProperty property, Object value, SqlIdentifier defaultName) {
+
+		if (property.isEmbedded()) {
+			final RelationalPersistentEntity<?> embeddedEntity = context.getRequiredPersistentEntity(property);
+			final String prefix = property.getEmbeddedPrefix();
+
+			final PersistentPropertyAccessor<Object> propertyAccessor = embeddedEntity.getPropertyAccessor(value);
+			for (final RelationalPersistentProperty embeddedProperty : embeddedEntity) {
+				addConvertedIdPropertyValue(parameterSource, embeddedProperty, propertyAccessor.getProperty(embeddedProperty),
+						embeddedProperty.getColumnName().transform(prefix::concat));
+			}
+		} else {
+			addConvertedPropertyValue(parameterSource, property, value, defaultName);
+		}
+	}
+
 	private IdentifierProcessing getIdentifierProcessing() {
 		return sqlGeneratorSource.getDialect().getIdentifierProcessing();
 	}

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

@@ -15,14 +15,22 @@
  */
 package org.springframework.data.jdbc.core.convert;
 
+import java.util.Iterator;
+import java.util.stream.StreamSupport;
+
+import org.springframework.data.mapping.PersistentPropertyAccessor;
 import org.springframework.data.relational.core.mapping.PersistentPropertyPathExtension;
+import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
+import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
+import org.springframework.data.relational.core.sql.SqlIdentifier;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
  * Builder for {@link Identifier}. Mainly for internal use within the framework
  *
  * @author Jens Schauder
+ * @author Yunyoung LEE
  * @since 1.1
  */
 public class JdbcIdentifierBuilder {
@@ -43,11 +51,29 @@ public static JdbcIdentifierBuilder empty() {
 	public static JdbcIdentifierBuilder forBackReferences(JdbcConverter converter, PersistentPropertyPathExtension path,
 			@Nullable Object value) {
 
-		Identifier identifier = Identifier.of( //
-				path.getReverseColumnName(), //
-				value, //
-				converter.getColumnType(path.getIdDefiningParentPath().getRequiredIdProperty()) //
-		);
+		Identifier identifier = null;
+
+		RelationalPersistentEntity<?> entity = converter.getMappingContext().getPersistentEntity(value.getClass());
+		if (entity != null) {
+
+			PersistentPropertyAccessor<Object> accessor = entity.getPropertyAccessor(value);
+
+			Iterator<SqlIdentifier> reverseColumnNames = path.getReverseColumnNames().iterator();
+
+			identifier = Identifier.empty();
+			for (RelationalPersistentProperty property : entity) {
+				Assert.state(reverseColumnNames.hasNext(), "no reverse column name for " + property.getName());
+				identifier = identifier.withPart(reverseColumnNames.next(), accessor.getProperty(property),
+						converter.getColumnType(property));
+			}
+		} else {
+
+			identifier = Identifier.of( //
+					path.getReverseColumnName(), //
+					value, //
+					converter.getColumnType(path.getIdDefiningParentPath().getRequiredIdProperty()) //
+			);
+		}
 
 		return new JdbcIdentifierBuilder(identifier);
 	}