From 9c64dd9c39d1e3ba6c6c892769193c4cc3b1907c Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Tue, 11 Feb 2020 18:33:58 +0100 Subject: [PATCH] DATAES-743 - Revert geo converters to back to store converters. Original PR: #390 --- .../config/ElasticsearchConfigurationSupport.java | 2 +- .../core/convert/ElasticsearchCustomConversions.java | 12 +++--------- .../core/convert/MappingElasticsearchConverter.java | 2 +- .../MappingElasticsearchConverterUnitTests.java | 2 +- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationSupport.java b/src/main/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationSupport.java index b33fcde37..949822ac5 100644 --- a/src/main/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationSupport.java +++ b/src/main/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationSupport.java @@ -76,7 +76,7 @@ public class ElasticsearchConfigurationSupport { */ @Bean public ElasticsearchCustomConversions elasticsearchCustomConversions() { - return ElasticsearchCustomConversions.of(Collections.emptyList()); + return new ElasticsearchCustomConversions(Collections.emptyList()); } /** diff --git a/src/main/java/org/springframework/data/elasticsearch/core/convert/ElasticsearchCustomConversions.java b/src/main/java/org/springframework/data/elasticsearch/core/convert/ElasticsearchCustomConversions.java index d44660255..d223d1a51 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/convert/ElasticsearchCustomConversions.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/convert/ElasticsearchCustomConversions.java @@ -43,7 +43,7 @@ public class ElasticsearchCustomConversions extends CustomConversions { static { - List> converters = new ArrayList<>(); + List> converters = new ArrayList<>(GeoConverters.getConvertersToRegister()); converters.add(StringToUUIDConverter.INSTANCE); converters.add(UUIDToStringConverter.INSTANCE); converters.add(BigDecimalToDoubleConverter.INSTANCE); @@ -58,14 +58,8 @@ public class ElasticsearchCustomConversions extends CustomConversions { * * @param converters must not be {@literal null}. */ - public static ElasticsearchCustomConversions of(Collection> converters) { - List> userConverters = new ArrayList<>(GeoConverters.getConvertersToRegister()); - userConverters.addAll(converters); - return new ElasticsearchCustomConversions(STORE_CONVERSIONS, userConverters); - } - - private ElasticsearchCustomConversions(StoreConversions storeConversions, Collection converters) { - super(storeConversions, converters); + public ElasticsearchCustomConversions(Collection converters) { + super(STORE_CONVERSIONS, converters); } /** diff --git a/src/main/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverter.java b/src/main/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverter.java index b54dc54bd..ab7cb01e6 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverter.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverter.java @@ -85,7 +85,7 @@ public class MappingElasticsearchConverter private final MappingContext, ElasticsearchPersistentProperty> mappingContext; private final GenericConversionService conversionService; - private CustomConversions conversions = ElasticsearchCustomConversions.of(Collections.emptyList()); + private CustomConversions conversions = new ElasticsearchCustomConversions(Collections.emptyList()); private EntityInstantiators instantiators = new EntityInstantiators(); private ElasticsearchTypeMapper typeMapper; diff --git a/src/test/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverterUnitTests.java b/src/test/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverterUnitTests.java index ba631a838..35a27b6a4 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverterUnitTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverterUnitTests.java @@ -108,7 +108,7 @@ public class MappingElasticsearchConverterUnitTests { mappingElasticsearchConverter = new MappingElasticsearchConverter(mappingContext, new GenericConversionService()); mappingElasticsearchConverter.setConversions( - ElasticsearchCustomConversions.of(Arrays.asList(new ShotGunToMapConverter(), new MapToShotGunConverter()))); + new ElasticsearchCustomConversions(Arrays.asList(new ShotGunToMapConverter(), new MapToShotGunConverter()))); mappingElasticsearchConverter.afterPropertiesSet(); sarahConnor = new Person();