DATAES-629 - ElasticsearchEntityMapper refactoring.

Original PR: spring-projects#309

Author: sothawo

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

@@ -19,6 +19,8 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
+import org.springframework.data.elasticsearch.core.ResultsMapper;
+import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
 
 /**
  * @author Christoph Strobl
@@ -42,8 +44,9 @@ public abstract class AbstractElasticsearchConfiguration extends ElasticsearchCo
 	 *
 	 * @return never {@literal null}.
 	 */
-	@Bean(name = {"elasticsearchOperations", "elasticsearchTemplate"})
-	public ElasticsearchOperations elasticsearchOperations() {
-		return new ElasticsearchRestTemplate(elasticsearchClient(), elasticsearchConverter(), resultsMapper());
+	@Bean(name = { "elasticsearchOperations", "elasticsearchTemplate" })
+	public ElasticsearchOperations elasticsearchOperations(MappingElasticsearchConverter mappingElasticsearchConverter,
+                                                           ResultsMapper resultsMapper) {
+		return new ElasticsearchRestTemplate(elasticsearchClient(), mappingElasticsearchConverter, resultsMapper);
 	}
 }

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

@@ -22,6 +22,8 @@
 import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient;
 import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations;
 import org.springframework.data.elasticsearch.core.ReactiveElasticsearchTemplate;
+import org.springframework.data.elasticsearch.core.ResultsMapper;
+import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
 import org.springframework.lang.Nullable;
 
 /**
@@ -47,10 +49,11 @@ public abstract class AbstractReactiveElasticsearchConfiguration extends Elastic
 	 * @return never {@literal null}.
 	 */
 	@Bean
-	public ReactiveElasticsearchOperations reactiveElasticsearchTemplate() {
+	public ReactiveElasticsearchOperations reactiveElasticsearchTemplate(
+        MappingElasticsearchConverter mappingElasticsearchConverter, ResultsMapper resultsMapper) {
 
 		ReactiveElasticsearchTemplate template = new ReactiveElasticsearchTemplate(reactiveElasticsearchClient(),
-				elasticsearchConverter(), resultsMapper());
+            mappingElasticsearchConverter, resultsMapper);
 		template.setIndicesOptions(indicesOptions());
 		template.setRefreshPolicy(refreshPolicy());
 

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

@@ -27,14 +27,13 @@
 import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.convert.converter.Converter;
+import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.data.annotation.Persistent;
 import org.springframework.data.elasticsearch.annotations.Document;
-import org.springframework.data.elasticsearch.core.DefaultEntityMapper;
 import org.springframework.data.elasticsearch.core.DefaultResultMapper;
 import org.springframework.data.elasticsearch.core.EntityMapper;
 import org.springframework.data.elasticsearch.core.ResultsMapper;
-import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchCustomConversions;
 import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
@@ -43,14 +42,16 @@
 
 /**
  * @author Christoph Strobl
+ * @author Peter-Josef Meisch
  * @since 3.2
  */
 @Configuration
 public class ElasticsearchConfigurationSupport {
 
 	@Bean
-	public ElasticsearchConverter elasticsearchConverter() {
-		return new MappingElasticsearchConverter(elasticsearchMappingContext());
+	public MappingElasticsearchConverter elasticsearchEntityMapper(
+			SimpleElasticsearchMappingContext elasticsearchMappingContext) {
+		return new MappingElasticsearchConverter(elasticsearchMappingContext);
 	}
 
 	/**
@@ -71,33 +72,15 @@ public SimpleElasticsearchMappingContext elasticsearchMappingContext() {
 		return mappingContext;
 	}
 
-	/**
-	 * Returns the {@link EntityMapper} used for mapping between the source and domain type. <br />
-	 * <strong>Hint</strong>: you can use {@link org.springframework.data.elasticsearch.core.ElasticsearchEntityMapper} as
-	 * an alternative to the {@link DefaultEntityMapper}.
-	 *
-	 * <pre class="code">
-	 * ElasticsearchEntityMapper entityMapper = new ElasticsearchEntityMapper(elasticsearchMappingContext(),
-	 * 		new DefaultConversionService());
-	 * entityMapper.setConversions(elasticsearchCustomConversions());
-	 * </pre>
-	 *
-	 * @return never {@literal null}.
-	 */
-	@Bean
-	public EntityMapper entityMapper() {
-		return new DefaultEntityMapper(elasticsearchMappingContext());
-	}
-
 	/**
 	 * Returns the {@link ResultsMapper} to be used for search responses.
 	 *
-	 * @see #entityMapper()
+	 * @see MappingElasticsearchConverter
 	 * @return never {@literal null}.
 	 */
 	@Bean
-	public ResultsMapper resultsMapper() {
-		return new DefaultResultMapper(elasticsearchMappingContext(), entityMapper());
+	public ResultsMapper resultsMapper(SimpleElasticsearchMappingContext elasticsearchMappingContext) {
+		return new DefaultResultMapper(elasticsearchMappingContext, elasticsearchEntityMapper(elasticsearchMappingContext));
 	}
 
 	/**

src/main/java/org/springframework/data/elasticsearch/core/DefaultEntityMapper.java

@@ -32,6 +32,7 @@
 import org.springframework.data.elasticsearch.annotations.ScriptedField;
 import org.springframework.data.elasticsearch.core.aggregation.AggregatedPage;
 import org.springframework.data.elasticsearch.core.aggregation.impl.AggregatedPageImpl;
+import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
 import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
@@ -65,7 +66,7 @@ public DefaultResultMapper() {
 
 	public DefaultResultMapper(
 			MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext) {
-		this(mappingContext, initEntityMapper(mappingContext));
+		this(mappingContext, null);
 	}
 
 	public DefaultResultMapper(EntityMapper entityMapper) {
@@ -84,7 +85,9 @@ private static EntityMapper initEntityMapper(
 			MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext) {
 
 		Assert.notNull(mappingContext, "MappingContext must not be null!");
-		return new DefaultEntityMapper(mappingContext);
+		MappingElasticsearchConverter mappingElasticsearchConverter = new MappingElasticsearchConverter(mappingContext, null);
+		mappingElasticsearchConverter.afterPropertiesSet();
+		return mappingElasticsearchConverter;
 	}
 
 	@Override