EmbeddedMongoAutoConfiguration should depend on bean by type

Author: ielatif

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

@@ -48,6 +48,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.springframework.beans.factory.BeanFactoryUtils;
+import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -74,6 +76,7 @@
  * @author Andy Wilkinson
  * @author Yogesh Lonkar
  * @author Mark Paluch
+ * @author Issam El-atif
  * @since 1.3.0
  */
 @Configuration
@@ -230,11 +233,16 @@ private ArtifactStoreBuilder getArtifactStore(Logger logger) {
 	 */
 	@Configuration
 	@ConditionalOnClass({ MongoClient.class, MongoClientFactoryBean.class })
-	protected static class EmbeddedMongoDependencyConfiguration
-			extends MongoClientDependsOnBeanFactoryPostProcessor {
+	protected static class EmbeddedMongoDependencyConfiguration {
 
-		public EmbeddedMongoDependencyConfiguration() {
-			super("embeddedMongoServer");
+		@Bean
+		public MongoClientDependsOnBeanFactoryPostProcessor mongoClientDependsOnBeanFactoryPostProcessor(
+				ListableBeanFactory listableBeanFactory) {
+			String[] mongoExecutableBeanNames = BeanFactoryUtils
+					.beanNamesForTypeIncludingAncestors(listableBeanFactory,
+							MongodExecutable.class);
+			return new MongoClientDependsOnBeanFactoryPostProcessor(
+					mongoExecutableBeanNames);
 		}
 
 	}
@@ -246,11 +254,16 @@ public EmbeddedMongoDependencyConfiguration() {
 	@Configuration
 	@ConditionalOnClass({ com.mongodb.reactivestreams.client.MongoClient.class,
 			ReactiveMongoClientFactoryBean.class })
-	protected static class EmbeddedReactiveMongoDependencyConfiguration
-			extends ReactiveStreamsMongoClientDependsOnBeanFactoryPostProcessor {
+	protected static class EmbeddedReactiveMongoDependencyConfiguration {
 
-		public EmbeddedReactiveMongoDependencyConfiguration() {
-			super("embeddedMongoServer");
+		@Bean
+		public ReactiveStreamsMongoClientDependsOnBeanFactoryPostProcessor reactiveStreamsMongoClientDependsOnBeanFactoryPostProcessor(
+				ListableBeanFactory listableBeanFactory) {
+			String[] mongoExecutableBeanNames = BeanFactoryUtils
+					.beanNamesForTypeIncludingAncestors(listableBeanFactory,
+							MongodExecutable.class);
+			return new ReactiveStreamsMongoClientDependsOnBeanFactoryPostProcessor(
+					mongoExecutableBeanNames);
 		}
 
 	}

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

@@ -22,10 +22,12 @@
 
 import com.mongodb.MongoClient;
 import de.flapdoodle.embed.mongo.MongodExecutable;
+import de.flapdoodle.embed.mongo.MongodStarter;
 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 de.flapdoodle.embed.process.config.IRuntimeConfig;
 import org.bson.Document;
 import org.junit.After;
 import org.junit.Test;
@@ -43,13 +45,15 @@
 import org.springframework.util.FileSystemUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
 
 /**
  * Tests for {@link EmbeddedMongoAutoConfiguration}.
  *
  * @author Henryk Konsek
  * @author Andy Wilkinson
  * @author Stephane Nicoll
+ * @author Issam El-atif
  */
 public class EmbeddedMongoAutoConfigurationTests {
 
@@ -182,6 +186,12 @@ public void shutdownHookIsNotRegistered() {
 				.isFalse();
 	}
 
+	@Test
+	public void customMongoServerConfiguration() {
+		assertThatCode(() -> load(CustomMongoConfiguration.class))
+				.doesNotThrowAnyException();
+	}
+
 	private void assertVersionConfiguration(String configuredVersion,
 			String expectedVersion) {
 		this.context = new AnnotationConfigApplicationContext();
@@ -229,4 +239,16 @@ public MongoClient mongoClient(@Value("${local.mongo.port}") int port) {
 
 	}
 
+	@Configuration
+	static class CustomMongoConfiguration {
+
+		@Bean(initMethod = "start", destroyMethod = "stop")
+		public MongodExecutable customMongoServer(IRuntimeConfig runtimeConfig,
+				IMongodConfig mongodConfig) {
+			MongodStarter mongodStarter = MongodStarter.getInstance(runtimeConfig);
+			return mongodStarter.prepare(mongodConfig);
+		}
+
+	}
+
 }