Skip to content

EmbeddedMongoAutoConfiguration should depend on bean by type #16627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

EmbeddedMongoAutoConfiguration should depend on bean by type #16627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions ...org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -74,6 +76,7 @@
* @author Andy Wilkinson
* @author Yogesh Lonkar
* @author Mark Paluch
* @author Issam El-atif
* @since 1.3.0
*/
@Configuration
Expand Down Expand Up @@ -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);
}

}
Expand All @@ -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);
}

}
Expand Down
22 changes: 22 additions & 0 deletions ...pringframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {

Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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);
}

}

}