Allow to override auto index creation

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MappingMongoConverterParser.java

@@ -76,6 +76,7 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  * @author Zied Yaich
+ * @author Tomasz Forys
  */
 public class MappingMongoConverterParser implements BeanDefinitionParser {
 
@@ -97,12 +98,12 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
 		id = StringUtils.hasText(id) ? id : DEFAULT_CONVERTER_BEAN_NAME;
 
 		String autoIndexCreation = element.getAttribute("auto-index-creation");
-		boolean autoIndexCreationEnabled = StringUtils.hasText(autoIndexCreation) && Boolean.valueOf(autoIndexCreation);
+		boolean autoIndexCreationEnabled = StringUtils.hasText(autoIndexCreation) && Boolean.parseBoolean(autoIndexCreation);
 
 		parserContext.pushContainingComponent(new CompositeComponentDefinition("Mapping Mongo Converter", element));
 
 		BeanDefinition conversionsDefinition = getCustomConversions(element, parserContext);
-		String ctxRef = potentiallyCreateMappingContext(element, parserContext, conversionsDefinition, id);
+		String ctxRef = potentiallyCreateMappingContext(element, parserContext, conversionsDefinition, id, autoIndexCreationEnabled);
 
 		// Need a reference to a Mongo instance
 		String dbFactoryRef = element.getAttribute("db-factory-ref");
@@ -282,10 +283,8 @@ private BeanDefinition getCustomConversions(Element element, ParserContext parse
 			ManagedList<BeanMetadataElement> converterBeans = new ManagedList<>();
 			List<Element> converterElements = DomUtils.getChildElementsByTagName(customerConvertersElement, "converter");
 
-			if (converterElements != null) {
-				for (Element listenerElement : converterElements) {
-					converterBeans.add(parseConverter(listenerElement, parserContext));
-				}
+			for (Element listenerElement : converterElements) {
+				converterBeans.add(parseConverter(listenerElement, parserContext));
 			}
 
 			// Scan for Converter and GenericConverter beans in the given base-package

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MappingMongoConverterParserIntegrationTests.java

@@ -38,6 +38,7 @@
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoTypeMapper;
 import org.springframework.data.mongodb.core.mapping.Account;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.repository.Person;
 import org.springframework.stereotype.Component;
 
@@ -48,6 +49,7 @@
  * @author Thomas Darimont
  * @author Christoph Strobl
  * @author Ryan Tenney
+ * @author Tomasz Forys
  */
 public class MappingMongoConverterParserIntegrationTests {
 
@@ -61,6 +63,22 @@ void allowsDbFactoryRefAttribute() {
 		factory.getBean("converter");
 	}
 
+	@Test
+	void allowsToOverrideAutoIndexCreation() {
+
+		loadValidConfiguration();
+		MongoMappingContext mongoMappingContext = factory.getBean("autoIndexCreationConverter.mongoMappingContext", MongoMappingContext.class);
+		assertThat(mongoMappingContext.isAutoIndexCreation()).isTrue();
+	}
+
+	@Test
+	void testDefaultValueForAutoIndexCreation() {
+
+		loadValidConfiguration();
+		MongoMappingContext mongoMappingContext = factory.getBean("converter.mongoMappingContext", MongoMappingContext.class);
+		assertThat(mongoMappingContext.isAutoIndexCreation()).isFalse();
+	}
+
 	@Test // DATAMONGO-725
 	void hasCustomTypeMapper() {
 

spring-data-mongodb/src/test/resources/namespace/converter.xml

@@ -13,6 +13,8 @@
 
 	<mongo:mapping-converter id="abbreviatingConverter" abbreviate-field-names="true" />
 
+	<mongo:mapping-converter id="autoIndexCreationConverter" db-factory-ref="factory" auto-index-creation="true" />
+
 	<bean name="customMongoTypeMapper" class="org.springframework.data.mongodb.config.CustomMongoTypeMapper"/>
 
 </beans>