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

Fix Spring AOT circular reference. (#1968)

Browse Source
This commit is contained in:
Olga Maciaszek-Sharma
2021-09-28 16:32:02 +02:00
committed by GitHub
parent 8ea0f02c68
commit 50d97b768b
1 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/CompositeConfiguration.java
View File

@@ -37,32 +37,24 @@ import org.springframework.context.annotation.Primary;
@ConditionalOnMissingBean(CompositeEnvironmentRepository.class)
public class CompositeConfiguration {
private List<EnvironmentRepository> environmentRepos = new ArrayList<>();
private ConfigServerProperties properties;
@Bean
@Primary
@ConditionalOnBean(SearchPathLocator.class)
public SearchPathCompositeEnvironmentRepository searchPathCompositeEnvironmentRepository() {
return new SearchPathCompositeEnvironmentRepository(this.environmentRepos, properties.isFailOnCompositeError());
public SearchPathCompositeEnvironmentRepository searchPathCompositeEnvironmentRepository(
@Autowired(required = false) List<EnvironmentRepository> environmentRepos,
ConfigServerProperties properties) {
environmentRepos = environmentRepos != null ? environmentRepos : new ArrayList<>();
return new SearchPathCompositeEnvironmentRepository(environmentRepos, properties.isFailOnCompositeError());
}
@Bean
@Primary
@ConditionalOnMissingBean(SearchPathLocator.class)
public CompositeEnvironmentRepository compositeEnvironmentRepository() {
return new CompositeEnvironmentRepository(this.environmentRepos, properties.isFailOnCompositeError());
}
@Autowired
public void setEnvironmentRepos(List<EnvironmentRepository> repos) {
this.environmentRepos = repos;
}
@Autowired
public void setProperties(ConfigServerProperties properties) {
this.properties = properties;
public CompositeEnvironmentRepository compositeEnvironmentRepository(
@Autowired(required = false) List<EnvironmentRepository> environmentRepos,
ConfigServerProperties properties) {
environmentRepos = environmentRepos != null ? environmentRepos : new ArrayList<>();
return new CompositeEnvironmentRepository(environmentRepos, properties.isFailOnCompositeError());
}
}