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

Merge branch '2.4.x'

Browse Source 
Closes gh-26030
This commit is contained in:
Stephane Nicoll
2021-04-12 16:55:37 +02:00
parent c4750fd0ff 305bcb10ae
commit 1f71c8241c
2 changed files with 69 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataConfiguration.java
View File

@@ -16,6 +16,8 @@
package org.springframework.boot.autoconfigure.data.elasticsearch;
import java.util.Collections;
import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.client.RestHighLevelClient;
@@ -31,6 +33,7 @@ import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperatio
import org.springframework.data.elasticsearch.core.ReactiveElasticsearchTemplate;
import org.springframework.data.elasticsearch.core.RefreshPolicy;
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;
import org.springframework.web.reactive.function.client.WebClient;
@@ -43,6 +46,7 @@ import org.springframework.web.reactive.function.client.WebClient;
*
* @author Brian Clozel
* @author Scott Frederick
* @author Stephane Nicoll
*/
abstract class ElasticsearchDataConfiguration {
@@ -51,14 +55,26 @@ abstract class ElasticsearchDataConfiguration {
@Bean
@ConditionalOnMissingBean
ElasticsearchConverter elasticsearchConverter(SimpleElasticsearchMappingContext mappingContext) {
return new MappingElasticsearchConverter(mappingContext);
ElasticsearchCustomConversions elasticsearchCustomConversions() {
return new ElasticsearchCustomConversions(Collections.emptyList());
}
@Bean
@ConditionalOnMissingBean
SimpleElasticsearchMappingContext mappingContext() {
return new SimpleElasticsearchMappingContext();
SimpleElasticsearchMappingContext mappingContext(
ElasticsearchCustomConversions elasticsearchCustomConversions) {
SimpleElasticsearchMappingContext mappingContext = new SimpleElasticsearchMappingContext();
mappingContext.setSimpleTypeHolder(elasticsearchCustomConversions.getSimpleTypeHolder());
return mappingContext;
}
@Bean
@ConditionalOnMissingBean
ElasticsearchConverter elasticsearchConverter(SimpleElasticsearchMappingContext mappingContext,
ElasticsearchCustomConversions elasticsearchCustomConversions) {
MappingElasticsearchConverter converter = new MappingElasticsearchConverter(mappingContext);
converter.setConversions(elasticsearchCustomConversions);
return converter;
}
}