Adds "Qualifier" to avoid duplicate bean definitions issue (#413)

Signed-off-by: kvmw <mshamsi@vmware.com>
pivotal-cf · Apr 19, 2024 · ac8f56f · ac8f56f
1 parent 6950e31
commit ac8f56f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.../java/io/pivotal/spring/cloud/config/client/ConfigClientOAuth2BootstrapConfiguration.java b/.../java/io/pivotal/spring/cloud/config/client/ConfigClientOAuth2BootstrapConfiguration.java
@@ -16,6 +16,7 @@
 
 package io.pivotal.spring.cloud.config.client;
 
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -32,7 +33,8 @@ public class ConfigClientOAuth2BootstrapConfiguration {
 	@Bean
 	@ConditionalOnMissingBean(ConfigServicePropertySourceLocator.class)
 	@ConditionalOnBean(value = RestTemplate.class, name = "configClientRestTemplate")
-	public ConfigServicePropertySourceLocator configServicePropertySourceLocator(RestTemplate configClientRestTemplate,
+	public ConfigServicePropertySourceLocator configServicePropertySourceLocator(
+			@Qualifier("configClientRestTemplate") RestTemplate configClientRestTemplate,
 			ConfigClientProperties configClientProperties) {
 
 		var configServicePropertySourceLocator = new ConfigServicePropertySourceLocator(configClientProperties);

diff --git a/...ain/java/io/pivotal/spring/cloud/config/client/ConfigResourceClientAutoConfiguration.java b/...ain/java/io/pivotal/spring/cloud/config/client/ConfigResourceClientAutoConfiguration.java
@@ -16,6 +16,7 @@
 
 package io.pivotal.spring.cloud.config.client;
 
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -37,7 +38,8 @@ public class ConfigResourceClientAutoConfiguration {
 	@Bean
 	@ConditionalOnMissingBean(ConfigResourceClient.class)
 	@ConditionalOnBean(value = RestTemplate.class, name = "configClientRestTemplate")
-	public ConfigResourceClient configResourceClient(RestTemplate configClientRestTemplate,
+	public ConfigResourceClient configResourceClient(
+			@Qualifier("configClientRestTemplate") RestTemplate configClientRestTemplate,
 			ConfigClientProperties configClientProperties) {
 		return new DefaultConfigResourceClient(configClientRestTemplate, configClientProperties);
 	}

diff --git a/...c/main/java/io/pivotal/spring/cloud/config/client/VaultTokenRenewalAutoConfiguration.java b/...c/main/java/io/pivotal/spring/cloud/config/client/VaultTokenRenewalAutoConfiguration.java
@@ -20,6 +20,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -69,7 +70,8 @@ public class VaultTokenRenewalAutoConfiguration {
 
 	@Bean
 	@ConditionalOnBean(value = RestTemplate.class, name = "configClientRestTemplate")
-	public VaultTokenRefresher vaultTokenRefresher(RestTemplate configClientRestTemplate,
+	public VaultTokenRefresher vaultTokenRefresher(
+			@Qualifier("configClientRestTemplate") RestTemplate configClientRestTemplate,
 			ConfigClientProperties configClientProperties) {
 
 		var refreshUri = configClientProperties.getUri()[0] + REFRESH_PATH;