Adapt to changes in entity creation metadata APIs in Spring Data Commons.

Author: odrotbohm

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverter.java

@@ -27,7 +27,6 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.context.ApplicationContext;
@@ -40,15 +39,7 @@
 import org.springframework.data.cassandra.core.mapping.*;
 import org.springframework.data.cassandra.core.mapping.Embedded.OnEmpty;
 import org.springframework.data.convert.CustomConversions;
-import org.springframework.data.mapping.AccessOptions;
-import org.springframework.data.mapping.MappingException;
-import org.springframework.data.mapping.PersistentEntity;
-import org.springframework.data.mapping.PersistentProperty;
-import org.springframework.data.mapping.PersistentPropertyAccessor;
-import org.springframework.data.mapping.PersistentPropertyPath;
-import org.springframework.data.mapping.PersistentPropertyPathAccessor;
-import org.springframework.data.mapping.PreferredConstructor;
-import org.springframework.data.mapping.PreferredConstructor.Parameter;
+import org.springframework.data.mapping.*;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.model.ConvertingPropertyAccessor;
 import org.springframework.data.mapping.model.DefaultSpELExpressionEvaluator;
@@ -1446,10 +1437,9 @@ public CassandraPersistentEntityParameterValueProvider(CassandraPersistentEntity
 		@SuppressWarnings("unchecked")
 		public <T> T getParameterValue(Parameter<T, CassandraPersistentProperty> parameter) {
 
-			PreferredConstructor<CassandraPersistentEntity<?>, CassandraPersistentProperty> constructor = (PreferredConstructor<CassandraPersistentEntity<?>, CassandraPersistentProperty>) entity
-					.getPersistenceConstructor();
+			InstanceCreatorMetadata<CassandraPersistentProperty> creatorMetadata = entity.getInstanceCreatorMetadata();
 
-			if (constructor != null && constructor.isEnclosingClassParameter(parameter)) {
+			if (creatorMetadata != null && creatorMetadata.isParentParameter(parameter)) {
 				return (T) parent;
 			}
 

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/EmbeddedEntityOperations.java

@@ -132,11 +132,21 @@ public String getName() {
 		public PreferredConstructor<T, CassandraPersistentProperty> getPersistenceConstructor() {
 			return delegate.getPersistenceConstructor();
 		}
+		
+		@Override
+		public InstanceCreatorMetadata<CassandraPersistentProperty> getInstanceCreatorMetadata() {
+			return delegate.getInstanceCreatorMetadata();
+		}
 
 		@Override
 		public boolean isConstructorArgument(PersistentProperty<?> property) {
 			return delegate.isConstructorArgument(property);
 		}
+		
+		@Override
+		public boolean isCreatorArgument(PersistentProperty<?> property) {
+			return delegate.isCreatorArgument(property);
+		}
 
 		@Override
 		public boolean isIdProperty(PersistentProperty<?> property) {

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraQueryExecution.java

@@ -23,6 +23,7 @@
 import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity;
 import org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty;
 import org.springframework.data.cassandra.core.query.CassandraPageRequest;
+import org.springframework.data.convert.DtoInstantiatingConverter;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
 import org.springframework.data.domain.SliceImpl;

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/DtoInstantiatingConverter.java

@@ -21,13 +21,13 @@
 import java.util.List;
 
 import org.reactivestreams.Publisher;
-
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.data.cassandra.core.ReactiveCassandraOperations;
 import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity;
 import org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty;
 import org.springframework.data.cassandra.core.query.CassandraPageRequest;
+import org.springframework.data.convert.DtoInstantiatingConverter;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
 import org.springframework.data.domain.SliceImpl;