From abbdbb07f63a24860b961cb9ca4dce5a90bf31c3 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 21 Dec 2020 10:45:18 +0100 Subject: [PATCH] Polish "Upgrade to Embedded Mongo 3.0.0" See gh-24254 --- .../embedded/DownloadConfigBuilderCustomizer.java | 2 +- .../embedded/EmbeddedMongoAutoConfiguration.java | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/DownloadConfigBuilderCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/DownloadConfigBuilderCustomizer.java index 37393671bf..0a5c36da4a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/DownloadConfigBuilderCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/DownloadConfigBuilderCustomizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java index 2f166b9bf5..4217375ab7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java @@ -40,6 +40,7 @@ import de.flapdoodle.embed.process.config.RuntimeConfig; import de.flapdoodle.embed.process.config.io.ProcessOutput; import de.flapdoodle.embed.process.config.store.DownloadConfig; import de.flapdoodle.embed.process.config.store.ImmutableDownloadConfig; +import de.flapdoodle.embed.process.distribution.Version.GenericVersion; import de.flapdoodle.embed.process.io.Processors; import de.flapdoodle.embed.process.io.Slf4jLevel; import de.flapdoodle.embed.process.io.progress.Slf4jProgressListener; @@ -148,14 +149,16 @@ public class EmbeddedMongoAutoConfiguration { return version; } } - return Versions - .withFeatures(de.flapdoodle.embed.process.distribution.Version.of(embeddedProperties.getVersion())); + return Versions.withFeatures(createEmbeddedMongoVersion(embeddedProperties)); } - return Versions.withFeatures( - de.flapdoodle.embed.process.distribution.Version.of(embeddedProperties.getVersion()), + return Versions.withFeatures(createEmbeddedMongoVersion(embeddedProperties), embeddedProperties.getFeatures().toArray(new Feature[0])); } + private GenericVersion createEmbeddedMongoVersion(EmbeddedMongoProperties embeddedProperties) { + return de.flapdoodle.embed.process.distribution.Version.of(embeddedProperties.getVersion()); + } + private InetAddress getHost() throws UnknownHostException { if (this.properties.getHost() == null) { return InetAddress.getByAddress(Network.localhostIsIPv6() ? IP6_LOOPBACK_ADDRESS : IP4_LOOPBACK_ADDRESS); @@ -200,7 +203,6 @@ public class EmbeddedMongoAutoConfiguration { ProcessOutput processOutput = new ProcessOutput(Processors.logTo(logger, Slf4jLevel.INFO), Processors.logTo(logger, Slf4jLevel.ERROR), Processors.named("[console>]", Processors.logTo(logger, Slf4jLevel.DEBUG))); - return Defaults.runtimeConfigFor(Command.MongoD, logger).processOutput(processOutput) .artifactStore(getArtifactStore(logger, downloadConfigBuilderCustomizers.orderedStream())) .isDaemonProcess(false).build();