From 45c8eca4f26805d2720c9bd3594a33a40015b619 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 14 Aug 2014 21:35:04 -0700 Subject: [PATCH] Add @ConditionalOnMissingBean(MongoDbFactory) Update MongoAutoConfiguration to be conditional on a missing MongoDbFactory bean. The assumption is that if the user has declared a MongoDbFactory they will either use it directly, or they will also register a Mongo bean. If the MongoDbFactory class cannot be found the existing Mongo auto-configuration still applies. This ensures that users that do not have Spring Data can still access a Mongo bean. Fixes gh-1341 --- .../boot/autoconfigure/mongo/MongoAutoConfiguration.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfiguration.java index 3007965c58..1cde4e5fc8 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfiguration.java @@ -27,6 +27,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.data.mongodb.MongoDbFactory; import com.mongodb.Mongo; import com.mongodb.MongoClientOptions; @@ -41,6 +42,7 @@ import com.mongodb.MongoClientOptions; @Configuration @ConditionalOnClass(Mongo.class) @EnableConfigurationProperties(MongoProperties.class) +@ConditionalOnMissingBean(MongoDbFactory.class) public class MongoAutoConfiguration { @Autowired