From 51c53e301ed1582168520dd9fe8591f8431ce421 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Mon, 16 Feb 2015 11:45:56 -0700 Subject: [PATCH] Update return type of environmentRepository @Bean definitions to EnvironmentRepository so @ConditionalOnMissingBean works. --- .../cloud/config/server/ConfigServerConfiguration.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerConfiguration.java index 635f1871..a7f14baf 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerConfiguration.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerConfiguration.java @@ -36,19 +36,20 @@ public class ConfigServerConfiguration { @Profile("native") protected static class NativeRepositoryConfiguration { @Bean - public SpringApplicationEnvironmentRepository EnvironmentRepository() { + public EnvironmentRepository environmentRepository() { return new SpringApplicationEnvironmentRepository(); } } @Configuration + @ConditionalOnMissingBean(EnvironmentRepository.class) protected static class GitRepositoryConfiguration { @Autowired private ConfigurableEnvironment environment; @Bean - public MultipleJGitEnvironmentRepository EnvironmentRepository() { + public EnvironmentRepository environmentRepository() { return new MultipleJGitEnvironmentRepository(environment); } } @@ -60,7 +61,7 @@ public class ConfigServerConfiguration { private ConfigurableEnvironment environment; @Bean - public SVNKitEnvironmentRepository EnvironmentRepository() { + public EnvironmentRepository environmentRepository() { return new SVNKitEnvironmentRepository(environment); } }