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

Add condition on MongoClientFactoryBean 

This commit makes sure that the condition that links a `MongoClient` to
the embedded mongo server kicks in only if `MongoClientFactoryBean` is
also on the classpath.

Previously, only a condition on the mongo driver existed, leading to
`ClassNotFoundException` if Spring Data MongoDB wasn't available.

See gh-6203
This commit is contained in:
Julien May 2016-06-22 11:54:47 +02:00 committed by Stephane Nicoll
parent 17f8a244de
commit 2003c5e1ae
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,6 +63,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.MapPropertySource; import org.springframework.core.env.MapPropertySource;
import org.springframework.core.env.MutablePropertySources; import org.springframework.core.env.MutablePropertySources;
import org.springframework.core.env.PropertySource; import org.springframework.core.env.PropertySource;
import org.springframework.data.mongodb.core.MongoClientFactoryBean;
import org.springframework.util.Assert; import org.springframework.util.Assert;
/** /**
@ -199,7 +200,7 @@ public class EmbeddedMongoAutoConfiguration {
* {@code embeddedMongoServer} bean. * {@code embeddedMongoServer} bean.
*/ */
@Configuration @Configuration
@ConditionalOnClass(MongoClient.class) @ConditionalOnClass({MongoClient.class, MongoClientFactoryBean.class})
protected static class EmbeddedMongoDependencyConfiguration protected static class EmbeddedMongoDependencyConfiguration
extends MongoClientDependsOnBeanFactoryPostProcessor { extends MongoClientDependsOnBeanFactoryPostProcessor {