|
49 | 49 | import org.springframework.data.mapping.PersistentPropertyAccessor; |
50 | 50 | import org.springframework.data.mapping.PersistentPropertyPath; |
51 | 51 | import org.springframework.data.mapping.PersistentPropertyPathAccessor; |
52 | | -import org.springframework.data.mapping.PreferredConstructor; |
53 | 52 | import org.springframework.data.mapping.context.MappingContext; |
54 | 53 | import org.springframework.data.mapping.model.ConvertingPropertyAccessor; |
55 | 54 | import org.springframework.data.mapping.model.DefaultSpELExpressionEvaluator; |
@@ -338,11 +337,11 @@ private <R> R doReadProjection(ConversionContext context, CassandraValueProvider |
338 | 337 | CassandraValueProvider valueProviderToUse = new TranslatingCassandraValueProvider(propertyTranslator, |
339 | 338 | valueProvider); |
340 | 339 |
|
341 | | - PreferredConstructor<?, CassandraPersistentProperty> persistenceConstructor = mappedEntity |
342 | | - .getPersistenceConstructor(); |
| 340 | + InstanceCreatorMetadata<CassandraPersistentProperty> persistenceCreator = mappedEntity |
| 341 | + .getInstanceCreatorMetadata(); |
343 | 342 |
|
344 | 343 | ParameterValueProvider<CassandraPersistentProperty> provider; |
345 | | - if (persistenceConstructor != null && persistenceConstructor.hasParameters()) { |
| 344 | + if (persistenceCreator != null && persistenceCreator.hasParameters()) { |
346 | 345 | SpELExpressionEvaluator evaluator = new DefaultSpELExpressionEvaluator(valueProviderToUse.getSource(), |
347 | 346 | spELContext); |
348 | 347 | ParameterValueProvider<CassandraPersistentProperty> parameterValueProvider = newParameterValueProvider(context, |
@@ -508,10 +507,10 @@ private static Class<?> getRawSourceType(CassandraValueProvider valueProvider) { |
508 | 507 | private <S> S doReadEntity(ConversionContext context, CassandraValueProvider valueProvider, |
509 | 508 | CassandraPersistentEntity<S> entity) { |
510 | 509 |
|
511 | | - PreferredConstructor<S, CassandraPersistentProperty> persistenceConstructor = entity.getPersistenceConstructor(); |
| 510 | + InstanceCreatorMetadata<CassandraPersistentProperty> persistenceCreator = entity.getInstanceCreatorMetadata(); |
512 | 511 | ParameterValueProvider<CassandraPersistentProperty> provider; |
513 | 512 |
|
514 | | - if (persistenceConstructor != null && persistenceConstructor.hasParameters()) { |
| 513 | + if (persistenceCreator != null && persistenceCreator.hasParameters()) { |
515 | 514 | SpELExpressionEvaluator evaluator = new DefaultSpELExpressionEvaluator(valueProvider.getSource(), spELContext); |
516 | 515 | ParameterValueProvider<CassandraPersistentProperty> parameterValueProvider = newParameterValueProvider(context, |
517 | 516 | entity, valueProvider); |
|
0 commit comments