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

Merge branch '2.1.x'

This commit is contained in:
Andy Wilkinson 2019-02-11 17:38:24 +00:00
parent 5c08e23e9b 609a30464d
commit 6fe226d781
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,9 +215,10 @@ public class EmbeddedMongoAutoConfiguration {
Processors.logTo(logger, Slf4jLevel.ERROR), Processors.named( Processors.logTo(logger, Slf4jLevel.ERROR), Processors.named(
"[console>]", Processors.logTo(logger, Slf4jLevel.DEBUG))); "[console>]", Processors.logTo(logger, Slf4jLevel.DEBUG)));
return new RuntimeConfigBuilder().defaultsWithLogger(Command.MongoD, logger) return new RuntimeConfigBuilder().defaultsWithLogger(Command.MongoD, logger)
.processOutput(processOutput).artifactStore(getArtifactStore(logger, .processOutput(processOutput)
.artifactStore(getArtifactStore(logger,
downloadConfigBuilderCustomizers.orderedStream())) downloadConfigBuilderCustomizers.orderedStream()))
.build(); .daemonProcess(false).build();
} }
private ArtifactStoreBuilder getArtifactStore(Logger logger, private ArtifactStoreBuilder getArtifactStore(Logger logger,

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

@ -22,6 +22,7 @@ import java.util.EnumSet;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.mongodb.MongoClient; import com.mongodb.MongoClient;
import de.flapdoodle.embed.mongo.MongodExecutable;
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;
@ -192,6 +193,13 @@ public class EmbeddedMongoAutoConfigurationTests {
assertThat(downloadConfig.getUserAgent()).isEqualTo("Test User Agent"); assertThat(downloadConfig.getUserAgent()).isEqualTo("Test User Agent");
} }
@Test
public void shutdownHookIsNotRegistered() {
load();
assertThat(this.context.getBean(MongodExecutable.class).isRegisteredJobKiller())
.isFalse();
}
private void assertVersionConfiguration(String configuredVersion, private void assertVersionConfiguration(String configuredVersion,
String expectedVersion) { String expectedVersion) {
this.context = new AnnotationConfigApplicationContext(); this.context = new AnnotationConfigApplicationContext();