Commit f2fd169c authored by Stephane Nicoll's avatar Stephane Nicoll

Rename restClient to elasticsearchRestClient

For consistency, similar beans have been renamed as well.

Closes gh-17751
parent 1ec8e822
......@@ -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();
}
......
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