diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/MongoDbEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/MongoDbEnvironmentRepository.java index b3dde1f9..f0afa901 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/MongoDbEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/MongoDbEnvironmentRepository.java @@ -63,8 +63,9 @@ public class MongoDbEnvironmentRepository implements EnvironmentRepository, Orde // Prepend "application," to config if not already present String config = application.startsWith("application") ? application : "application," + application; - List applications = Arrays.stream(StringUtils.commaDelimitedListToStringArray(config)).distinct() - .collect(Collectors.toList()); + List applications = Arrays.stream(StringUtils.commaDelimitedListToStringArray(config)) + .distinct() + .collect(Collectors.toList()); List profiles = Arrays.stream(profilesArray).distinct().collect(Collectors.toList()); // Reverse for the intended processing order diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/MongoDbEnvironmentRepositoryConfigurationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/MongoDbEnvironmentRepositoryConfigurationTests.java index c3a84990..c712c01a 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/MongoDbEnvironmentRepositoryConfigurationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/MongoDbEnvironmentRepositoryConfigurationTests.java @@ -38,11 +38,11 @@ public class MongoDbEnvironmentRepositoryConfigurationTests { @Test public void mongoDbEnvironmentRepositoryBeansConfiguredWhenDefault() { new WebApplicationContextRunner().withUserConfiguration(TestConfigServerApplication.class) - .withPropertyValues("spring.profiles.active=test,mongodb", "spring.main.web-application-type=none") - .run(context -> { - assertThat(context).hasSingleBean(MongoDbEnvironmentRepositoryFactory.class); - assertThat(context).hasSingleBean(MongoDbEnvironmentRepository.class); - }); + .withPropertyValues("spring.profiles.active=test,mongodb", "spring.main.web-application-type=none") + .run(context -> { + assertThat(context).hasSingleBean(MongoDbEnvironmentRepositoryFactory.class); + assertThat(context).hasSingleBean(MongoDbEnvironmentRepository.class); + }); } @Test @@ -69,10 +69,10 @@ public class MongoDbEnvironmentRepositoryConfigurationTests { ContextConsumer consumer) throws IOException { String uri = ConfigServerTestUtils.prepareLocalRepo(); new WebApplicationContextRunner().withUserConfiguration(TestConfigServerApplication.class) - .withPropertyValues("spring.profiles.active=test,mongodb", "spring.main.web-application-type=none", - "spring.cloud.config.server.git.uri:" + uri, - "spring.cloud.config.server.mongodb.enabled:" + mongoDbEnabled) - .run(consumer); + .withPropertyValues("spring.profiles.active=test,mongodb", "spring.main.web-application-type=none", + "spring.cloud.config.server.git.uri:" + uri, + "spring.cloud.config.server.mongodb.enabled:" + mongoDbEnabled) + .run(consumer); } } diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/MongoDbEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/MongoDbEnvironmentRepositoryTests.java index 7abb39cf..aa0a1bf2 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/MongoDbEnvironmentRepositoryTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/MongoDbEnvironmentRepositoryTests.java @@ -172,11 +172,12 @@ public class MongoDbEnvironmentRepositoryTests { public void testFailOnError() { MongoTemplate failingMongoTemplate = Mockito.spy(mongoTemplate); Mockito.doThrow(new MongoTimeoutException("Timed out after 30000 ms while waiting for a server.")) - .when(failingMongoTemplate).find(any(Query.class), any(), anyString()); + .when(failingMongoTemplate) + .find(any(Query.class), any(), anyString()); MongoDbEnvironmentRepository repository = new MongoDbEnvironmentRepository(failingMongoTemplate, new MongoDbEnvironmentProperties()); assertThatThrownBy(() -> repository.findOne("foo", "bar", "")).isInstanceOf(MongoException.class) - .hasMessageContaining("Timed out after 30000 ms while waiting for a server."); + .hasMessageContaining("Timed out after 30000 ms while waiting for a server."); } }