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

formatting

Browse Source
This commit is contained in:
spencergibb
2020-09-28 11:14:27 -04:00
parent 52e2d9bf64
commit 123f64501f
6 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,14 +45,16 @@ public class CompositeConfiguration {
@Primary
@ConditionalOnBean(SearchPathLocator.class)
public SearchPathCompositeEnvironmentRepository searchPathCompositeEnvironmentRepository() {
return new SearchPathCompositeEnvironmentRepository(this.environmentRepos, properties.isFailOnCompositeError());
return new SearchPathCompositeEnvironmentRepository(this.environmentRepos,
properties.isFailOnCompositeError());
}
@Bean
@Primary
@ConditionalOnMissingBean(SearchPathLocator.class)
public CompositeEnvironmentRepository compositeEnvironmentRepository() {
return new CompositeEnvironmentRepository(this.environmentRepos, properties.isFailOnCompositeError());
return new CompositeEnvironmentRepository(this.environmentRepos,
properties.isFailOnCompositeError());
}
@Autowired

9
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java
View File

@@ -453,7 +453,8 @@ class CompositeRepositoryConfiguration {
@Bean
@ConditionalOnSearchPathLocator
public SearchPathCompositeEnvironmentRepository searchPathCompositeEnvironmentRepository(
List<EnvironmentRepository> environmentRepositories, ConfigServerProperties properties) {
List<EnvironmentRepository> environmentRepositories,
ConfigServerProperties properties) {
return new SearchPathCompositeEnvironmentRepository(environmentRepositories,
properties.isFailOnCompositeError());
}
@@ -462,8 +463,10 @@ class CompositeRepositoryConfiguration {
@Bean
@ConditionalOnMissingSearchPathLocator
public CompositeEnvironmentRepository compositeEnvironmentRepository(
List<EnvironmentRepository> environmentRepositories, ConfigServerProperties properties) {
return new CompositeEnvironmentRepository(environmentRepositories, properties.isFailOnCompositeError());
List<EnvironmentRepository> environmentRepositories,
ConfigServerProperties properties) {
return new CompositeEnvironmentRepository(environmentRepositories,
properties.isFailOnCompositeError());
}
}

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

@@ -43,8 +43,10 @@ public class CompositeEnvironmentRepository implements EnvironmentRepository {
* Creates a new {@link CompositeEnvironmentRepository}.
* @param environmentRepositories The list of {@link EnvironmentRepository}s to create
* the composite from.
* @param failOnError whether to throw an exception if there is an error.
*/
public CompositeEnvironmentRepository(List<EnvironmentRepository> environmentRepositories, boolean failOnError) {
public CompositeEnvironmentRepository(
List<EnvironmentRepository> environmentRepositories, boolean failOnError) {
// Sort the environment repositories by the priority
Collections.sort(environmentRepositories, OrderComparator.INSTANCE);
this.environmentRepositories = environmentRepositories;
@@ -71,7 +73,8 @@ public class CompositeEnvironmentRepository implements EnvironmentRepository {
else {
for (EnvironmentRepository repo : environmentRepositories) {
try {
env.addAll(repo.findOne(application, profile, label, includeOrigin).getPropertySources());
env.addAll(repo.findOne(application, profile, label, includeOrigin)
.getPropertySources());
}
catch (Exception e) {
if (failOnError) {

4
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepository.java
View File

@@ -117,7 +117,9 @@ public class JdbcEnvironmentRepository implements EnvironmentRepository, Ordered
catch (DataAccessException e) {
if (!failOnError) {
if (logger.isDebugEnabled()) {
logger.debug("Failed to retrieve configuration from JDBC Repository", e);
logger.debug(
"Failed to retrieve configuration from JDBC Repository",
e);
}
}
else {

5
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/SearchPathCompositeEnvironmentRepository.java
View File

@@ -32,9 +32,10 @@ public class SearchPathCompositeEnvironmentRepository
* Creates a new {@link SearchPathCompositeEnvironmentRepository}.
* @param environmentRepositories The {@link EnvironmentRepository}s to create this
* composite from.
* @param failOnError whether to throw an exception if there is an error.
*/
public SearchPathCompositeEnvironmentRepository(List<EnvironmentRepository> environmentRepositories,
boolean failOnError) {
public SearchPathCompositeEnvironmentRepository(
List<EnvironmentRepository> environmentRepositories, boolean failOnError) {
super(environmentRepositories, failOnError);
}

38
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/CompositeEnvironmentRepositoryTests.java
View File

@@ -76,8 +76,8 @@ public class CompositeEnvironmentRepositoryTests {
repos.add(new TestOrderedEnvironmentRepository(3, e1, loc1));
repos.add(new TestOrderedEnvironmentRepository(2, e3, loc2));
repos.add(new TestOrderedEnvironmentRepository(1, e2, loc3));
SearchPathCompositeEnvironmentRepository compositeRepo = new SearchPathCompositeEnvironmentRepository(repos,
true);
SearchPathCompositeEnvironmentRepository compositeRepo = new SearchPathCompositeEnvironmentRepository(
repos, true);
Environment compositeEnv = compositeRepo.findOne("foo", "bar", "world", false);
List<PropertySource> propertySources = compositeEnv.getPropertySources();
assertThat(propertySources.size()).isEqualTo(5);
@@ -123,8 +123,8 @@ public class CompositeEnvironmentRepositoryTests {
List<EnvironmentRepository> repos2 = new ArrayList<EnvironmentRepository>();
repos2.add(new TestOrderedEnvironmentRepository(3, e1, loc1));
repos2.add(new TestOrderedEnvironmentRepository(3, e2, loc2));
SearchPathCompositeEnvironmentRepository compositeRepo = new SearchPathCompositeEnvironmentRepository(repos,
true);
SearchPathCompositeEnvironmentRepository compositeRepo = new SearchPathCompositeEnvironmentRepository(
repos, true);
SearchPathCompositeEnvironmentRepository multiCompositeRepo = new SearchPathCompositeEnvironmentRepository(
repos2, true);
Environment env = compositeRepo.findOne("app", "dev", "label", false);
@@ -160,23 +160,24 @@ public class CompositeEnvironmentRepositoryTests {
e2.add(p2);
e2.setVersion("2");
e2.setState("state2");
SearchPathLocator.Locations loc1 = new SearchPathLocator.Locations("app", "dev", "label", "version",
new String[] { sLoc1 });
SearchPathLocator.Locations loc2 = new SearchPathLocator.Locations("app", "dev", "label", "version",
new String[] { sLoc1, sLoc2 });
SearchPathLocator.Locations loc1 = new SearchPathLocator.Locations("app", "dev",
"label", "version", new String[] { sLoc1 });
SearchPathLocator.Locations loc2 = new SearchPathLocator.Locations("app", "dev",
"label", "version", new String[] { sLoc1, sLoc2 });
List<EnvironmentRepository> repos = new ArrayList<EnvironmentRepository>();
repos.add(new TestOrderedEnvironmentRepository(2, e1, loc1));
repos.add(new TestFailingEnvironmentRepository(1, e2, loc2));
SearchPathCompositeEnvironmentRepository compositeRepo = new SearchPathCompositeEnvironmentRepository(repos,
false);
SearchPathCompositeEnvironmentRepository compositeRepo = new SearchPathCompositeEnvironmentRepository(
repos, false);
Environment env = compositeRepo.findOne("app", "dev", "label", false);
List<PropertySource> propertySources = env.getPropertySources();
assertThat(propertySources.size()).isEqualTo(1);
assertThat(propertySources.get(0).getName()).isEqualTo("p1");
}
private static class TestOrderedEnvironmentRepository implements EnvironmentRepository, SearchPathLocator, Ordered {
private static class TestOrderedEnvironmentRepository
implements EnvironmentRepository, SearchPathLocator, Ordered {
private Environment env;
@@ -214,14 +215,17 @@ public class CompositeEnvironmentRepositoryTests {
}
private static class TestFailingEnvironmentRepository extends TestOrderedEnvironmentRepository {
private static class TestFailingEnvironmentRepository
extends TestOrderedEnvironmentRepository {
TestFailingEnvironmentRepository(int order, Environment env, Locations locations) {
TestFailingEnvironmentRepository(int order, Environment env,
Locations locations) {
super(order, env, locations);
}
@Override
public Environment findOne(String application, String profile, String label, boolean includeOrigin) {
public Environment findOne(String application, String profile, String label,
boolean includeOrigin) {
throw new IllegalArgumentException("Failing for some reason");
}
@@ -238,8 +242,10 @@ public class CompositeEnvironmentRepositoryTests {
@Bean
@Primary
CompositeEnvironmentRepository customCompositeEnvironmentRepository() {
return new CompositeEnvironmentRepository(Arrays.<EnvironmentRepository>asList(
new TestOrderedEnvironmentRepository(1, new Environment("app", "dev"), null)), true);
return new CompositeEnvironmentRepository(Arrays
.<EnvironmentRepository>asList(new TestOrderedEnvironmentRepository(1,
new Environment("app", "dev"), null)),
true);
}
}