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

DATAJDBC-374 - Polishing.

Browse Source 
Clarified the effects of collections on nullable embedded entities.

Original pull request: #154.
This commit is contained in:
Jens Schauder
2019-05-22 12:46:15 +02:00
parent 55a3f9c372
commit ebe76a0c7f
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -378,11 +378,15 @@ public class BasicJdbcConverter extends BasicRelationalConverter implements Jdbc
ReadingContext<?> newContext = extendBy(property); ReadingContext<?> newContext = extendBy(property);
if(OnEmpty.USE_EMPTY.equals(property.findAnnotation(Embedded.class).onEmpty())) { if(shouldCreateEmptyEmbeddedInstance(property) || newContext.hasInstanceValues(idValue)) {
return newContext.createInstanceInternal(idValue); return newContext.createInstanceInternal(idValue);
} }
return newContext.hasInstanceValues(idValue) ? newContext.createInstanceInternal(idValue) : null; return null;
}
private boolean shouldCreateEmptyEmbeddedInstance(RelationalPersistentProperty property) {
return OnEmpty.USE_EMPTY.equals(property.findAnnotation(Embedded.class).onEmpty());
} }
private boolean hasInstanceValues(@Nullable Object idValue) { private boolean hasInstanceValues(@Nullable Object idValue) {

3
src/main/asciidoc/jdbc.adoc
View File

@@ -332,6 +332,9 @@ public class MyEntity {
<1> Shortcut for `@Embedded(onEmpty = USE_NULL)`. <1> Shortcut for `@Embedded(onEmpty = USE_NULL)`.
==== ====
Embedded entities containing a `Collection` or a `Map` will always be considered non empty since they will at least contain the empty collection or map.
Such an entity will therefore never be `null` even when using @Embedded(onEmpty = USE_NULL).
[[jdbc.entity-persistence.state-detection-strategies]] [[jdbc.entity-persistence.state-detection-strategies]]
=== Entity State Detection Strategies === Entity State Detection Strategies