Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-06-22 03:52:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

DATAES-956 - Prevent double converter registration.

Browse Source 
Original PR: #541
This commit is contained in:
Peter-Josef Meisch 2020-10-18 19:05:31 +02:00 committed by GitHub
parent 8a6e1254bb
commit 7198a02a00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverter.java
View File

@ -82,7 +82,8 @@ public class MappingElasticsearchConverter
private final MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext; private final MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext;
private final GenericConversionService conversionService; private final GenericConversionService conversionService;
private CustomConversions conversions = new ElasticsearchCustomConversions(Collections.emptyList()); // don't access directly, use getConversions(). to prevent null access
@Nullable private CustomConversions conversions = null;
private final EntityInstantiators instantiators = new EntityInstantiators(); private final EntityInstantiators instantiators = new EntityInstantiators();
private final ElasticsearchTypeMapper typeMapper; private final ElasticsearchTypeMapper typeMapper;
@ -133,6 +134,14 @@ public class MappingElasticsearchConverter
this.conversions = conversions; this.conversions = conversions;
} }
private CustomConversions getConversions() {
if (conversions == null) {
conversions = new ElasticsearchCustomConversions(Collections.emptyList());
}
return conversions;
}
/* /*
* (non-Javadoc) * (non-Javadoc)
* @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
@ -140,7 +149,7 @@ public class MappingElasticsearchConverter
@Override @Override
public void afterPropertiesSet() { public void afterPropertiesSet() {
DateFormatterRegistrar.addDateConverters(conversionService); DateFormatterRegistrar.addDateConverters(conversionService);
conversions.registerConvertersIn(conversionService); getConversions().registerConvertersIn(conversionService);
} }
// region read // region read
@ -151,7 +160,7 @@ public class MappingElasticsearchConverter
TypeInformation<R> typeHint = ClassTypeInformation.from((Class<R>) ClassUtils.getUserClass(type)); TypeInformation<R> typeHint = ClassTypeInformation.from((Class<R>) ClassUtils.getUserClass(type));
typeHint = (TypeInformation<R>) typeMapper.readType(source, typeHint); typeHint = (TypeInformation<R>) typeMapper.readType(source, typeHint);
if (conversions.hasCustomReadTarget(Map.class, typeHint.getType())) { if (getConversions().hasCustomReadTarget(Map.class, typeHint.getType())) {
R converted = conversionService.convert(source, typeHint.getType()); R converted = conversionService.convert(source, typeHint.getType());
if (converted == null) { if (converted == null) {
// EntityReader.read is defined as non nullable , so we cannot return null // EntityReader.read is defined as non nullable , so we cannot return null
@ -177,7 +186,7 @@ public class MappingElasticsearchConverter
EntityInstantiator instantiator = instantiators.getInstantiatorFor(targetEntity); EntityInstantiator instantiator = instantiators.getInstantiatorFor(targetEntity);
@SuppressWarnings("unchecked") @SuppressWarnings({"unchecked", "ConstantConditions"})
R instance = (R) instantiator.createInstance(targetEntity, R instance = (R) instantiator.createInstance(targetEntity,
new PersistentEntityParameterValueProvider<>(targetEntity, propertyValueProvider, null)); new PersistentEntityParameterValueProvider<>(targetEntity, propertyValueProvider, null));
@ -223,6 +232,7 @@ public class MappingElasticsearchConverter
if (source instanceof SearchDocument) { if (source instanceof SearchDocument) {
SearchDocument searchDocument = (SearchDocument) source; SearchDocument searchDocument = (SearchDocument) source;
if (targetEntity.hasScoreProperty()) { if (targetEntity.hasScoreProperty()) {
//noinspection ConstantConditions
targetEntity.getPropertyAccessor(result) // targetEntity.getPropertyAccessor(result) //
.setProperty(targetEntity.getScoreProperty(), searchDocument.getScore()); .setProperty(targetEntity.getScoreProperty(), searchDocument.getScore());
} }
@ -276,7 +286,7 @@ public class MappingElasticsearchConverter
if (property.hasPropertyConverter()) { if (property.hasPropertyConverter()) {
source = propertyConverterRead(property, source); source = propertyConverterRead(property, source);
} else if (TemporalAccessor.class.isAssignableFrom(property.getType()) } else if (TemporalAccessor.class.isAssignableFrom(property.getType())
&& !conversions.hasCustomReadTarget(source.getClass(), rawType)) { && !getConversions().hasCustomReadTarget(source.getClass(), rawType)) {
// log at most 5 times // log at most 5 times
String propertyName = property.getOwner().getType().getSimpleName() + '.' + property.getName(); String propertyName = property.getOwner().getType().getSimpleName() + '.' + property.getName();
@ -291,7 +301,7 @@ public class MappingElasticsearchConverter
} }
} }
if (conversions.hasCustomReadTarget(source.getClass(), rawType)) { if (getConversions().hasCustomReadTarget(source.getClass(), rawType)) {
return rawType.cast(conversionService.convert(source, rawType)); return rawType.cast(conversionService.convert(source, rawType));
} else if (source instanceof List) { } else if (source instanceof List) {
return readCollectionValue((List<?>) source, property, targetType); return readCollectionValue((List<?>) source, property, targetType);
@ -356,8 +366,6 @@ public class MappingElasticsearchConverter
} else if (value instanceof Map) { } else if (value instanceof Map) {
target target
.add(readMapValue((Map<String, Object>) value, property, property.getTypeInformation().getActualType())); .add(readMapValue((Map<String, Object>) value, property, property.getTypeInformation().getActualType()));
} else {
target.add(readEntity(computeGenericValueTypeForRead(property, value), (Map<String, Object>) value));
} }
} }
} }
@ -423,7 +431,7 @@ public class MappingElasticsearchConverter
return value; return value;
} }
if (conversions.hasCustomReadTarget(value.getClass(), target)) { if (getConversions().hasCustomReadTarget(value.getClass(), target)) {
return conversionService.convert(value, target); return conversionService.convert(value, target);
} }
@ -477,7 +485,7 @@ public class MappingElasticsearchConverter
typeMapper.writeType(source.getClass(), sink); typeMapper.writeType(source.getClass(), sink);
} }
Optional<Class<?>> customTarget = conversions.getCustomWriteTarget(entityType, Map.class); Optional<Class<?>> customTarget = getConversions().getCustomWriteTarget(entityType, Map.class);
if (customTarget.isPresent()) { if (customTarget.isPresent()) {
sink.putAll(conversionService.convert(source, Map.class)); sink.putAll(conversionService.convert(source, Map.class));
@ -526,7 +534,7 @@ public class MappingElasticsearchConverter
if (property.hasPropertyConverter()) { if (property.hasPropertyConverter()) {
value = propertyConverterWrite(property, value); value = propertyConverterWrite(property, value);
} else if (TemporalAccessor.class.isAssignableFrom(property.getActualType()) } else if (TemporalAccessor.class.isAssignableFrom(property.getActualType())
&& !conversions.hasCustomWriteTarget(value.getClass())) { && !getConversions().hasCustomWriteTarget(value.getClass())) {
// log at most 5 times // log at most 5 times
String propertyName = entity.getType().getSimpleName() + '.' + property.getName(); String propertyName = entity.getType().getSimpleName() + '.' + property.getName();
@ -568,7 +576,7 @@ public class MappingElasticsearchConverter
protected void writeProperty(ElasticsearchPersistentProperty property, Object value, MapValueAccessor sink) { protected void writeProperty(ElasticsearchPersistentProperty property, Object value, MapValueAccessor sink) {
Optional<Class<?>> customWriteTarget = conversions.getCustomWriteTarget(value.getClass()); Optional<Class<?>> customWriteTarget = getConversions().getCustomWriteTarget(value.getClass());
if (customWriteTarget.isPresent()) { if (customWriteTarget.isPresent()) {
Class<?> writeTarget = customWriteTarget.get(); Class<?> writeTarget = customWriteTarget.get();
@ -595,7 +603,7 @@ public class MappingElasticsearchConverter
@Nullable @Nullable
protected Object getWriteSimpleValue(Object value) { protected Object getWriteSimpleValue(Object value) {
Optional<Class<?>> customTarget = conversions.getCustomWriteTarget(value.getClass()); Optional<Class<?>> customTarget = getConversions().getCustomWriteTarget(value.getClass());
if (customTarget.isPresent()) { if (customTarget.isPresent()) {
return conversionService.convert(value, customTarget.get()); return conversionService.convert(value, customTarget.get());
@ -759,8 +767,8 @@ public class MappingElasticsearchConverter
} }
} }
return !conversions.isSimpleType(type.getType()) && !type.isCollectionLike() return !getConversions().isSimpleType(type.getType()) && !type.isCollectionLike()
&& !conversions.hasCustomWriteTarget(type.getType()); && !getConversions().hasCustomWriteTarget(type.getType());
} }
/** /**
@ -789,7 +797,7 @@ public class MappingElasticsearchConverter
} }
private boolean isSimpleType(Class<?> type) { private boolean isSimpleType(Class<?> type) {
return conversions.isSimpleType(type); return getConversions().isSimpleType(type);
} }
// endregion // endregion
@ -819,7 +827,7 @@ public class MappingElasticsearchConverter
field.setName(property.getFieldName()); field.setName(property.getFieldName());
if (property.hasPropertyConverter()) { if (property.hasPropertyConverter()) {
ElasticsearchPersistentPropertyConverter propertyConverter = property.getPropertyConverter(); ElasticsearchPersistentPropertyConverter propertyConverter = Objects.requireNonNull(property.getPropertyConverter());
criteria.getQueryCriteriaEntries().forEach(criteriaEntry -> { criteria.getQueryCriteriaEntries().forEach(criteriaEntry -> {
Object value = criteriaEntry.getValue(); Object value = criteriaEntry.getValue();
if (value.getClass().isArray()) { if (value.getClass().isArray()) {