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

Bumping versions

Browse Source
This commit is contained in:
buildmaster
2024-10-03 21:11:28 +00:00
parent caddff72b6
commit 35a57f1737
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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<String> applications = Arrays.stream(StringUtils.commaDelimitedListToStringArray(config)).distinct()
.collect(Collectors.toList());
List<String> applications = Arrays.stream(StringUtils.commaDelimitedListToStringArray(config))
.distinct()
.collect(Collectors.toList());
List<String> profiles = Arrays.stream(profilesArray).distinct().collect(Collectors.toList());
// Reverse for the intended processing order

18
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/MongoDbEnvironmentRepositoryConfigurationTests.java
View File

@@ -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<? super AssertableWebApplicationContext> 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);
}
}

5
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/MongoDbEnvironmentRepositoryTests.java
View File

@@ -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.");
}
}