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

Merge branch '2.1.x'

Browse Source 
Closes gh-17754
This commit is contained in:
Stephane Nicoll
2019-08-01 14:49:22 +02:00
parent 48e07c8fda f2fd169c3a
commit da0ab06d1a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientConfigurations.java
View File

@@ -48,7 +48,7 @@ class RestClientConfigurations {
@Bean
@ConditionalOnMissingBean
RestClientBuilder restClientBuilder(RestClientProperties properties,
RestClientBuilder elasticsearchRestClientBuilder(RestClientProperties properties,
ObjectProvider<RestClientBuilderCustomizer> builderCustomizers) {
HttpHost[] hosts = properties.getUris().stream().map(HttpHost::create).toArray(HttpHost[]::new);
RestClientBuilder builder = RestClient.builder(hosts);
@@ -80,13 +80,14 @@ class RestClientConfigurations {
@Bean
@ConditionalOnMissingBean
RestHighLevelClient restHighLevelClient(RestClientBuilder restClientBuilder) {
RestHighLevelClient elasticsearchRestHighLevelClient(RestClientBuilder restClientBuilder) {
return new RestHighLevelClient(restClientBuilder);
}
@Bean
@ConditionalOnMissingBean
RestClient restClient(RestClientBuilder builder, ObjectProvider<RestHighLevelClient> restHighLevelClient) {
RestClient elasticsearchRestClient(RestClientBuilder builder,
ObjectProvider<RestHighLevelClient> restHighLevelClient) {
RestHighLevelClient client = restHighLevelClient.getIfUnique();
if (client != null) {
return client.getLowLevelClient();
@@ -101,7 +102,7 @@ class RestClientConfigurations {
@Bean
@ConditionalOnMissingBean
RestClient restClient(RestClientBuilder builder) {
RestClient elasticsearchRestClient(RestClientBuilder builder) {
return builder.build();
}