SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update return type of environmentRepository @Bean definitions to EnvironmentRepository so @ConditionalOnMissingBean works.

Browse Source
This commit is contained in:
Spencer Gibb
2015-02-16 11:45:56 -07:00
parent 744d5a44bf
commit 51c53e301e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerConfiguration.java
View File

@@ -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);
}
}