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

Fix broken build

Browse Source
This commit is contained in:
Stephane Nicoll
2019-08-01 14:42:01 +02:00
parent a76aaabc07
commit 1ec8e822a1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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