DATAES-743 - Revert geo converters to back to store converters.

Original PR: spring-projects#390

Author: sothawo

src/main/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationSupport.java

@@ -76,7 +76,7 @@ public SimpleElasticsearchMappingContext elasticsearchMappingContext() {
 	 */
 	@Bean
 	public ElasticsearchCustomConversions elasticsearchCustomConversions() {
-		return ElasticsearchCustomConversions.of(Collections.emptyList());
+		return new ElasticsearchCustomConversions(Collections.emptyList());
 	}
 
 	/**

src/main/java/org/springframework/data/elasticsearch/core/convert/ElasticsearchCustomConversions.java

@@ -43,7 +43,7 @@ public class ElasticsearchCustomConversions extends CustomConversions {
 
 	static {
 
-		List<Converter<?, ?>> converters = new ArrayList<>();
+		List<Converter<?, ?>> 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<Converter<?, ?>> converters) {
-		List<Converter<?, ?>> 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);
 	}
 
 	/**

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

@@ -85,7 +85,7 @@ public class MappingElasticsearchConverter
 	private final MappingContext<? extends ElasticsearchPersistentEntity<?>, 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;

src/test/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverterUnitTests.java

@@ -108,7 +108,7 @@ public void init() {
 
 		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();