Spring/spring-data-relational
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Recursively check embedded property loading.

Browse Source 
Also, avoid falling back into hasValue(…) code path.

See #1676
Original pull request: #1685
This commit is contained in:
Mark Paluch
2023-12-05 10:57:29 +01:00
parent e5bcc4a155
commit b20461c067
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/MappingRelationalConverter.java
View File

@@ -552,7 +552,7 @@ public class MappingRelationalConverter extends AbstractRelationalConverter impl
RowDocumentAccessor source, RelationalPersistentProperty property,
RelationalPersistentEntity<?> persistentEntity) {
if (shouldReadEmbeddable(conversionContext, property, persistentEntity, provider, source)) {
if (shouldReadEmbeddable(conversionContext, property, persistentEntity, provider)) {
return read(conversionContext, persistentEntity, source);
}
@@ -560,8 +560,7 @@ public class MappingRelationalConverter extends AbstractRelationalConverter impl
}
private boolean shouldReadEmbeddable(ConversionContext context, RelationalPersistentProperty property,
RelationalPersistentEntity<?> unwrappedEntity, RelationalPropertyValueProvider propertyValueProvider,
RowDocumentAccessor source) {
RelationalPersistentEntity<?> unwrappedEntity, RelationalPropertyValueProvider propertyValueProvider) {
OnEmpty onEmpty = property.getRequiredAnnotation(Embedded.class).onEmpty();
@@ -576,16 +575,14 @@ public class MappingRelationalConverter extends AbstractRelationalConverter impl
if (persistentProperty.isEmbedded()) {
TypeInformation<?> typeInformation = persistentProperty.getTypeInformation();
RelationalPersistentEntity<?> nestedEntity = getMappingContext()
.getRequiredPersistentEntity(persistentProperty);
RelationalPersistentEntity<?> nestedEntity = getMappingContext().getPersistentEntity(typeInformation);
if (readEmbedded(nestedContext, contextual, source, persistentProperty, nestedEntity) != null) {
if (shouldReadEmbeddable(nestedContext, persistentProperty, nestedEntity, contextual)) {
return true;
}
}
if (contextual.hasValue(persistentProperty)) {
} else if (contextual.hasValue(persistentProperty)) {
return true;
}
}