From 954d8b0f97b96186d1072a2850eaf63df3b1326d Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Fri, 5 Aug 2022 21:14:06 +0200 Subject: [PATCH] Prefix bean names created by the configuration with "elasticsearch". Original Pull Request #2253 Closes #2252 --- .../elasticsearch/client/elc/ElasticsearchConfiguration.java | 4 ++-- .../client/elc/ReactiveElasticsearchConfiguration.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchConfiguration.java b/src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchConfiguration.java index c868bb3b8..1402fc7b0 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchConfiguration.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchConfiguration.java @@ -42,7 +42,7 @@ public abstract class ElasticsearchConfiguration extends ElasticsearchConfigurat * * @return configuration, must not be {@literal null} */ - @Bean + @Bean(name="elasticsearchClientConfiguration") public abstract ClientConfiguration clientConfiguration(); /** @@ -52,7 +52,7 @@ public abstract class ElasticsearchConfiguration extends ElasticsearchConfigurat * @return RestClient */ @Bean - public RestClient restClient(ClientConfiguration clientConfiguration) { + public RestClient elasticsearchRestClient(ClientConfiguration clientConfiguration) { Assert.notNull(clientConfiguration, "clientConfiguration must not be null"); diff --git a/src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveElasticsearchConfiguration.java b/src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveElasticsearchConfiguration.java index 52427d4f4..b754e60c7 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveElasticsearchConfiguration.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveElasticsearchConfiguration.java @@ -41,7 +41,7 @@ public abstract class ReactiveElasticsearchConfiguration extends ElasticsearchCo * * @return configuration, must not be {@literal null} */ - @Bean + @Bean(name="elasticsearchClientConfiguration") public abstract ClientConfiguration clientConfiguration(); /** @@ -51,7 +51,7 @@ public abstract class ReactiveElasticsearchConfiguration extends ElasticsearchCo * @return RestClient */ @Bean - public RestClient restClient(ClientConfiguration clientConfiguration) { + public RestClient elasticsearchRestClient(ClientConfiguration clientConfiguration) { Assert.notNull(clientConfiguration, "clientConfiguration must not be null");