diff --git a/spring-cloud-services-config-client-autoconfigure/src/main/java/io/pivotal/spring/cloud/config/client/ConfigClientOAuth2BootstrapConfiguration.java b/spring-cloud-services-config-client-autoconfigure/src/main/java/io/pivotal/spring/cloud/config/client/ConfigClientOAuth2BootstrapConfiguration.java index bb46974..c546970 100644 --- a/spring-cloud-services-config-client-autoconfigure/src/main/java/io/pivotal/spring/cloud/config/client/ConfigClientOAuth2BootstrapConfiguration.java +++ b/spring-cloud-services-config-client-autoconfigure/src/main/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/spring-cloud-services-config-client-autoconfigure/src/main/java/io/pivotal/spring/cloud/config/client/ConfigResourceClientAutoConfiguration.java b/spring-cloud-services-config-client-autoconfigure/src/main/java/io/pivotal/spring/cloud/config/client/ConfigResourceClientAutoConfiguration.java index 32cc5b9..81d29b5 100644 --- a/spring-cloud-services-config-client-autoconfigure/src/main/java/io/pivotal/spring/cloud/config/client/ConfigResourceClientAutoConfiguration.java +++ b/spring-cloud-services-config-client-autoconfigure/src/main/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/spring-cloud-services-config-client-autoconfigure/src/main/java/io/pivotal/spring/cloud/config/client/VaultTokenRenewalAutoConfiguration.java b/spring-cloud-services-config-client-autoconfigure/src/main/java/io/pivotal/spring/cloud/config/client/VaultTokenRenewalAutoConfiguration.java index ae6c174..e48da77 100644 --- a/spring-cloud-services-config-client-autoconfigure/src/main/java/io/pivotal/spring/cloud/config/client/VaultTokenRenewalAutoConfiguration.java +++ b/spring-cloud-services-config-client-autoconfigure/src/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;