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

Don't create PersistentEntity for Nullable wrapper type.

Browse Source 
Original pull request: #2394.
Closes #2390.
This commit is contained in:
Christoph Strobl
2021-06-23 15:29:15 +02:00
committed by Mark Paluch
parent 26c2db248b
commit 1f77786d89
3 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
View File

@@ -30,6 +30,7 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -61,6 +62,7 @@ import org.springframework.data.spel.EvaluationContextProvider;
import org.springframework.data.spel.ExtensionAwareEvaluationContextProvider;
import org.springframework.data.util.ClassTypeInformation;
import org.springframework.data.util.KotlinReflectionUtils;
import org.springframework.data.util.NullableWrapperConverters;
import org.springframework.data.util.Optionals;
import org.springframework.data.util.Streamable;
import org.springframework.data.util.TypeInformation;
@@ -483,6 +485,9 @@ public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?
if (simpleTypeHolder.isSimpleType(type.getType())) {
return false;
}
if(NullableWrapperConverters.supports(type.getType())) {
return false;
}
return !KotlinDetector.isKotlinType(type.getType()) || KotlinReflectionUtils.isSupportedKotlinClass(type.getType());
}
@@ -569,7 +574,19 @@ public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?
return;
}
property.getPersistentEntityTypes().forEach(AbstractMappingContext.this::addPersistentEntity);
StreamSupport.stream(property.getPersistentEntityTypes().spliterator(), false)
.map(it -> {
if(it.isNullableWrapper()) {
return it.getActualType();
}
return it;
})
.filter(it -> {
boolean shouldCreate = AbstractMappingContext.this.shouldCreatePersistentEntityFor(it);
return shouldCreate;
})
.forEach(AbstractMappingContext.this::addPersistentEntity);
}
protected boolean shouldSkipOverrideProperty(P property) {