Merge pull request spring-projects#15692 from Eugene Tenkaev

wilkinsona · wilkinsona · commit 609a30464d36 · 2019-02-11T17:35:42.000Z
* spring-projectsgh-15692: Polish "Fix stopping of Embedded Mongo before context is closed" Fix stopping of Embedded Mongo before context is closed Closes spring-projectsgh-15692
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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -212,7 +212,7 @@ public IRuntimeConfig embeddedMongoRuntimeConfig() {
 							"[console>]", Processors.logTo(logger, Slf4jLevel.DEBUG)));
 			return new RuntimeConfigBuilder().defaultsWithLogger(Command.MongoD, logger)
 					.processOutput(processOutput).artifactStore(getArtifactStore(logger))
-					.build();
+					.daemonProcess(false).build();
 		}
 
 		private ArtifactStoreBuilder getArtifactStore(Logger logger) {
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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -21,6 +21,7 @@
 import java.util.stream.Collectors;
 
 import com.mongodb.MongoClient;
+import de.flapdoodle.embed.mongo.MongodExecutable;
 import de.flapdoodle.embed.mongo.config.IMongodConfig;
 import de.flapdoodle.embed.mongo.config.Storage;
 import de.flapdoodle.embed.mongo.distribution.Feature;
@@ -174,6 +175,13 @@ public void customReplicaSetNameIsAppliedToConfiguration() {
 						.isEqualTo("testing");
 	}
 
+	@Test
+	public void shutdownHookIsNotRegistered() {
+		load();
+		assertThat(this.context.getBean(MongodExecutable.class).isRegisteredJobKiller())
+				.isFalse();
+	}
+
 	private void assertVersionConfiguration(String configuredVersion,
 			String expectedVersion) {
 		this.context = new AnnotationConfigApplicationContext();

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2012-2018 the original author or authors.`
	`2`	`+ * Copyright 2012-2019 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -212,7 +212,7 @@ public IRuntimeConfig embeddedMongoRuntimeConfig() {`
`212`	`212`	`"[console>]", Processors.logTo(logger, Slf4jLevel.DEBUG)));`
`213`	`213`	`return new RuntimeConfigBuilder().defaultsWithLogger(Command.MongoD, logger)`
`214`	`214`	`.processOutput(processOutput).artifactStore(getArtifactStore(logger))`
`215`		`- .build();`
	`215`	`+ .daemonProcess(false).build();`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`private ArtifactStoreBuilder getArtifactStore(Logger logger) {`