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

Ignore override properties when creating PersistentEntity.

Browse Source 
Original pull request: #390.
Closes #1911.
This commit is contained in:
Christoph Strobl
2019-04-05 18:34:40 +02:00
committed by Mark Paluch
parent 35b8a42e3d
commit 85578b5cb1
3 changed files with 142 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.InitializingBean;
@@ -62,6 +64,7 @@ import org.springframework.data.util.Streamable;
import org.springframework.data.util.TypeInformation;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.ReflectionUtils;
import org.springframework.util.ReflectionUtils.FieldCallback;
import org.springframework.util.ReflectionUtils.FieldFilter;
@@ -87,6 +90,8 @@ import org.springframework.util.ReflectionUtils.FieldFilter;
public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?, P>, P extends PersistentProperty<P>>
implements MappingContext<E, P>, ApplicationEventPublisherAware, ApplicationContextAware, InitializingBean {
private static final Logger LOGGER = LoggerFactory.getLogger(MappingContext.class);
private final Optional<E> NONE = Optional.empty();
private final Map<TypeInformation<?>, Optional<E>> persistentEntities = new HashMap<>();
private final PersistentPropertyAccessorFactory persistentPropertyAccessorFactory;
@@ -550,6 +555,10 @@ public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?
return;
}
if (isKotlinOverride(property, input)) {
return;
}
entity.addPersistentProperty(property);
if (property.isAssociation()) {
@@ -562,6 +571,38 @@ public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?
property.getPersistentEntityTypes().forEach(AbstractMappingContext.this::addPersistentEntity);
}
private boolean isKotlinOverride(P property, Property input) {
if (!KotlinDetector.isKotlinPresent() || !input.getField().isPresent()) {
return false;
}
Field field = input.getField().get();
if (!KotlinDetector.isKotlinType(field.getDeclaringClass())) {
return false;
}
for (P existingProperty : entity) {
if (!property.getName().equals(existingProperty.getName())) {
continue;
}
if (field.getDeclaringClass() != entity.getType()
&& ClassUtils.isAssignable(field.getDeclaringClass(), entity.getType())) {
if (LOGGER.isTraceEnabled()) {
LOGGER.trace(String.format("Skipping '%s.%s' property declaration shadowed by '%s %s' in '%s'. ",
field.getDeclaringClass().getName(), property.getName(), property.getType().getSimpleName(),
property.getName(), entity.getType().getSimpleName()));
}
return true;
}
}
return false;
}
}
/**