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:23:48 -04:00
parent ae58fe6835
commit 9c8e92febc
5 changed files with 23 additions and 30 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,16 +45,14 @@ 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

@@ -429,8 +429,7 @@ class CompositeRepositoryConfiguration {
@Bean
@ConditionalOnSearchPathLocator
public SearchPathCompositeEnvironmentRepository searchPathCompositeEnvironmentRepository(
List<EnvironmentRepository> environmentRepositories,
ConfigServerProperties properties) {
List<EnvironmentRepository> environmentRepositories, ConfigServerProperties properties) {
return new SearchPathCompositeEnvironmentRepository(environmentRepositories,
properties.isFailOnCompositeError());
}
@@ -439,10 +438,8 @@ 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());
}
}

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

@@ -105,8 +105,8 @@ public class JdbcEnvironmentRepository implements EnvironmentRepository, Ordered
for (String app : applications) {
for (String env : envs) {
try {
Map<String, String> next = (Map<String, String>) this.jdbc.query(
this.sql, new Object[] { app, env, label }, this.extractor);
Map<String, String> next = (Map<String, String>) this.jdbc.query(this.sql,
new Object[] { app, env, label }, this.extractor);
if (!next.isEmpty()) {
environment.add(new PropertySource(app + "-" + env, next));
}
@@ -114,9 +114,7 @@ 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 {

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

@@ -34,7 +34,8 @@ public class SearchPathCompositeEnvironmentRepository extends CompositeEnvironme
* 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);
}

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

@@ -76,7 +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);
@@ -121,7 +122,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);
@@ -157,16 +159,16 @@ 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);
@@ -209,17 +211,14 @@ 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");
}