From 123f64501fd3260ea517a233acc6e63fdff38288 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 28 Sep 2020 11:14:27 -0400 Subject: [PATCH] formatting --- .../server/config/CompositeConfiguration.java | 6 ++- .../EnvironmentRepositoryConfiguration.java | 9 +++-- .../CompositeEnvironmentRepository.java | 7 +++- .../JdbcEnvironmentRepository.java | 4 +- ...rchPathCompositeEnvironmentRepository.java | 5 ++- .../CompositeEnvironmentRepositoryTests.java | 38 +++++++++++-------- 6 files changed, 43 insertions(+), 26 deletions(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/CompositeConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/CompositeConfiguration.java index 2e8f362a..d34968b2 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/CompositeConfiguration.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/CompositeConfiguration.java @@ -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 diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java index 96b02c1c..e6ff68a5 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java @@ -453,7 +453,8 @@ class CompositeRepositoryConfiguration { @Bean @ConditionalOnSearchPathLocator public SearchPathCompositeEnvironmentRepository searchPathCompositeEnvironmentRepository( - List environmentRepositories, ConfigServerProperties properties) { + List environmentRepositories, + ConfigServerProperties properties) { return new SearchPathCompositeEnvironmentRepository(environmentRepositories, properties.isFailOnCompositeError()); } @@ -462,8 +463,10 @@ class CompositeRepositoryConfiguration { @Bean @ConditionalOnMissingSearchPathLocator public CompositeEnvironmentRepository compositeEnvironmentRepository( - List environmentRepositories, ConfigServerProperties properties) { - return new CompositeEnvironmentRepository(environmentRepositories, properties.isFailOnCompositeError()); + List environmentRepositories, + ConfigServerProperties properties) { + return new CompositeEnvironmentRepository(environmentRepositories, + properties.isFailOnCompositeError()); } } diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/CompositeEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/CompositeEnvironmentRepository.java index 49dad95e..9dba01a0 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/CompositeEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/CompositeEnvironmentRepository.java @@ -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 environmentRepositories, boolean failOnError) { + public CompositeEnvironmentRepository( + List 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) { diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepository.java index 10fd7a98..741465c6 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepository.java @@ -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 { diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/SearchPathCompositeEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/SearchPathCompositeEnvironmentRepository.java index 9bb5b845..d51968fe 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/SearchPathCompositeEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/SearchPathCompositeEnvironmentRepository.java @@ -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 environmentRepositories, - boolean failOnError) { + public SearchPathCompositeEnvironmentRepository( + List environmentRepositories, boolean failOnError) { super(environmentRepositories, failOnError); } diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/CompositeEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/CompositeEnvironmentRepositoryTests.java index 5d0b92a0..e61f3861 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/CompositeEnvironmentRepositoryTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/CompositeEnvironmentRepositoryTests.java @@ -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 propertySources = compositeEnv.getPropertySources(); assertThat(propertySources.size()).isEqualTo(5); @@ -123,8 +123,8 @@ public class CompositeEnvironmentRepositoryTests { List repos2 = new ArrayList(); 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 repos = new ArrayList(); 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 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.asList( - new TestOrderedEnvironmentRepository(1, new Environment("app", "dev"), null)), true); + return new CompositeEnvironmentRepository(Arrays + .asList(new TestOrderedEnvironmentRepository(1, + new Environment("app", "dev"), null)), + true); } }