Skip to content

Commit f2fd169

Browse files
committed
Rename restClient to elasticsearchRestClient
For consistency, similar beans have been renamed as well. Closes gh-17751
1 parent 1ec8e82 commit f2fd169

File tree

1 file changed

+5
-4
lines changed
  • spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/rest

1 file changed

+5
-4
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ static class RestClientBuilderConfiguration {
4646

4747
@Bean
4848
@ConditionalOnMissingBean
49-
public RestClientBuilder restClientBuilder(RestClientProperties properties,
49+
public RestClientBuilder elasticsearchRestClientBuilder(RestClientProperties properties,
5050
ObjectProvider<RestClientBuilderCustomizer> builderCustomizers) {
5151
HttpHost[] hosts = properties.getUris().stream().map(HttpHost::create).toArray(HttpHost[]::new);
5252
RestClientBuilder builder = RestClient.builder(hosts);
@@ -71,13 +71,14 @@ static class RestHighLevelClientConfiguration {
7171

7272
@Bean
7373
@ConditionalOnMissingBean
74-
public RestHighLevelClient restHighLevelClient(RestClientBuilder restClientBuilder) {
74+
public RestHighLevelClient elasticsearchRestHighLevelClient(RestClientBuilder restClientBuilder) {
7575
return new RestHighLevelClient(restClientBuilder);
7676
}
7777

7878
@Bean
7979
@ConditionalOnMissingBean
80-
public RestClient restClient(RestClientBuilder builder, ObjectProvider<RestHighLevelClient> restHighLevelClient) {
80+
public RestClient elasticsearchRestClient(RestClientBuilder builder,
81+
ObjectProvider<RestHighLevelClient> restHighLevelClient) {
8182
RestHighLevelClient client = restHighLevelClient.getIfUnique();
8283
if (client != null) {
8384
return client.getLowLevelClient();
@@ -92,7 +93,7 @@ static class RestClientFallbackConfiguration {
9293

9394
@Bean
9495
@ConditionalOnMissingBean
95-
public RestClient restClient(RestClientBuilder builder) {
96+
public RestClient elasticsearchRestClient(RestClientBuilder builder) {
9697
return builder.build();
9798
}
9899

0 commit comments

Comments
 (0)