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

Rename restClient to elasticsearchRestClient

Browse Source 
For consistency, similar beans have been renamed as well.

Closes gh-17751
This commit is contained in:
Stephane Nicoll
2019-08-01 14:45:33 +02:00
parent 1ec8e822a1
commit f2fd169c3a
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

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