Skip to content

Commit abbdbb0

Browse files
committed
Polish "Upgrade to Embedded Mongo 3.0.0"
See gh-24254
1 parent 2f6b51b commit abbdbb0

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/DownloadConfigBuilderCustomizer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import de.flapdoodle.embed.process.config.io.ProcessOutput;
4141
import de.flapdoodle.embed.process.config.store.DownloadConfig;
4242
import de.flapdoodle.embed.process.config.store.ImmutableDownloadConfig;
43+
import de.flapdoodle.embed.process.distribution.Version.GenericVersion;
4344
import de.flapdoodle.embed.process.io.Processors;
4445
import de.flapdoodle.embed.process.io.Slf4jLevel;
4546
import de.flapdoodle.embed.process.io.progress.Slf4jProgressListener;
@@ -148,14 +149,16 @@ private IFeatureAwareVersion determineVersion(EmbeddedMongoProperties embeddedPr
148149
return version;
149150
}
150151
}
151-
return Versions
152-
.withFeatures(de.flapdoodle.embed.process.distribution.Version.of(embeddedProperties.getVersion()));
152+
return Versions.withFeatures(createEmbeddedMongoVersion(embeddedProperties));
153153
}
154-
return Versions.withFeatures(
155-
de.flapdoodle.embed.process.distribution.Version.of(embeddedProperties.getVersion()),
154+
return Versions.withFeatures(createEmbeddedMongoVersion(embeddedProperties),
156155
embeddedProperties.getFeatures().toArray(new Feature[0]));
157156
}
158157

158+
private GenericVersion createEmbeddedMongoVersion(EmbeddedMongoProperties embeddedProperties) {
159+
return de.flapdoodle.embed.process.distribution.Version.of(embeddedProperties.getVersion());
160+
}
161+
159162
private InetAddress getHost() throws UnknownHostException {
160163
if (this.properties.getHost() == null) {
161164
return InetAddress.getByAddress(Network.localhostIsIPv6() ? IP6_LOOPBACK_ADDRESS : IP4_LOOPBACK_ADDRESS);
@@ -200,7 +203,6 @@ RuntimeConfig embeddedMongoRuntimeConfig(
200203
ProcessOutput processOutput = new ProcessOutput(Processors.logTo(logger, Slf4jLevel.INFO),
201204
Processors.logTo(logger, Slf4jLevel.ERROR),
202205
Processors.named("[console>]", Processors.logTo(logger, Slf4jLevel.DEBUG)));
203-
204206
return Defaults.runtimeConfigFor(Command.MongoD, logger).processOutput(processOutput)
205207
.artifactStore(getArtifactStore(logger, downloadConfigBuilderCustomizers.orderedStream()))
206208
.isDaemonProcess(false).build();

0 commit comments

Comments
 (0)