root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Cope with version not found in Embedded Mongo's Version enum 

Closes gh-15311
This commit is contained in:
Andy Wilkinson 2018-11-27 16:33:22 +00:00
parent dee8085f20
commit cf7664c01a
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,6 +156,8 @@ public class EmbeddedMongoAutoConfiguration {
return version; return version;
} }
} }
return Versions.withFeatures(
new GenericVersion(this.embeddedProperties.getVersion()));
} }
return Versions.withFeatures( return Versions.withFeatures(
new GenericVersion(this.embeddedProperties.getVersion()), new GenericVersion(this.embeddedProperties.getVersion()),

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

@ -24,6 +24,7 @@ import com.mongodb.MongoClient;
import de.flapdoodle.embed.mongo.config.IMongodConfig; import de.flapdoodle.embed.mongo.config.IMongodConfig;
import de.flapdoodle.embed.mongo.config.Storage; import de.flapdoodle.embed.mongo.config.Storage;
import de.flapdoodle.embed.mongo.distribution.Feature; import de.flapdoodle.embed.mongo.distribution.Feature;
import de.flapdoodle.embed.mongo.distribution.Version;
import org.bson.Document; import org.bson.Document;
import org.junit.After; import org.junit.After;
import org.junit.Test; import org.junit.Test;
@ -67,7 +68,13 @@ public class EmbeddedMongoAutoConfigurationTests {
@Test @Test
public void customVersion() { 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 @Test