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

DATAJDBC-370 - Polishing.

Browse Source 
Refactored code to better use existing code.

Original Pull Request: #151
This commit is contained in:
Jens Schauder
2019-05-10 13:03:05 +02:00
committed by Christoph Strobl
parent 3a89ec0444
commit bf3f99c585
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -351,31 +351,23 @@ public class BasicJdbcConverter extends BasicRelationalConverter implements Jdbc
@Nullable
private Object readEmbeddedEntityFrom(@Nullable Object idValue, RelationalPersistentProperty property) {
ReadingContext<?> ctx = extendBy(property);
return hasInstanceValues(property, ctx) ? ctx.createInstanceInternal(idValue) : null;
ReadingContext<?> newContext = extendBy(property);
return newContext.hasInstanceValues(idValue) ? newContext.createInstanceInternal(idValue) : null;
}
private boolean hasInstanceValues(RelationalPersistentProperty property, ReadingContext<?> ctx) {
private boolean hasInstanceValues(Object idValue) {
RelationalPersistentEntity<?> persistentEntity = getMappingContext()
.getPersistentEntity(property.getTypeInformation());
PersistentPropertyPathExtension extension = ctx.path;
RelationalPersistentEntity<?> persistentEntity = path.getLeafEntity();
for (RelationalPersistentProperty embeddedProperty : persistentEntity) {
// if the embedded contains Lists, Sets or Maps we consider it non-empty
if (embeddedProperty.isQualified() || embeddedProperty.isReference()) {
return true;
}
try {
if (ctx.getObjectFromResultSet(extension.extendBy(embeddedProperty).getColumnName()) != null) {
return true;
}
} catch (MappingException e) {
if (ctx.getObjectFromResultSet(extension.extendBy(embeddedProperty).getReverseColumnNameAlias()) != null) {
return true;
}
if (readOrLoadProperty(idValue, embeddedProperty) != null) {
return true;
}
}