Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Embedded Mongo 3.2.5

Browse Source 
See gh-28543
This commit is contained in:
Julien Herr
2021-11-05 19:03:05 +01:00
committed by Stephane Nicoll
parent c5817f21eb
commit 679231c120
3 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java
View File

@@ -204,9 +204,11 @@ public class EmbeddedMongoAutoConfiguration {
RuntimeConfig embeddedMongoRuntimeConfig(
ObjectProvider<DownloadConfigBuilderCustomizer> downloadConfigBuilderCustomizers) {
Logger logger = LoggerFactory.getLogger(getClass().getPackage().getName() + ".EmbeddedMongo");
ProcessOutput processOutput = new ProcessOutput(Processors.logTo(logger, Slf4jLevel.INFO),
Processors.logTo(logger, Slf4jLevel.ERROR),
Processors.named("[console>]", Processors.logTo(logger, Slf4jLevel.DEBUG)));
ProcessOutput processOutput = ProcessOutput.builder()
.output(Processors.logTo(logger, Slf4jLevel.INFO))
.error(Processors.logTo(logger, Slf4jLevel.ERROR))
.commands(Processors.named("[console>]", Processors.logTo(logger, Slf4jLevel.DEBUG)))
.build();
return Defaults.runtimeConfigFor(Command.MongoD, logger).processOutput(processOutput)
.artifactStore(getArtifactStore(logger, downloadConfigBuilderCustomizers.orderedStream()))
.isDaemonProcess(false).build();

10
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java
View File

@@ -98,11 +98,7 @@ class EmbeddedMongoAutoConfigurationTests {
@Test
void customFeatures() {
EnumSet<Feature> features = EnumSet.of(Feature.TEXT_SEARCH, Feature.SYNC_DELAY, Feature.ONLY_WITH_SSL,
Feature.NO_HTTP_INTERFACE_ARG);
if (isWindows()) {
features.add(Feature.ONLY_WINDOWS_2008_SERVER);
}
EnumSet<Feature> features = EnumSet.of(Feature.TEXT_SEARCH, Feature.SYNC_DELAY, Feature.NO_HTTP_INTERFACE_ARG);
loadWithValidVersion("spring.mongodb.embedded.features="
+ features.stream().map(Feature::name).collect(Collectors.joining(", ")));
assertThat(this.context.getBean(EmbeddedMongoProperties.class).getFeatures())
@@ -242,10 +238,6 @@ class EmbeddedMongoAutoConfigurationTests {
this.context = ctx;
}
private boolean isWindows() {
return File.separatorChar == '\\';
}
private int getPort(MongoClient client) {
return client.getClusterDescription().getClusterSettings().getHosts().get(0).getPort();
}

2
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@@ -307,7 +307,7 @@ bom {
]
}
}
library("Embedded Mongo", "3.0.0") {
library("Embedded Mongo", "3.2.0") {
group("de.flapdoodle.embed") {
modules = [
"de.flapdoodle.embed.mongo"