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

Revert "Raised the default version of Mongo to 3.6.5 when using Embedded Mongo." 

This reverts commit 1a4ad96dd0. Reverting
to see if this fixes CI timeouts.
This commit is contained in:
Madhura Bhave 2018-09-17 15:25:54 -07:00
parent b2dd162572
commit 9201e23f67
3 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,6 @@ import de.flapdoodle.embed.mongo.config.RuntimeConfigBuilder;
import de.flapdoodle.embed.mongo.config.Storage;
import de.flapdoodle.embed.mongo.distribution.Feature;
import de.flapdoodle.embed.mongo.distribution.IFeatureAwareVersion;
import de.flapdoodle.embed.mongo.distribution.Version;
import de.flapdoodle.embed.mongo.distribution.Versions;
import de.flapdoodle.embed.process.config.IRuntimeConfig;
import de.flapdoodle.embed.process.config.io.ProcessOutput;
@ -126,8 +125,11 @@ public class EmbeddedMongoAutoConfiguration {
@Bean
@ConditionalOnMissingBean
public IMongodConfig embeddedMongoConfiguration() throws IOException {
IFeatureAwareVersion featureAwareVersion = Versions.withFeatures(
new GenericVersion(this.embeddedProperties.getVersion()),
this.embeddedProperties.getFeatures().toArray(new Feature[0]));
MongodConfigBuilder builder = new MongodConfigBuilder()
.version(determineVersion());
.version(featureAwareVersion);
EmbeddedMongoProperties.Storage storage = this.embeddedProperties.getStorage();
if (storage != null) {
String databaseDir = storage.getDatabaseDir();
@ -147,20 +149,6 @@ public class EmbeddedMongoAutoConfiguration {
return builder.build();
}
private IFeatureAwareVersion determineVersion() {
if (this.embeddedProperties.getFeatures() == null) {
for (Version version : Version.values()) {
if (version.asInDownloadPath()
.equals(this.embeddedProperties.getVersion())) {
return version;
}
}
}
return Versions.withFeatures(
new GenericVersion(this.embeddedProperties.getVersion()),
this.embeddedProperties.getFeatures().toArray(new Feature[0]));
}
private InetAddress getHost() throws UnknownHostException {
if (this.properties.getHost() == null) {
return InetAddress.getByAddress(Network.localhostIsIPv6()

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

@ -1,5 +1,5 @@
/*
* Copyright 2012-2018 the original author or authors.
* Copyright 2012-2017 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.
@ -16,6 +16,8 @@
package org.springframework.boot.autoconfigure.mongo.embedded;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import de.flapdoodle.embed.mongo.distribution.Feature;
@ -35,15 +37,15 @@ public class EmbeddedMongoProperties {
/**
* Version of Mongo to use.
*/
private String version = "3.6.5";
private String version = "3.2.2";
private final Storage storage = new Storage();
/**
* Comma-separated list of features to enable. Uses the defaults of the configured
* version by default.
* Comma-separated list of features to enable.
*/
private Set<Feature> features = null;
private Set<Feature> features = new HashSet<>(
Collections.singletonList(Feature.SYNC_DELAY));
public String getVersion() {
return this.version;

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

@ -1,5 +1,5 @@
/*
* Copyright 2012-2018 the original author or authors.
* Copyright 2012-2017 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.
@ -60,20 +60,19 @@ public class EmbeddedMongoAutoConfigurationTests {
@Test
public void defaultVersion() {
assertVersionConfiguration(null, "3.6.5");
assertVersionConfiguration(null, "3.2.2");
}
@Test
public void customVersion() {
assertVersionConfiguration("3.6.3", "3.6.3");
assertVersionConfiguration("2.7.1", "2.7.1");
}
@Test
public void customFeatures() {
load("spring.mongodb.embedded.features=TEXT_SEARCH, SYNC_DELAY, ONLY_WITH_SSL, NO_HTTP_INTERFACE_ARG");
load("spring.mongodb.embedded.features=TEXT_SEARCH, SYNC_DELAY");
assertThat(this.context.getBean(EmbeddedMongoProperties.class).getFeatures())
.containsExactly(Feature.TEXT_SEARCH, Feature.SYNC_DELAY,
Feature.ONLY_WITH_SSL, Feature.NO_HTTP_INTERFACE_ARG);
.contains(Feature.TEXT_SEARCH, Feature.SYNC_DELAY);
}
@Test