Skip to content

S
spring-boot
Commit 1ec8e822 authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Fix broken build

parent a76aaabc
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientConfigurations.java
View file @ 1ec8e822
...@@ -46,7 +46,7 @@ class RestClientConfigurations { ...@@ -46,7 +46,7 @@ class RestClientConfigurations {
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
RestClientBuilder restClientBuilder(RestClientProperties properties, public RestClientBuilder restClientBuilder(RestClientProperties properties,
ObjectProvider<RestClientBuilderCustomizer> builderCustomizers) { ObjectProvider<RestClientBuilderCustomizer> builderCustomizers) {
HttpHost[] hosts = properties.getUris().stream().map(HttpHost::create).toArray(HttpHost[]::new); HttpHost[] hosts = properties.getUris().stream().map(HttpHost::create).toArray(HttpHost[]::new);
RestClientBuilder builder = RestClient.builder(hosts); RestClientBuilder builder = RestClient.builder(hosts);
...@@ -71,13 +71,13 @@ class RestClientConfigurations { ...@@ -71,13 +71,13 @@ class RestClientConfigurations {
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
RestHighLevelClient restHighLevelClient(RestClientBuilder restClientBuilder) { public RestHighLevelClient restHighLevelClient(RestClientBuilder restClientBuilder) {
return new RestHighLevelClient(restClientBuilder); return new RestHighLevelClient(restClientBuilder);
} }
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
RestClient restClient(RestClientBuilder builder, ObjectProvider<RestHighLevelClient> restHighLevelClient) { public RestClient restClient(RestClientBuilder builder, ObjectProvider<RestHighLevelClient> restHighLevelClient) {
RestHighLevelClient client = restHighLevelClient.getIfUnique(); RestHighLevelClient client = restHighLevelClient.getIfUnique();
if (client != null) { if (client != null) {
return client.getLowLevelClient(); return client.getLowLevelClient();
...@@ -92,7 +92,7 @@ class RestClientConfigurations { ...@@ -92,7 +92,7 @@ class RestClientConfigurations {
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
RestClient restClient(RestClientBuilder builder) { public RestClient restClient(RestClientBuilder builder) {
return builder.build(); return builder.build();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment