From cf7664c01a9a21a696b39d49d31ba1844f014c90 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 27 Nov 2018 16:33:22 +0000 Subject: [PATCH] Cope with version not found in Embedded Mongo's Version enum Closes gh-15311 --- .../mongo/embedded/EmbeddedMongoAutoConfiguration.java | 2 ++ .../embedded/EmbeddedMongoAutoConfigurationTests.java | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) 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 be84094a0ec..afc8d0f4edf 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 @@ -156,6 +156,8 @@ public class EmbeddedMongoAutoConfiguration { return version; } } + return Versions.withFeatures( + new GenericVersion(this.embeddedProperties.getVersion())); } return Versions.withFeatures( new GenericVersion(this.embeddedProperties.getVersion()), diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java index 5095823acf4..bfe0e8855bf 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java @@ -24,6 +24,7 @@ import com.mongodb.MongoClient; import de.flapdoodle.embed.mongo.config.IMongodConfig; import de.flapdoodle.embed.mongo.config.Storage; import de.flapdoodle.embed.mongo.distribution.Feature; +import de.flapdoodle.embed.mongo.distribution.Version; import org.bson.Document; import org.junit.After; import org.junit.Test; @@ -67,7 +68,13 @@ public class EmbeddedMongoAutoConfigurationTests { @Test public void customVersion() { - assertVersionConfiguration("3.4.15", "3.4.15"); + String version = Version.V3_4_15.asInDownloadPath(); + assertVersionConfiguration(version, version); + } + + @Test + public void customUnknownVersion() { + assertVersionConfiguration("3.4.1", "3.4.1"); } @Test