Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-07-05 18:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prefix bean names created by the configuration with "elasticsearch".

Browse Source 
Original Pull Request #2253
Closes #2252
This commit is contained in:
Peter-Josef Meisch 2022-08-05 21:14:06 +02:00 committed by GitHub
parent e71c66949a
commit 954d8b0f97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchConfiguration.java
View File

@ -42,7 +42,7 @@ public abstract class ElasticsearchConfiguration extends ElasticsearchConfigurat
* *
* @return configuration, must not be {@literal null} * @return configuration, must not be {@literal null}
*/ */
@Bean @Bean(name="elasticsearchClientConfiguration")
public abstract ClientConfiguration clientConfiguration(); public abstract ClientConfiguration clientConfiguration();
/** /**
@ -52,7 +52,7 @@ public abstract class ElasticsearchConfiguration extends ElasticsearchConfigurat
* @return RestClient * @return RestClient
*/ */
@Bean @Bean
public RestClient restClient(ClientConfiguration clientConfiguration) { public RestClient elasticsearchRestClient(ClientConfiguration clientConfiguration) {
Assert.notNull(clientConfiguration, "clientConfiguration must not be null"); Assert.notNull(clientConfiguration, "clientConfiguration must not be null");

4
src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveElasticsearchConfiguration.java
View File

@ -41,7 +41,7 @@ public abstract class ReactiveElasticsearchConfiguration extends ElasticsearchCo
* *
* @return configuration, must not be {@literal null} * @return configuration, must not be {@literal null}
*/ */
@Bean @Bean(name="elasticsearchClientConfiguration")
public abstract ClientConfiguration clientConfiguration(); public abstract ClientConfiguration clientConfiguration();
/** /**
@ -51,7 +51,7 @@ public abstract class ReactiveElasticsearchConfiguration extends ElasticsearchCo
* @return RestClient * @return RestClient
*/ */
@Bean @Bean
public RestClient restClient(ClientConfiguration clientConfiguration) { public RestClient elasticsearchRestClient(ClientConfiguration clientConfiguration) {
Assert.notNull(clientConfiguration, "clientConfiguration must not be null"); Assert.notNull(clientConfiguration, "clientConfiguration must not be null");