DATAMONGO-1444 - Polishing.

- Update Javadoc comments and reference documentation.
- Introduce Adapter for blocking IndexOperations.
- Remove transaction synchronization.
- Remove unused types.
- Remove dropDupos options from indexes.
- Prevent usage of Querydsl along with reactive repository.
- Use ReactiveQueryMethod in ReactiveMongoQuery.

Author: christophstrobl

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/ReactiveMongoDatabaseFactory.java

@@ -24,23 +24,23 @@
 
 /**
  * Interface for factories creating reactive {@link MongoDatabase} instances.
- * 
+ *
  * @author Mark Paluch
  * @since 2.0
  */
 public interface ReactiveMongoDatabaseFactory {
 
 	/**
 	 * Creates a default {@link MongoDatabase} instance.
-	 * 
+	 *
 	 * @return
 	 * @throws DataAccessException
 	 */
 	MongoDatabase getMongoDatabase() throws DataAccessException;
 
 	/**
 	 * Creates a {@link MongoDatabase} instance to access the database with the given name.
-	 * 
+	 *
 	 * @param dbName must not be {@literal null} or empty.
 	 * @return
 	 * @throws DataAccessException
@@ -49,7 +49,7 @@ public interface ReactiveMongoDatabaseFactory {
 
 	/**
 	 * Exposes a shared {@link MongoExceptionTranslator}.
-	 * 
+	 *
 	 * @return will never be {@literal null}.
 	 */
 	PersistenceExceptionTranslator getExceptionTranslator();

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

@@ -18,7 +18,9 @@
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory;
 import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import org.springframework.data.mongodb.core.SimpleReactiveMongoDatabaseFactory;
 import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
 import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
@@ -28,7 +30,7 @@
 
 /**
  * Base class for reactive Spring Data MongoDB configuration using JavaConfig.
- * 
+ *
  * @author Mark Paluch
  * @since 2.0
  * @see MongoConfigurationSupport
@@ -39,39 +41,39 @@ public abstract class AbstractReactiveMongoConfiguration extends MongoConfigurat
 	/**
 	 * Return the {@link MongoClient} instance to connect to. Annotate with {@link Bean} in case you want to expose a
 	 * {@link MongoClient} instance to the {@link org.springframework.context.ApplicationContext}.
-	 * 
+	 *
 	 * @return
 	 */
 	public abstract MongoClient mongoClient();
 
 	/**
 	 * Creates a {@link ReactiveMongoTemplate}.
-	 * 
+	 *
 	 * @return
 	 */
 	@Bean
-	public ReactiveMongoTemplate reactiveMongoTemplate() throws Exception {
+	public ReactiveMongoOperations reactiveMongoTemplate() throws Exception {
 		return new ReactiveMongoTemplate(mongoDbFactory(), mappingMongoConverter());
 	}
 
 	/**
 	 * Creates a {@link SimpleMongoDbFactory} to be used by the {@link MongoTemplate}. Will use the {@link Mongo} instance
 	 * configured in {@link #mongoClient()}.
-	 * 
+	 *
 	 * @see #mongoClient()
 	 * @see #reactiveMongoTemplate()
 	 * @return
 	 * @throws Exception
 	 */
 	@Bean
-	public SimpleReactiveMongoDatabaseFactory mongoDbFactory() {
+	public ReactiveMongoDatabaseFactory mongoDbFactory() {
 		return new SimpleReactiveMongoDatabaseFactory(mongoClient(), getDatabaseName());
 	}
 
 	/**
 	 * Creates a {@link MappingMongoConverter} using the configured {@link #mongoDbFactory()} and
 	 * {@link #mongoMappingContext()}. Will get {@link #customConversions()} applied.
-	 * 
+	 *
 	 * @see #customConversions()
 	 * @see #mongoMappingContext()
 	 * @see #mongoDbFactory()

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 the original author or authors.
+ * Copyright 2011-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,6 +73,7 @@
  * @author Maciej Walkowiak
  * @author Thomas Darimont
  * @author Christoph Strobl
+ * @author Mark Paluch
  */
 public class MappingMongoConverterParser implements BeanDefinitionParser {
 
@@ -121,6 +122,7 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
 		}
 
 		if(!registry.containsBeanDefinition("indexOperationsProvider")){
+
 			BeanDefinitionBuilder indexOperationsProviderBuilder = BeanDefinitionBuilder.genericBeanDefinition("org.springframework.data.mongodb.core.DefaultIndexOperationsProvider");
 			indexOperationsProviderBuilder.addConstructorArgReference(dbFactoryRef);
 			parserContext.registerBeanComponent(new BeanComponentDefinition(indexOperationsProviderBuilder.getBeanDefinition(), "indexOperationsProvider"));
@@ -129,9 +131,7 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
 		try {
 			registry.getBeanDefinition(INDEX_HELPER_BEAN_NAME);
 		} catch (NoSuchBeanDefinitionException ignored) {
-			if (!StringUtils.hasText(dbFactoryRef)) {
-				dbFactoryRef = DB_FACTORY_BEAN_NAME;
-			}
+
 			BeanDefinitionBuilder indexHelperBuilder = BeanDefinitionBuilder
 					.genericBeanDefinition(MongoPersistentEntityIndexCreator.class);
 			indexHelperBuilder.addConstructorArgReference(ctxRef);

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

@@ -16,6 +16,7 @@
 
 package org.springframework.data.mongodb.config;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -28,7 +29,9 @@
 import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.data.annotation.Persistent;
 import org.springframework.data.authentication.UserCredentials;
+import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.context.MappingContextIsNewStrategyFactory;
+import org.springframework.data.mapping.context.PersistentEntities;
 import org.springframework.data.mapping.model.CamelCaseAbbreviatingFieldNamingStrategy;
 import org.springframework.data.mapping.model.FieldNamingStrategy;
 import org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy;
@@ -51,7 +54,7 @@
 
 /**
  * Base class for Spring Data MongoDB to be extended for JavaConfiguration usage.
- * 
+ *
  * @author Mark Paluch
  * @since 2.0
  */
@@ -100,20 +103,22 @@ public MongoMappingContext mongoMappingContext() throws ClassNotFoundException {
 
 	/**
 	 * Returns a {@link MappingContextIsNewStrategyFactory} wrapped into a {@link CachingIsNewStrategyFactory}.
-	 * 
+	 *
 	 * @return
 	 * @throws ClassNotFoundException
 	 */
 	@Bean
 	public IsNewStrategyFactory isNewStrategyFactory() throws ClassNotFoundException {
-		return new CachingIsNewStrategyFactory(new MappingContextIsNewStrategyFactory(mongoMappingContext()));
+
+		return new CachingIsNewStrategyFactory(new MappingContextIsNewStrategyFactory(
+				new PersistentEntities(Arrays.<MappingContext<?, ?>> asList(new MappingContext[] { mongoMappingContext() }))));
 	}
 
 	/**
 	 * Register custom {@link Converter}s in a {@link CustomConversions} object if required. These
 	 * {@link CustomConversions} will be registered with the {@link #mappingMongoConverter()} and
 	 * {@link #mongoMappingContext()}. Returns an empty {@link CustomConversions} instance by default.
-	 * 
+	 *
 	 * @return must not be {@literal null}.
 	 */
 	@Bean
@@ -124,7 +129,7 @@ public CustomConversions customConversions() {
 	/**
 	 * Scans the mapping base package for classes annotated with {@link Document}. By default, it scans for entities in
 	 * all packages returned by {@link #getMappingBasePackages()}.
-	 * 
+	 *
 	 * @see #getMappingBasePackages()
 	 * @return
 	 * @throws ClassNotFoundException
@@ -143,7 +148,7 @@ protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
 	/**
 	 * Scans the given base package for entities, i.e. MongoDB specific types annotated with {@link Document} and
 	 * {@link Persistent}.
-	 * 
+	 *
 	 * @param basePackage must not be {@literal null}.
 	 * @return
 	 * @throws ClassNotFoundException
@@ -178,7 +183,7 @@ protected Set<Class<?>> scanForEntities(String basePackage) throws ClassNotFound
 	 * Configures whether to abbreviate field names for domain objects by configuring a
 	 * {@link CamelCaseAbbreviatingFieldNamingStrategy} on the {@link MongoMappingContext} instance created. For advanced
 	 * customization needs, consider overriding {@link #mappingMongoConverter()}.
-	 * 
+	 *
 	 * @return
 	 */
 	protected boolean abbreviateFieldNames() {
@@ -187,7 +192,7 @@ protected boolean abbreviateFieldNames() {
 
 	/**
 	 * Configures a {@link FieldNamingStrategy} on the {@link MongoMappingContext} instance created.
-	 * 
+	 *
 	 * @return
 	 * @since 1.5
 	 */

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultIndexOperations.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.data.mongodb.core;
 
-import static org.springframework.data.mongodb.core.MongoTemplate.potentiallyConvertRuntimeException;
+import static org.springframework.data.mongodb.core.MongoTemplate.*;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -65,19 +65,18 @@ public DefaultIndexOperations(MongoDbFactory mongoDbFactory, String collectionNa
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.IndexOperations#ensureIndex(org.springframework.data.mongodb.core.index.IndexDefinition)
 	 */
-	public void ensureIndex(final IndexDefinition indexDefinition) {
-		execute(collection -> {
+	public String ensureIndex(final IndexDefinition indexDefinition) {
+
+		return execute(collection -> {
 
 			Document indexOptions = indexDefinition.getIndexOptions();
 
 			if (indexOptions != null) {
 
-				IndexOptions ops = IndexConverters.DEFINITION_TO_MONGO_INDEX_OPTIONS.convert(indexDefinition);
-				collection.createIndex(indexDefinition.getIndexKeys(), ops);
-			} else {
-				collection.createIndex(indexDefinition.getIndexKeys());
+				IndexOptions ops = IndexConverters.indexDefinitionToIndexOptionsConverter().convert(indexDefinition);
+				return collection.createIndex(indexDefinition.getIndexKeys(), ops);
 			}
-			return null;
+			return collection.createIndex(indexDefinition.getIndexKeys());
 		});
 	}
 
@@ -86,11 +85,10 @@ public void ensureIndex(final IndexDefinition indexDefinition) {
 	 * @see org.springframework.data.mongodb.core.IndexOperations#dropIndex(java.lang.String)
 	 */
 	public void dropIndex(final String name) {
-		execute(new CollectionCallback<Void>() {
-			public Void doInCollection(MongoCollection<Document> collection) throws MongoException, DataAccessException {
-				collection.dropIndex(name);
-				return null;
-			}
+
+		execute(collection -> {
+			collection.dropIndex(name);
+			return null;
 		});
 
 	}
@@ -110,6 +108,7 @@ public void dropAllIndexes() {
 	public List<IndexInfo> getIndexInfo() {
 
 		return execute(new CollectionCallback<List<IndexInfo>>() {
+
 			public List<IndexInfo> doInCollection(MongoCollection<Document> collection)
 					throws MongoException, DataAccessException {
 
@@ -124,7 +123,7 @@ private List<IndexInfo> getIndexData(MongoCursor<Document> cursor) {
 				while (cursor.hasNext()) {
 
 					Document ix = cursor.next();
-					IndexInfo indexInfo = IndexConverters.DOCUMENT_INDEX_INFO.convert(ix);
+					IndexInfo indexInfo = IndexConverters.documentToIndexInfoConverter().convert(ix);
 					indexInfoList.add(indexInfo);
 				}
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultReactiveIndexOperations.java

@@ -62,7 +62,7 @@ public Mono<String> ensureIndex(final IndexDefinition indexDefinition) {
 
 			if (indexOptions != null) {
 				return collection.createIndex(indexDefinition.getIndexKeys(),
-						IndexConverters.DEFINITION_TO_MONGO_INDEX_OPTIONS.convert(indexDefinition));
+						IndexConverters.indexDefinitionToIndexOptionsConverter().convert(indexDefinition));
 			}
 
 			return collection.createIndex(indexDefinition.getIndexKeys());
@@ -96,7 +96,7 @@ public Flux<IndexInfo> getIndexInfo() {
 
 			ListIndexesPublisher<Document> indexesPublisher = collection.listIndexes(Document.class);
 
-			return Flux.from(indexesPublisher).map(t -> IndexConverters.DOCUMENT_INDEX_INFO.convert(t));
+			return Flux.from(indexesPublisher).map(IndexConverters.documentToIndexInfoConverter()::convert);
 		});
 	}
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/IndexConverters.java

@@ -35,14 +35,15 @@
 
 /**
  * {@link Converter Converters} for index-related MongoDB documents/types.
- * 
+ *
  * @author Mark Paluch
+ * @author Christoph Strobl
  * @since 2.0
  */
 abstract class IndexConverters {
 
-	public final static Converter<IndexDefinition, IndexOptions> DEFINITION_TO_MONGO_INDEX_OPTIONS;
-	public final static Converter<Document, IndexInfo> DOCUMENT_INDEX_INFO;
+	private static final Converter<IndexDefinition, IndexOptions> DEFINITION_TO_MONGO_INDEX_OPTIONS;
+	private static final Converter<Document, IndexInfo> DOCUMENT_INDEX_INFO;
 
 	private static final Double ONE = Double.valueOf(1);
 	private static final Double MINUS_ONE = Double.valueOf(-1);
@@ -58,6 +59,14 @@ private IndexConverters() {
 
 	}
 
+	static Converter<IndexDefinition, IndexOptions> indexDefinitionToIndexOptionsConverter() {
+		return DEFINITION_TO_MONGO_INDEX_OPTIONS;
+	}
+
+	static Converter<Document, IndexInfo> documentToIndexInfoConverter() {
+		return DOCUMENT_INDEX_INFO;
+	}
+
 	private static Converter<IndexDefinition, IndexOptions> getIndexDefinitionIndexOptionsConverter() {
 
 		return indexDefinition -> {
@@ -115,14 +124,14 @@ private static Converter<IndexDefinition, IndexOptions> getIndexDefinitionIndexO
 	private static Converter<Document, IndexInfo> getDocumentIndexInfoConverter() {
 
 		return ix -> {
-			Document keyDbObject = (Document) ix.get("key");
-			int numberOfElements = keyDbObject.keySet().size();
+			Document keyDocument = (Document) ix.get("key");
+			int numberOfElements = keyDocument.keySet().size();
 
 			List<IndexField> indexFields = new ArrayList<IndexField>(numberOfElements);
 
-			for (String key : keyDbObject.keySet()) {
+			for (String key : keyDocument.keySet()) {
 
-				Object value = keyDbObject.get(key);
+				Object value = keyDocument.get(key);
 
 				if (TWO_D_IDENTIFIERS.contains(value)) {
 					indexFields.add(IndexField.geo(key));
@@ -148,11 +157,10 @@ private static Converter<Document, IndexInfo> getDocumentIndexInfoConverter() {
 			String name = ix.get("name").toString();
 
 			boolean unique = ix.containsKey("unique") ? (Boolean) ix.get("unique") : false;
-			boolean dropDuplicates = ix.containsKey("dropDups") ? (Boolean) ix.get("dropDups") : false;
 			boolean sparse = ix.containsKey("sparse") ? (Boolean) ix.get("sparse") : false;
 
 			String language = ix.containsKey("default_language") ? (String) ix.get("default_language") : "";
-			return new IndexInfo(indexFields, name, unique, dropDuplicates, sparse, language);
+			return new IndexInfo(indexFields, name, unique, sparse, language);
 		};
 	}
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/IndexOperations.java

@@ -35,7 +35,7 @@ public interface IndexOperations {
 	 * 
 	 * @param indexDefinition must not be {@literal null}.
 	 */
-	void ensureIndex(IndexDefinition indexDefinition);
+	String ensureIndex(IndexDefinition indexDefinition);
 
 	/**
 	 * Drops an index from this collection.