DATAMONGO-1754 - Release version 2.0 RC3 (Kay).

Update Javadoc and test classes.

Original Pull Request: #490

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,12 @@
+<!--
+
+Thank you for proposing a pull request. This template will guide you through the essential steps necessary for a pull request.
+Make sure that:
+
+-->
+
+- [ ] You have read the [Spring Data contribution guidelines](https://github.com/spring-projects/spring-data-build/blob/master/CONTRIBUTING.adoc).
+- [ ] There is a ticket in the bug tracker for the project in our [JIRA](https://jira.spring.io/browse/DATAMONGO).
+- [ ] You use the code formatters provided [here](https://github.com/spring-projects/spring-data-build/tree/master/etc/ide) and have them applied to your changes. Don’t submit any formatting related changes.
+- [ ] You submit test cases (unit or integration tests) that back your changes.
+- [ ] You added yourself as author in the headers of the classes you touched. Amend the date range in the Apache license header if needed. For new types, add the license header (copy from another file and set the current year only).

.gitignore

@@ -15,3 +15,4 @@ src/ant/.ant-targets-upload-dist.xml
 atlassian-ide-plugin.xml
 /.gradle/
 /.idea/
+*.graphml

.travis.yml

@@ -0,0 +1,36 @@
+language: java
+
+jdk:
+  - oraclejdk8
+
+before_script:
+  - mongod --version
+
+services:
+  - mongodb
+
+env:
+  matrix:
+    - PROFILE=ci
+    - PROFILE=mongo36-next
+
+# Current MongoDB version is 2.4.2 as of 2016-04, see https://github.com/travis-ci/travis-ci/issues/3694
+# apt-get starts a MongoDB instance so it's not started using before_script
+addons:
+  apt:
+    sources:
+      - mongodb-3.4-precise
+    packages:
+    - mongodb-org-server
+    - mongodb-org-shell
+    - oracle-java8-installer
+
+sudo: false
+
+cache:
+  directories:
+    - $HOME/.m2
+
+install: true
+
+script: "mvn clean dependency:list test -P${PROFILE} -Dsort"

CODE_OF_CONDUCT.adoc

@@ -0,0 +1,27 @@
+= Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic addresses,
+  without explicit permission
+* Other unethical or unprofessional conduct
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team.
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a project maintainer at spring-code-of-conduct@pivotal.io.
+All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances.
+Maintainers are obligated to maintain confidentiality with regard to the reporter of an incident.
+
+This Code of Conduct is adapted from the http://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at http://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/].

CONTRIBUTING.adoc

@@ -0,0 +1,3 @@
+= Spring Data contribution guidelines
+
+You find the contribution guidelines for Spring Data projects https://github.com/spring-projects/spring-data-build/blob/master/CONTRIBUTING.adoc[here].

README.md

@@ -1,155 +1,150 @@
-Spring Data - Document
-======================
+[![Spring Data MongoDB](https://spring.io/badges/spring-data-mongodb/ga.svg)](http://projects.spring.io/spring-data-mongodb#quick-start)
+[![Spring Data MongoDB](https://spring.io/badges/spring-data-mongodb/snapshot.svg)](http://projects.spring.io/spring-data-mongodb#quick-start)
 
-The primary goal of the [Spring Data](http://www.springsource.org/spring-data) project is to make it easier to build Spring-powered applications that use new data access technologies such as non-relational databases, map-reduce frameworks, and cloud based data services.
-As the name implies, the **Document** modules provides integration with document databases such as [MongoDB](http://www.mongodb.org/) and [CouchDB](http://couchdb.apache.org/).
+# Spring Data MongoDB
 
-Getting Help
-------------
+The primary goal of the [Spring Data](http://projects.spring.io/spring-data) project is to make it easier to build Spring-powered applications that use new data access technologies such as non-relational databases, map-reduce frameworks, and cloud based data services.
 
-At this point your best bet is to look at the Look at the [JavaDocs](http://static.springsource.org/spring-data/data-document/docs/1.0.0.BUILD-SNAPSHOT/spring-data-mongodb/apidocs/) for MongoDB integration and corresponding and source code. For more detailed questions, use the [forum](http://forum.springsource.org/forumdisplay.php?f=80). If you are new to Spring as well as to Spring Data, look for information about [Spring projects](http://www.springsource.org/projects). 
+The Spring Data MongoDB project aims to provide a familiar and consistent Spring-based programming model for new datastores while retaining store-specific features and capabilities. The Spring Data MongoDB project provides integration with the MongoDB document database. Key functional areas of Spring Data MongoDB are a POJO centric model for interacting with a MongoDB DBCollection and easily writing a repository style data access layer.
 
-The [User Guide](http://static.springsource.org/spring-data/data-document/docs/1.0.0.BUILD-SNAPSHOT/reference/html/) (A work in progress). 
+## Getting Help
+
+For a comprehensive treatment of all the Spring Data MongoDB features, please refer to:
+
+* the [User Guide](http://docs.spring.io/spring-data/mongodb/docs/current/reference/html/)
+* the [JavaDocs](http://docs.spring.io/spring-data/mongodb/docs/current/api/) have extensive comments in them as well.
+* the home page of [Spring Data MongoDB](http://projects.spring.io/spring-data-mongodb) contains links to articles and other resources.
+* for more detailed questions, use [Spring Data Mongodb on Stackoverflow](http://stackoverflow.com/questions/tagged/spring-data-mongodb).
+
+If you are new to Spring as well as to Spring Data, look for information about [Spring projects](http://projects.spring.io/).
 
 
+## Quick Start
 
-Quick Start
------------
+### Maven configuration
 
-## MongoDB
+Add the Maven dependency:
 
-For those in a hurry:
+```xml
+<dependency>
+  <groupId>org.springframework.data</groupId>
+  <artifactId>spring-data-mongodb</artifactId>
+  <version>${version}.RELEASE</version>
+</dependency>
+```
 
+If you'd rather like the latest snapshots of the upcoming major version, use our Maven snapshot repository and declare the appropriate dependency version.
 
-* Download the jar through Maven:
+```xml
+<dependency>
+  <groupId>org.springframework.data</groupId>
+  <artifactId>spring-data-mongodb</artifactId>
+  <version>${version}.BUILD-SNAPSHOT</version>
+</dependency>
 
-      <dependency>
-        <groupId>org.springframework.data</groupId>
-        <artifactId>spring-data-mongodb</artifactId>
-        <version>1.0.0.BUILD-SNAPSHOT</version>
-      </dependency> 
-
-
-      <repository>
-        <id>spring-maven-snapshot</id>
-        <snapshots><enabled>true</enabled></snapshots>
-        <name>Springframework Maven SNAPSHOT Repository</name>
-        <url>http://maven.springframework.org/snapshot</url>
-      </repository> 
+<repository>
+  <id>spring-libs-snapshot</id>
+  <name>Spring Snapshot Repository</name>
+  <url>http://repo.spring.io/libs-snapshot</url>
+</repository>
+```
 
 ### MongoTemplate
-MongoTemplate is the central support class for Mongo database operations.  It provides
+
+MongoTemplate is the central support class for Mongo database operations. It provides:
 
 * Basic POJO mapping support to and from BSON
-* Connection Affinity callback
-* Exception translation into Spring's [technology agnostic DAO exception hierarchy](http://static.springsource.org/spring/docs/3.0.x/spring-framework-reference/html/dao.html#dao-exceptions).
+* Convenience methods to interact with the store (insert object, update objects) and MongoDB specific ones (geo-spatial operations, upserts, map-reduce etc.)
+* Connection affinity callback
+* Exception translation into Spring's [technology agnostic DAO exception hierarchy](http://docs.spring.io/spring/docs/current/spring-framework-reference/html/dao.html#dao-exceptions).
 
-Future plans are to support optional logging and/or exception throwing based on WriteResult return value, common map-reduce operations, GridFS operations.  A simple API for partial document updates is also planned.
+### Spring Data repositories
 
-### Easy Data Repository generation
+To simplify the creation of data repositories Spring Data MongoDB provides a generic repository programming model. It will automatically create a repository proxy for you that adds implementations of finder methods you specify on an interface.  
 
-To simplify the creation of Data Repositories a generic Repository interface and default implementation is provided.  Furthermore, Spring will automatically create a Repository implementation for you that adds implementations of finder methods you specify on an interface.  
+For example, given a `Person` class with first and last name properties, a `PersonRepository` interface that can query for `Person` by last name and when the first name matches a like expression is shown below:
 
-The Repository interface is
+```java
+public interface PersonRepository extends CrudRepository<Person, Long> {
 
-        public interface Repository<T, ID extends Serializable> { 
+  List<Person> findByLastname(String lastname);
 
-          T save(T entity);
+  List<Person> findByFirstnameLike(String firstname);
+}
+```
 
-          List<T> save(Iterable<? extends T> entities);
+The queries issued on execution will be derived from the method name. Extending `CrudRepository` causes CRUD methods being pulled into the interface so that you can easily save and find single entities and collections of them.
 
-          T findById(ID id);
+You can have Spring automatically create a proxy for the interface by using the following JavaConfig:
 
-          boolean exists(ID id);
+```java
+@Configuration
+@EnableMongoRepositories
+class ApplicationConfig extends AbstractMongoConfiguration {
 
-          List<T> findAll();
+  @Override
+  public Mongo mongo() throws Exception {
+    return new MongoClient();
+  }
 
-          Long count();
+  @Override
+  protected String getDatabaseName() {
+    return "springdata";
+  }
+}
+```
 
-          void delete(T entity);
+This sets up a connection to a local MongoDB instance and enables the detection of Spring Data repositories (through `@EnableMongoRepositories`). The same configuration would look like this in XML:
 
-          void delete(Iterable<? extends T> entities);
+```xml
+<bean id="template" class="org.springframework.data.mongodb.core.MongoTemplate">
+  <constructor-arg>
+    <bean class="com.mongodb.MongoClient">
+       <constructor-arg value="localhost" />
+       <constructor-arg value="27017" />
+    </bean>
+  </constructor-arg>
+  <constructor-arg value="database" />
+</bean>
 
-          void deleteAll();
-        }
+<mongo:repositories base-package="com.acme.repository" />
+```
 
+This will find the repository interface and register a proxy object in the container. You can use it as shown below:
 
-The MongoRepository extends Repository and will in future add more Mongo specific methods.
+```java
+@Service
+public class MyService {
 
-    public interface MongoRepository<T, ID extends Serializable> extends
-        Repository<T, ID> {
-    }
+  private final PersonRepository repository;
 
-SimpleMongoRepository is the out of the box implementation of the MongoRepository you can use for basid CRUD operations.  
+  @Autowired
+  public MyService(PersonRepository repository) {
+    this.repository = repository;
+  }
 
-To go beyond basic CRUD, extend the MongoRepository interface and supply your own finder methods that follow simple naming conventions such that they can be easily converted into queries.  
+  public void doWork() {
 
-For example, given a Person class with first and last name properties, a PersonRepository interface that can query for Person by last name and when the first name matches a regular expression is shown below
+     repository.deleteAll();
 
-    public interface PersonRepository extends MongoRepository<Person, Long> {
+     Person person = new Person();
+     person.setFirstname("Oliver");
+     person.setLastname("Gierke");
+     person = repository.save(person);
 
-      List<Person> findByLastname(String lastname);
+     List<Person> lastNameResults = repository.findByLastname("Gierke");
+     List<Person> firstNameResults = repository.findByFirstnameLike("Oli*");
+ }
+}
+```
 
-      List<Person> findByFirstnameLike(String firstname);
-    }
-
-You can have Spring automatically generate the implemention as shown below
-
-        <bean id="template" class="org.springframework.data.document.mongodb.MongoTemplate">
-                <constructor-arg>
-                        <bean class="com.mongodb.Mongo">
-                                <constructor-arg value="localhost" />
-                                <constructor-arg value="27017" />
-                        </bean>
-                </constructor-arg>
-                <constructor-arg value="database" />
-                <property name="defaultCollectionName" value="springdata" />
-        </bean>
-
-        <bean class="org.springframework.data.document.mongodb.repository.MongoRepositoryFactoryBean">
-                <property name="template" ref="template" />
-                <property name="repositoryInterface" value="org.springframework.data.document.mongodb.repository.PersonRepository" />
-        </bean>
-
-This will register an object in the container named PersonRepository.  You can use it as shown below
-
-     @Service
-     public class MyService {
-
-        @Autowired
-        PersonRepository repository;
-
-
-        public void doWork() {
-
-           repository.deleteAll();
-
-           Person person = new Person();
-           person.setFirstname("Oliver");
-           person.setLastname("Gierke");
-           person = repository.save(person);
-
-           List<Person> lastNameResults = repository.findByLastname("Gierke");
-
-           List<Person> firstNameResults = repository.findByFirstnameLike("Oli*");
-
-       }
-    }
-
-
-## CouchDB
-
-TBD
-
-
-Contributing to Spring Data
----------------------------
+## Contributing to Spring Data
 
 Here are some ways for you to get involved in the community:
 
-* Get involved with the Spring community on the Spring Community Forums.  Please help out on the [forum](http://forum.springsource.org/forumdisplay.php?f=80) by responding to questions and joining the debate.
-* Create [JIRA](https://jira.springframework.org/browse/DATADOC) tickets for bugs and new features and comment and vote on the ones that you are interested in.  
+* Get involved with the Spring community on Stackoverflow and help out on the [spring-data-mongodb](http://stackoverflow.com/questions/tagged/spring-data-mongodb) tag by responding to questions and joining the debate.
+* Create [JIRA](https://jira.spring.io/browse/DATAMONGO) tickets for bugs and new features and comment and vote on the ones that you are interested in.  
 * Github is for social coding: if you want to write code, we encourage contributions through pull requests from [forks of this repository](http://help.github.com/forking/). If you want to contribute code this way, please reference a JIRA ticket as well covering the specific issue you are addressing.
-* Watch for upcoming articles on Spring by [subscribing](http://www.springsource.org/node/feed) to springframework.org
+* Watch for upcoming articles on Spring by [subscribing](http://spring.io/blog) to spring.io.
 
-Before we accept a non-trivial patch or pull request we will need you to sign the [contributor's agreement](https://support.springsource.com/spring_committer_signup).  Signing the contributor's agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do.  Active contributors might be asked to join the core team, and given the ability to merge pull requests.
+Before we accept a non-trivial patch or pull request we will need you to [sign the Contributor License Agreement](https://cla.pivotal.io/sign/spring). Signing the contributor’s agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do. If you forget to do so, you'll be reminded when you submit a pull request. Active contributors might be asked to join the core team, and given the ability to merge pull requests.

etc/formatting.xml

@@ -1,291 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<profiles version="12">
-<profile kind="CodeFormatterProfile" name="Spring Data" version="12">
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
-<setting id="org.eclipse.jdt.core.compiler.source" value="1.7"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.7"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.7"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
-</profile>
-</profiles>

lombok.config

@@ -0,0 +1,2 @@
+lombok.nonNull.exceptionType = IllegalArgumentException
+lombok.log.fieldName = LOG

pom.xml

@@ -1,291 +1,198 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.springframework.data</groupId>
-  <artifactId>spring-data-mongodb-dist</artifactId>
-  <name>Spring Data MongoDB Distribution</name>
-  <version>1.1.0.M2</version>
-  <packaging>pom</packaging>
-  <modules>
-    <module>spring-data-mongodb</module>
-    <module>spring-data-mongodb-cross-store</module>
-    <module>spring-data-mongodb-log4j</module>
-    <module>spring-data-mongodb-parent</module>
-  </modules>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-  <developers>
-    <developer>
-      <id>trisberg</id>
-      <name>Thomas Risberg</name>
-      <email>trisberg at vmware.com</email>
-      <organization>SpringSource</organization>
-      <organizationUrl>http://www.SpringSource.com</organizationUrl>
-      <roles>
-        <role>Project Admin</role>
-        <role>Developer</role>
-      </roles>
-      <timezone>-5</timezone>
-    </developer>
-    <developer>
-      <id>mpollack</id>
-      <name>Mark Pollack</name>
-      <email>mpollack at vmware.com</email>
-      <organization>SpringSource</organization>
-      <organizationUrl>http://www.SpringSource.com</organizationUrl>
-      <roles>
-        <role>Project Admin</role>
-        <role>Developer</role>
-      </roles>
-      <timezone>-5</timezone>
-    </developer>
-    <developer>
-      <id>ogierke</id>
-      <name>Oliver Gierke</name>
-      <email>ogierke at vmware.com</email>
-      <organization>SpringSource</organization>
-      <organizationUrl>http://www.springsource.com</organizationUrl>
-      <roles>
-        <role>Developer</role>
-      </roles>
-      <timezone>+1</timezone>
-    </developer>
-    <developer>
-      <id>jbrisbin</id>
-      <name>Jon Brisbin</name>
-      <email>jbrisbin at vmware.com</email>
-      <organization>SpringSource</organization>
-      <organizationUrl>http://www.springsource.com</organizationUrl>
-      <roles>
-        <role>Developer</role>
-      </roles>
-      <timezone>-6</timezone>
-    </developer>
-  </developers>
+	<modelVersion>4.0.0</modelVersion>
 
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-      <comments>
-        Copyright 2010 the original author or authors.
+	<groupId>org.springframework.data</groupId>
+	<artifactId>spring-data-mongodb-parent</artifactId>
+	<version>2.0.0.RC3</version>
+	<packaging>pom</packaging>
 
-        Licensed under the Apache License, Version 2.0 (the "License");
-        you may not use this file except in compliance with the License.
-        You may obtain a copy of the License at
+	<name>Spring Data MongoDB</name>
+	<description>MongoDB support for Spring Data</description>
+	<url>http://projects.spring.io/spring-data-mongodb</url>
 
-        http://www.apache.org/licenses/LICENSE-2.0
+	<parent>
+		<groupId>org.springframework.data.build</groupId>
+		<artifactId>spring-data-parent</artifactId>
+		<version>2.0.0.RC3</version>
+	</parent>
 
-        Unless required by applicable law or agreed to in writing, software
-        distributed under the License is distributed on an "AS IS" BASIS,
-        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-        implied.
-        See the License for the specific language governing permissions and
-        limitations under the License.
-      </comments>
-    </license>
-  </licenses>
+	<modules>
+		<module>spring-data-mongodb</module>
+		<module>spring-data-mongodb-cross-store</module>
+		<module>spring-data-mongodb-distribution</module>
+	</modules>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <!-- dist.* properties are used by the antrun tasks below -->
-    <dist.id>spring-data-mongo</dist.id>
-    <dist.name>Spring Data Mongo</dist.name>
-    <dist.key>SDMONGO</dist.key>
-    <dist.version>${project.version}</dist.version>
-    <dist.releaseType>snapshot</dist.releaseType>
-    <dist.finalName>${dist.id}-${dist.version}</dist.finalName>
-    <dist.fileName>${dist.finalName}.zip</dist.fileName>
-    <dist.filePath>target/${dist.fileName}</dist.filePath>
-    <dist.bucketName>dist.springframework.org</dist.bucketName>
-    <!-- these properties should be in ~/.m2/settings.xml
-      <dist.accessKey>s3 access key</dist.accessKey>
-      <dist.secretKey>s3 secret key</dist.secretKey>
-      -->
-  </properties>
+	<properties>
+		<project.type>multi</project.type>
+		<dist.id>spring-data-mongodb</dist.id>
+		<springdata.commons>2.0.0.RC3</springdata.commons>
+		<mongo>3.5.0</mongo>
+		<mongo.reactivestreams>1.6.0</mongo.reactivestreams>
+		<jmh.version>1.19</jmh.version>
+	</properties>
 
-  <build>
-    <extensions>
-      <extension>
-        <groupId>org.springframework.build.aws</groupId>
-        <artifactId>org.springframework.build.aws.maven</artifactId>
-        <version>3.1.0.RELEASE</version>
-      </extension>
-    </extensions>
+	<developers>
+		<developer>
+			<id>ogierke</id>
+			<name>Oliver Gierke</name>
+			<email>ogierke at gopivotal.com</email>
+			<organization>Pivotal</organization>
+			<organizationUrl>http://www.gopivotal.com</organizationUrl>
+			<roles>
+				<role>Project Lead</role>
+			</roles>
+			<timezone>+1</timezone>
+		</developer>
+		<developer>
+			<id>trisberg</id>
+			<name>Thomas Risberg</name>
+			<email>trisberg at vmware.com</email>
+			<organization>Pivotal</organization>
+			<organizationUrl>http://www.gopivotal.com</organizationUrl>
+			<roles>
+				<role>Developer</role>
+			</roles>
+			<timezone>-5</timezone>
+		</developer>
+		<developer>
+			<id>mpollack</id>
+			<name>Mark Pollack</name>
+			<email>mpollack at gopivotal.com</email>
+			<organization>Pivotal</organization>
+			<organizationUrl>http://www.gopivotal.com</organizationUrl>
+			<roles>
+				<role>Developer</role>
+			</roles>
+			<timezone>-5</timezone>
+		</developer>
+		<developer>
+			<id>jbrisbin</id>
+			<name>Jon Brisbin</name>
+			<email>jbrisbin at gopivotal.com</email>
+			<organization>Pivotal</organization>
+			<organizationUrl>http://www.gopivotal.com</organizationUrl>
+			<roles>
+				<role>Developer</role>
+			</roles>
+			<timezone>-6</timezone>
+		</developer>
+		<developer>
+			<id>tdarimont</id>
+			<name>Thomas Darimont</name>
+			<email>tdarimont at gopivotal.com</email>
+			<organization>Pivotal</organization>
+			<organizationUrl>http://www.gopivotal.com</organizationUrl>
+			<roles>
+				<role>Developer</role>
+			</roles>
+			<timezone>+1</timezone>
+		</developer>
+		<developer>
+			<id>cstrobl</id>
+			<name>Christoph Strobl</name>
+			<email>cstrobl at gopivotal.com</email>
+			<organization>Pivotal</organization>
+			<organizationUrl>http://www.gopivotal.com</organizationUrl>
+			<roles>
+				<role>Developer</role>
+			</roles>
+			<timezone>+1</timezone>
+		</developer>
+		<developer>
+			<id>mpaluch</id>
+			<name>Mark Paluch</name>
+			<email>mpaluch at pivotal.io</email>
+			<organization>Pivotal</organization>
+			<organizationUrl>http://www.pivotal.io</organizationUrl>
+			<roles>
+				<role>Developer</role>
+			</roles>
+			<timezone>+1</timezone>
+		</developer>
+	</developers>
 
-    <plugins>
-      <plugin>
-        <groupId>com.agilejava.docbkx</groupId>
-        <artifactId>docbkx-maven-plugin</artifactId>
-	<!-- yes it really needs to be this (2.0.7) otherwise pdf generation from a clean build doesn't work -->
-        <version>2.0.7</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>generate-html</goal>
-              <goal>generate-pdf</goal>
-            </goals>
-            <phase>pre-site</phase>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.docbook</groupId>
-            <artifactId>docbook-xml</artifactId>
-            <version>4.4</version>
-            <scope>runtime</scope>
-          </dependency>
-        </dependencies>
-        <configuration>
-          <includes>index.xml</includes>
-          <xincludeSupported>true</xincludeSupported>
-          <foCustomization>${project.basedir}/src/docbkx/resources/xsl/fopdf.xsl</foCustomization>
-          <htmlStylesheet>css/html.css</htmlStylesheet>
-          <chunkedOutput>false</chunkedOutput>
-          <htmlCustomization>${project.basedir}/src/docbkx/resources/xsl/html.xsl</htmlCustomization>
-          <useExtensions>1</useExtensions>
-          <highlightSource>1</highlightSource>
-          <highlightDefaultLanguage />
-          <!-- callouts -->
-          <entities>
-            <entity>
-              <name>version</name>
-              <value>${project.version}</value>
-            </entity>
-          </entities>
-          <postProcess>
-            <copy todir="${project.basedir}/target/site/reference">
-              <fileset dir="${project.basedir}/target/docbkx">
-                <include name="**/*.html" />
-                <include name="**/*.pdf" />
-              </fileset>
-            </copy>
-            <copy todir="${project.basedir}/target/site/reference/html">
-              <fileset dir="${project.basedir}/src/docbkx/resources">
-                <include name="**/*.css" />
-                <include name="**/*.png" />
-                <include name="**/*.gif" />
-                <include name="**/*.jpg" />
-              </fileset>
-            </copy>
-            <copy todir="${project.basedir}/target/site/reference/html">
-              <fileset dir="${project.basedir}/src/docbkx/resources/images">
-                <include name="*.png" />
-              </fileset>
-            </copy>
-            <move file="${project.basedir}/target/site/reference/pdf/index.pdf" tofile="${project.basedir}/target/site/reference/pdf/spring-data-mongo-reference.pdf" failonerror="false" />
-          </postProcess>
-        </configuration>
-      </plugin>
+	<profiles>
 
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.5</version>
-        <configuration>
-          <aggregate>true</aggregate>
-          <breakiterator>true</breakiterator>
-          <header>Spring Data Document</header>
-          <source>1.5</source>
-          <quiet>true</quiet>
-          <javadocDirectory>${project.basedir}/src/main/javadoc</javadocDirectory>
-          <overview>${project.basedir}/src/main/javadoc/overview.html</overview>
-          <stylesheetfile>${project.basedir}/src/main/javadoc/spring-javadoc.css</stylesheetfile>
-          <!-- copies doc-files subdirectory which contains image resources -->
-          <docfilessubdirs>true</docfilessubdirs>
-          <links>
-            <link>http://static.springframework.org/spring/docs/3.0.x/javadoc-api</link>
-            <link>http://download.oracle.com/javase/1.5.0/docs/api</link>
-            <link>http://api.mongodb.org/java/2.3</link>
-          </links>
-        </configuration>
-      </plugin>
-      <plugin><!--
-				run `mvn package assembly:assembly` to trigger assembly creation.
-				see http://www.sonatype.com/books/mvnref-book/reference/assemblies-set-dist-assemblies.html -->
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2-beta-5</version>
-        <inherited>false</inherited>
-        <executions>
-          <execution>
-            <id>distribution</id>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <descriptors>
-                <descriptor>${project.basedir}/src/assembly/distribution.xml</descriptor>
-              </descriptors>
-              <appendAssemblyId>false</appendAssemblyId>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.4</version>
-        <executions>
-          <execution>
-            <id>upload-dist</id>
-            <phase>deploy</phase>
-            <configuration>
-              <tasks>
-                <ant antfile="${basedir}/src/ant/upload-dist.xml">
-                  <target name="upload-dist" />
-                </ant>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.springframework.build</groupId>
-            <artifactId>org.springframework.build.aws.ant</artifactId>
-            <version>3.0.5.RELEASE</version>
-          </dependency>
-          <dependency>
-            <groupId>net.java.dev.jets3t</groupId>
-            <artifactId>jets3t</artifactId>
-            <version>0.7.2</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-    </plugins>
-    <!-- the name of this project is 'spring-data-mongo-dist';
-         make sure the zip file is just 'spring-data-mongo'. -->
-    <finalName>${dist.finalName}</finalName>
-  </build>
+		<!-- not-yet available profile>
 
-  <pluginRepositories>
-    <!-- Necessary for the build extension -->
-    <pluginRepository>
-      <id>spring-plugins-release</id>
-      <url>http://repo.springsource.org/plugins-release</url>
-    </pluginRepository>
-  </pluginRepositories>
+			<id>mongo35-next</id>
+			<properties>
+				<mongo>3.5.1-SNAPSHOT</mongo>
+			</properties>
 
-  <distributionManagement>
-    <!-- see 'staging' profile for dry-run deployment settings -->
-    <downloadUrl>http://www.springsource.com/spring-data</downloadUrl>
-    <site>
-      <id>static.springframework.org</id>
-      <url>
-        scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-mongodb/snapshot-site
-      </url>
-    </site>
-    <repository>
-      <id>spring-milestone</id>
-      <name>Spring Milestone Repository</name>
-      <url>s3://maven.springframework.org/milestone</url>
-    </repository>
-    <snapshotRepository>
-      <id>spring-snapshot</id>
-      <name>Spring Snapshot Repository</name>
-      <url>s3://maven.springframework.org/snapshot</url>
-    </snapshotRepository>
-  </distributionManagement>
+			<repositories>
+				<repository>
+					<id>mongo-snapshots</id>
+					<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+				</repository>
+			</repositories>
+
+		</profile -->
+
+		<profile>
+
+			<id>mongo36-next</id>
+			<properties>
+				<mongo>3.6.0-SNAPSHOT</mongo>
+			</properties>
+
+			<repositories>
+				<repository>
+					<id>mongo-snapshots</id>
+					<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+				</repository>
+			</repositories>
+
+		</profile>
+
+		<profile>
+			<id>release</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.jfrog.buildinfo</groupId>
+						<artifactId>artifactory-maven-plugin</artifactId>
+						<inherited>false</inherited>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+		<profile>
+			<id>benchmarks</id>
+			<modules>
+				<module>spring-data-mongodb</module>
+				<module>spring-data-mongodb-cross-store</module>
+				<module>spring-data-mongodb-distribution</module>
+				<module>spring-data-mongodb-benchmarks</module>
+			</modules>
+		</profile>
+
+	</profiles>
+
+	<dependencies>
+		<!-- MongoDB -->
+		<dependency>
+			<groupId>org.mongodb</groupId>
+			<artifactId>mongo-java-driver</artifactId>
+			<version>${mongo}</version>
+		</dependency>
+	</dependencies>
+
+	<repositories>
+		<repository>
+			<id>spring-libs-milestone</id>
+			<url>https://repo.spring.io/libs-milestone</url>
+		</repository>
+	</repositories>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>spring-plugins-release</id>
+			<url>https://repo.spring.io/plugins-release</url>
+		</pluginRepository>
+	</pluginRepositories>
 
 </project>

spring-data-mongodb-benchmarks/README.md

@@ -0,0 +1,76 @@
+# Benchmarks
+
+Benchmarks are based on [JMH](http://openjdk.java.net/projects/code-tools/jmh/).
+
+# Running Benchmarks
+
+Running benchmarks is disabled by default and can be activated via the `benchmarks` profile.
+To run the benchmarks with default settings use.
+
+```bash
+mvn -P benchmarks clean test
+```
+
+A basic report will be printed to the CLI.
+
+```bash
+# Run complete. Total time: 00:00:15
+
+Benchmark                                    Mode  Cnt        Score       Error  Units
+MappingMongoConverterBenchmark.readObject   thrpt   10  1920157,631 ± 64310,809  ops/s
+MappingMongoConverterBenchmark.writeObject  thrpt   10   782732,857 ± 53804,130  ops/s
+```
+
+## Running all Benchmarks of a specific class
+
+To run all Benchmarks of a specific class, just provide its simple class name via the `benchmark` command line argument.
+
+```bash
+mvn -P benchmarks clean test -D benchmark=MappingMongoConverterBenchmark
+```
+
+## Running a single Benchmark
+
+To run a single Benchmark provide its containing class simple name followed by `#` and the method name via the `benchmark` command line argument.
+
+```bash
+mvn -P benchmarks clean test -D benchmark=MappingMongoConverterBenchmark#readObjectWith2Properties
+```
+
+# Saving Benchmark Results
+
+A detailed benchmark report is stored in JSON format in the `/target/reports/performance` directory.
+To store the report in a different location use the `benchmarkReportDir` command line argument.
+
+## MongoDB
+
+Results can be directly piped to MongoDB by providing a valid [Connection String](https://docs.mongodb.com/manual/reference/connection-string/) via the `publishTo` command line argument.
+
+```bash
+mvn -P benchmarks clean test -D publishTo=mongodb://127.0.0.1:27017
+```
+
+NOTE: If the uri does not explicitly define a database the default `spring-data-mongodb-benchmarks` is used. 
+
+## HTTP Endpoint
+
+The benchmark report can also be posted as `application/json` to an HTTP Endpoint by providing a valid URl via the `publishTo` command line argument.
+
+```bash
+mvn -P benchmarks clean test -D publishTo=http://127.0.0.1:8080/capture-benchmarks
+```
+
+# Customizing Benchmarks
+
+Following options can be set via command line.
+
+Option | Default Value
+--- | ---
+warmupIterations | 10
+warmupTime | 1 (seconds)
+measurementIterations | 10
+measurementTime | 1 (seconds)
+forks | 1
+benchmarkReportDir | /target/reports/performance (always relative to project root dir)
+benchmark | .* (single benchmark via `classname#benchmark`)
+publishTo | \[not set\] (mongodb-uri or http-endpoint)

spring-data-mongodb-benchmarks/pom.xml

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.springframework.data</groupId>
+		<artifactId>spring-data-mongodb-parent</artifactId>
+		<version>2.0.0.RC3</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>spring-data-mongodb-benchmarks</artifactId>
+	<packaging>jar</packaging>
+
+	<name>Spring Data MongoDB - Microbenchmarks</name>
+
+	<properties>
+		<!-- Skip tests by default; run only if -DskipTests=false is specified or benchmarks profile is activated  -->
+		<skipTests>true</skipTests>
+	</properties>
+
+	<dependencies>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-data-mongodb</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit}</version>
+			<scope>compile</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.openjdk.jmh</groupId>
+			<artifactId>jmh-core</artifactId>
+			<version>${jmh.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.openjdk.jmh</groupId>
+			<artifactId>jmh-generator-annprocess</artifactId>
+			<version>${jmh.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+	</dependencies>
+
+	<profiles>
+
+		<profile>
+			<id>benchmarks</id>
+			<properties>
+				<skipTests>false</skipTests>
+			</properties>
+		</profile>
+	</profiles>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>pl.project13.maven</groupId>
+				<artifactId>git-commit-id-plugin</artifactId>
+				<version>2.2.2</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>revision</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>default-jar</id>
+						<phase>never</phase>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<testSourceDirectory>${project.build.sourceDirectory}</testSourceDirectory>
+					<testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
+					<excludes>
+						<exclude>**/AbstractMicrobenchmark.java</exclude>
+						<exclude>**/*$*.class</exclude>
+						<exclude>**/generated/*.class</exclude>
+					</excludes>
+					<includes>
+						<include>**/*Benchmark*</include>
+					</includes>
+					<systemPropertyVariables>
+						<benchmarkReportDir>${project.build.directory}/reports/performance</benchmarkReportDir>
+						<project.version>${project.version}</project.version>
+						<git.dirty>${git.dirty}</git.dirty>
+						<git.commit.id>${git.commit.id}</git.commit.id>
+						<git.branch>${git.branch}</git.branch>
+					</systemPropertyVariables>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>

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

@@ -0,0 +1,180 @@
+/*
+ * Copyright 2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import org.bson.Document;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.TearDown;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.ExecutableFindOperation.FindWithQuery;
+import org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingFind;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.query.BasicQuery;
+import org.springframework.data.mongodb.microbenchmark.AbstractMicrobenchmark;
+
+import com.mongodb.MongoClient;
+import com.mongodb.ServerAddress;
+import com.mongodb.client.MongoCollection;
+
+/**
+ * @author Christoph Strobl
+ */
+public class ProjectionsBenchmark extends AbstractMicrobenchmark {
+
+	private static final String DB_NAME = "projections-benchmark";
+	private static final String COLLECTION_NAME = "projections";
+
+	private MongoTemplate template;
+	private MongoClient client;
+	private MongoCollection<Document> mongoCollection;
+
+	private Person source;
+
+	private FindWithQuery<Person> asPerson;
+	private FindWithQuery<DtoProjection> asDtoProjection;
+	private FindWithQuery<ClosedProjection> asClosedProjection;
+	private FindWithQuery<OpenProjection> asOpenProjection;
+
+	private TerminatingFind<Person> asPersonWithFieldsRestriction;
+	private Document fields = new Document("firstname", 1);
+
+	@Setup
+	public void setUp() {
+
+		client = new MongoClient(new ServerAddress());
+		template = new MongoTemplate(client, DB_NAME);
+
+		source = new Person();
+		source.firstname = "luke";
+		source.lastname = "skywalker";
+
+		source.address = new Address();
+		source.address.street = "melenium falcon 1";
+		source.address.city = "deathstar";
+
+		template.save(source, COLLECTION_NAME);
+
+		asPerson = template.query(Person.class).inCollection(COLLECTION_NAME);
+		asDtoProjection = template.query(Person.class).inCollection(COLLECTION_NAME).as(DtoProjection.class);
+		asClosedProjection = template.query(Person.class).inCollection(COLLECTION_NAME).as(ClosedProjection.class);
+		asOpenProjection = template.query(Person.class).inCollection(COLLECTION_NAME).as(OpenProjection.class);
+
+		asPersonWithFieldsRestriction = template.query(Person.class).inCollection(COLLECTION_NAME)
+				.matching(new BasicQuery(new Document(), fields));
+
+		mongoCollection = client.getDatabase(DB_NAME).getCollection(COLLECTION_NAME);
+	}
+
+	@TearDown
+	public void tearDown() {
+
+		client.dropDatabase(DB_NAME);
+		client.close();
+	}
+
+	/**
+	 * Set the baseline for comparison by using the plain MongoDB java driver api without any additional fluff.
+	 *
+	 * @return
+	 */
+	@Benchmark // DATAMONGO-1733
+	public Object baseline() {
+		return mongoCollection.find().first();
+	}
+
+	/**
+	 * Read into the domain type including all fields.
+	 *
+	 * @return
+	 */
+	@Benchmark // DATAMONGO-1733
+	public Object readIntoDomainType() {
+		return asPerson.all();
+	}
+
+	/**
+	 * Read into the domain type but restrict query to only return one field.
+	 *
+	 * @return
+	 */
+	@Benchmark // DATAMONGO-1733
+	public Object readIntoDomainTypeRestrictingToOneField() {
+		return asPersonWithFieldsRestriction.all();
+	}
+
+	/**
+	 * Read into dto projection that only needs to map one field back.
+	 *
+	 * @return
+	 */
+	@Benchmark // DATAMONGO-1733
+	public Object readIntoDtoProjectionWithOneField() {
+		return asDtoProjection.all();
+	}
+
+	/**
+	 * Read into closed interface projection.
+	 *
+	 * @return
+	 */
+	@Benchmark // DATAMONGO-1733
+	public Object readIntoClosedProjectionWithOneField() {
+		return asClosedProjection.all();
+	}
+
+	/**
+	 * Read into an open projection backed by the mapped domain object.
+	 *
+	 * @return
+	 */
+	@Benchmark // DATAMONGO-1733
+	public Object readIntoOpenProjection() {
+		return asOpenProjection.all();
+	}
+
+	static class Person {
+
+		@Id String id;
+		String firstname;
+		String lastname;
+		Address address;
+	}
+
+	static class Address {
+
+		String city;
+		String street;
+	}
+
+	static class DtoProjection {
+
+		@Field("firstname") String name;
+	}
+
+	static interface ClosedProjection {
+
+		String getFirstname();
+	}
+
+	static interface OpenProjection {
+
+		@Value("#{target.firstname}")
+		String name();
+	}
+
+}

spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/core/convert/DbRefMappingBenchmark.java

@@ -0,0 +1,111 @@
+/*
+ * Copyright 2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.convert;
+
+import static org.springframework.data.mongodb.core.query.Criteria.*;
+import static org.springframework.data.mongodb.core.query.Query.*;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bson.types.ObjectId;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.TearDown;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.mapping.DBRef;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.microbenchmark.AbstractMicrobenchmark;
+
+import com.mongodb.MongoClient;
+import com.mongodb.ServerAddress;
+
+/**
+ * @author Christoph Strobl
+ */
+@State(Scope.Benchmark)
+public class DbRefMappingBenchmark extends AbstractMicrobenchmark {
+
+	private static final String DB_NAME = "dbref-loading-benchmark";
+
+	private MongoClient client;
+	private MongoTemplate template;
+
+	private Query queryObjectWithDBRef;
+	private Query queryObjectWithDBRefList;
+
+	@Setup
+	public void setUp() throws Exception {
+
+		client = new MongoClient(new ServerAddress());
+		template = new MongoTemplate(client, DB_NAME);
+
+		List<RefObject> refObjects = new ArrayList<>();
+		for (int i = 0; i < 1; i++) {
+			RefObject o = new RefObject();
+			template.save(o);
+			refObjects.add(o);
+		}
+
+		ObjectWithDBRef singleDBRef = new ObjectWithDBRef();
+		singleDBRef.ref = refObjects.iterator().next();
+		template.save(singleDBRef);
+
+		ObjectWithDBRef multipleDBRefs = new ObjectWithDBRef();
+		multipleDBRefs.refList = refObjects;
+		template.save(multipleDBRefs);
+
+		queryObjectWithDBRef = query(where("id").is(singleDBRef.id));
+		queryObjectWithDBRefList = query(where("id").is(multipleDBRefs.id));
+	}
+
+	@TearDown
+	public void tearDown() {
+
+		client.dropDatabase(DB_NAME);
+		client.close();
+	}
+
+	@Benchmark // DATAMONGO-1720
+	public ObjectWithDBRef readSingleDbRef() {
+		return template.findOne(queryObjectWithDBRef, ObjectWithDBRef.class);
+	}
+
+	@Benchmark // DATAMONGO-1720
+	public ObjectWithDBRef readMultipleDbRefs() {
+		return template.findOne(queryObjectWithDBRefList, ObjectWithDBRef.class);
+	}
+
+	@Data
+	static class ObjectWithDBRef {
+
+		private @Id ObjectId id;
+		private @DBRef RefObject ref;
+		private @DBRef List<RefObject> refList;
+	}
+
+	@Data
+	static class RefObject {
+
+		private @Id String id;
+		private String someValue;
+	}
+}

spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterBenchmark.java

@@ -0,0 +1,181 @@
+/*
+ * Copyright 2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.convert;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import org.bson.Document;
+import org.bson.types.ObjectId;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.TearDown;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.geo.Point;
+import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.microbenchmark.AbstractMicrobenchmark;
+
+import com.mongodb.MongoClient;
+import com.mongodb.ServerAddress;
+
+/**
+ * @author Christoph Strobl
+ */
+@State(Scope.Benchmark)
+public class MappingMongoConverterBenchmark extends AbstractMicrobenchmark {
+
+	private static final String DB_NAME = "mapping-mongo-converter-benchmark";
+
+	private MongoClient client;
+	private MongoMappingContext mappingContext;
+	private MappingMongoConverter converter;
+	private Document documentWith2Properties, documentWith2PropertiesAnd1Nested;
+	private Customer objectWith2PropertiesAnd1Nested;
+
+	private Document documentWithFlatAndComplexPropertiesPlusListAndMap;
+	private SlightlyMoreComplexObject objectWithFlatAndComplexPropertiesPlusListAndMap;
+
+	@Setup
+	public void setUp() throws Exception {
+
+		client = new MongoClient(new ServerAddress());
+
+		this.mappingContext = new MongoMappingContext();
+		this.mappingContext.setInitialEntitySet(Collections.singleton(Customer.class));
+		this.mappingContext.afterPropertiesSet();
+
+		DbRefResolver dbRefResolver = new DefaultDbRefResolver(new SimpleMongoDbFactory(client, DB_NAME));
+
+		this.converter = new MappingMongoConverter(dbRefResolver, mappingContext);
+		this.converter.setCustomConversions(new MongoCustomConversions(Collections.emptyList()));
+		this.converter.afterPropertiesSet();
+
+		// just a flat document
+		this.documentWith2Properties = new Document("firstname", "Dave").append("lastname", "Matthews");
+
+		// document with a nested one
+		Document address = new Document("zipCode", "ABCDE").append("city", "Some Place");
+		this.documentWith2PropertiesAnd1Nested = new Document("firstname", "Dave").//
+				append("lastname", "Matthews").//
+				append("address", address);
+
+		// object equivalent of documentWith2PropertiesAnd1Nested
+		this.objectWith2PropertiesAnd1Nested = new Customer("Dave", "Matthews", new Address("zipCode", "City"));
+
+		// a bit more challenging object with list & map conversion.
+		objectWithFlatAndComplexPropertiesPlusListAndMap = new SlightlyMoreComplexObject();
+		objectWithFlatAndComplexPropertiesPlusListAndMap.id = UUID.randomUUID().toString();
+		objectWithFlatAndComplexPropertiesPlusListAndMap.addressList = Arrays.asList(new Address("zip-1", "city-1"),
+				new Address("zip-2", "city-2"));
+		objectWithFlatAndComplexPropertiesPlusListAndMap.customer = objectWith2PropertiesAnd1Nested;
+		objectWithFlatAndComplexPropertiesPlusListAndMap.customerMap = new LinkedHashMap<>();
+		objectWithFlatAndComplexPropertiesPlusListAndMap.customerMap.put("dave", objectWith2PropertiesAnd1Nested);
+		objectWithFlatAndComplexPropertiesPlusListAndMap.customerMap.put("deborah",
+				new Customer("Deborah Anne", "Dyer", new Address("?", "london")));
+		objectWithFlatAndComplexPropertiesPlusListAndMap.customerMap.put("eddie",
+				new Customer("Eddie", "Vedder", new Address("??", "Seattle")));
+		objectWithFlatAndComplexPropertiesPlusListAndMap.intOne = Integer.MIN_VALUE;
+		objectWithFlatAndComplexPropertiesPlusListAndMap.intTwo = Integer.MAX_VALUE;
+		objectWithFlatAndComplexPropertiesPlusListAndMap.location = new Point(-33.865143, 151.209900);
+		objectWithFlatAndComplexPropertiesPlusListAndMap.renamedField = "supercalifragilisticexpialidocious";
+		objectWithFlatAndComplexPropertiesPlusListAndMap.stringOne = "¯\\_(ツ)_/¯";
+		objectWithFlatAndComplexPropertiesPlusListAndMap.stringTwo = " (╯°□°）╯︵ ┻━┻";
+
+		// JSON equivalent of objectWithFlatAndComplexPropertiesPlusListAndMap
+		documentWithFlatAndComplexPropertiesPlusListAndMap = Document.parse(
+				"{ \"_id\" : \"517f6aee-e9e0-44f0-88ed-f3694a019f27\", \"intOne\" : -2147483648, \"intTwo\" : 2147483647, \"stringOne\" : \"¯\\\\_(ツ)_/¯\", \"stringTwo\" : \" (╯°□°）╯︵ ┻━┻\", \"explicit-field-name\" : \"supercalifragilisticexpialidocious\", \"location\" : { \"x\" : -33.865143, \"y\" : 151.2099 }, \"objectWith2PropertiesAnd1Nested\" : { \"firstname\" : \"Dave\", \"lastname\" : \"Matthews\", \"address\" : { \"zipCode\" : \"zipCode\", \"city\" : \"City\" } }, \"addressList\" : [{ \"zipCode\" : \"zip-1\", \"city\" : \"city-1\" }, { \"zipCode\" : \"zip-2\", \"city\" : \"city-2\" }], \"customerMap\" : { \"dave\" : { \"firstname\" : \"Dave\", \"lastname\" : \"Matthews\", \"address\" : { \"zipCode\" : \"zipCode\", \"city\" : \"City\" } }, \"deborah\" : { \"firstname\" : \"Deborah Anne\", \"lastname\" : \"Dyer\", \"address\" : { \"zipCode\" : \"?\", \"city\" : \"london\" } }, \"eddie\" : { \"firstname\" : \"Eddie\", \"lastname\" : \"Vedder\", \"address\" : { \"zipCode\" : \"??\", \"city\" : \"Seattle\" } } }, \"_class\" : \"org.springframework.data.mongodb.core.convert.MappingMongoConverterBenchmark$SlightlyMoreComplexObject\" }");
+
+	}
+
+	@TearDown
+	public void tearDown() {
+
+		client.dropDatabase(DB_NAME);
+		client.close();
+	}
+
+	@Benchmark // DATAMONGO-1720
+	public Customer readObjectWith2Properties() {
+		return converter.read(Customer.class, documentWith2Properties);
+	}
+
+	@Benchmark // DATAMONGO-1720
+	public Customer readObjectWith2PropertiesAnd1NestedObject() {
+		return converter.read(Customer.class, documentWith2PropertiesAnd1Nested);
+	}
+
+	@Benchmark // DATAMONGO-1720
+	public Document writeObjectWith2PropertiesAnd1NestedObject() {
+
+		Document sink = new Document();
+		converter.write(objectWith2PropertiesAnd1Nested, sink);
+		return sink;
+	}
+
+	@Benchmark // DATAMONGO-1720
+	public Object readObjectWithListAndMapsOfComplexType() {
+		return converter.read(SlightlyMoreComplexObject.class, documentWithFlatAndComplexPropertiesPlusListAndMap);
+	}
+
+	@Benchmark // DATAMONGO-1720
+	public Object writeObjectWithListAndMapsOfComplexType() {
+
+		Document sink = new Document();
+		converter.write(objectWithFlatAndComplexPropertiesPlusListAndMap, sink);
+		return sink;
+	}
+
+	@Getter
+	@RequiredArgsConstructor
+	static class Customer {
+
+		private @Id ObjectId id;
+		private final String firstname, lastname;
+		private final Address address;
+	}
+
+	@Getter
+	@AllArgsConstructor
+	static class Address {
+		private String zipCode, city;
+	}
+
+	@Data
+	static class SlightlyMoreComplexObject {
+
+		@Id String id;
+		int intOne, intTwo;
+		String stringOne, stringTwo;
+		@Field("explicit-field-name") String renamedField;
+		Point location;
+		Customer customer;
+		List<Address> addressList;
+		Map<String, Customer> customerMap;
+	}
+}

spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/microbenchmark/AbstractMicrobenchmark.java

@@ -0,0 +1,328 @@
+/*
+ * Copyright 2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.microbenchmark;
+
+import java.io.File;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Collection;
+import java.util.Date;
+
+import org.junit.Test;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.results.RunResult;
+import org.openjdk.jmh.results.format.ResultFormatType;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.options.ChainedOptionsBuilder;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+import org.openjdk.jmh.runner.options.TimeValue;
+import org.springframework.core.env.StandardEnvironment;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ResourceUtils;
+import org.springframework.util.StringUtils;
+
+/**
+ * @author Christoph Strobl
+ */
+@Warmup(iterations = AbstractMicrobenchmark.WARMUP_ITERATIONS)
+@Measurement(iterations = AbstractMicrobenchmark.MEASUREMENT_ITERATIONS)
+@Fork(AbstractMicrobenchmark.FORKS)
+@State(Scope.Thread)
+public class AbstractMicrobenchmark {
+
+	static final int WARMUP_ITERATIONS = 5;
+	static final int MEASUREMENT_ITERATIONS = 10;
+	static final int FORKS = 1;
+	static final String[] JVM_ARGS = { "-server", "-XX:+HeapDumpOnOutOfMemoryError", "-Xms1024m", "-Xmx1024m",
+			"-XX:MaxDirectMemorySize=1024m" };
+
+	private final StandardEnvironment environment = new StandardEnvironment();
+
+	/**
+	 * Run matching {@link org.openjdk.jmh.annotations.Benchmark} methods with options collected from
+	 * {@link org.springframework.core.env.Environment}.
+	 *
+	 * @throws Exception
+	 * @see #options(String)
+	 */
+	@Test
+	public void run() throws Exception {
+
+		String includes = includes();
+
+		if (!includes.contains(org.springframework.util.ClassUtils.getShortName(getClass()))) {
+			return;
+		}
+
+		publishResults(new Runner(options(includes).build()).run());
+	}
+
+	/**
+	 * Get the regex for all benchmarks to be included in the run. By default every benchmark within classes matching the
+	 * current ones short name. <br />
+	 * The {@literal benchmark} command line argument allows overriding the defaults using {@code #} as class / method
+	 * name separator.
+	 *
+	 * @return never {@literal null}.
+	 * @see org.springframework.util.ClassUtils#getShortName(Class)
+	 */
+	protected String includes() {
+
+		String tests = environment.getProperty("benchmark", String.class);
+
+		if (!StringUtils.hasText(tests)) {
+			return ".*" + org.springframework.util.ClassUtils.getShortName(getClass()) + ".*";
+		}
+
+		if (!tests.contains("#")) {
+			return ".*" + tests + ".*";
+		}
+
+		String[] args = tests.split("#");
+		return ".*" + args[0] + "." + args[1];
+	}
+
+	/**
+	 * Collect all options for the {@link Runner}.
+	 *
+	 * @param includes regex for matching benchmarks to be included in the run.
+	 * @return never {@literal null}.
+	 * @throws Exception
+	 */
+	protected ChainedOptionsBuilder options(String includes) throws Exception {
+
+		ChainedOptionsBuilder optionsBuilder = new OptionsBuilder().include(includes).jvmArgs(jvmArgs());
+
+		optionsBuilder = warmup(optionsBuilder);
+		optionsBuilder = measure(optionsBuilder);
+		optionsBuilder = forks(optionsBuilder);
+		optionsBuilder = report(optionsBuilder);
+
+		return optionsBuilder;
+	}
+
+	/**
+	 * JVM args to apply to {@link Runner} via its {@link org.openjdk.jmh.runner.options.Options}.
+	 *
+	 * @return {@link #JVM_ARGS} by default.
+	 */
+	protected String[] jvmArgs() {
+
+		String[] args = new String[JVM_ARGS.length];
+		System.arraycopy(JVM_ARGS, 0, args, 0, JVM_ARGS.length);
+		return args;
+	}
+
+	/**
+	 * Read {@code warmupIterations} property from {@link org.springframework.core.env.Environment}.
+	 *
+	 * @return -1 if not set.
+	 */
+	protected int getWarmupIterations() {
+		return environment.getProperty("warmupIterations", Integer.class, -1);
+	}
+
+	/**
+	 * Read {@code measurementIterations} property from {@link org.springframework.core.env.Environment}.
+	 *
+	 * @return -1 if not set.
+	 */
+	protected int getMeasurementIterations() {
+		return environment.getProperty("measurementIterations", Integer.class, -1);
+
+	}
+
+	/**
+	 * Read {@code forks} property from {@link org.springframework.core.env.Environment}.
+	 *
+	 * @return -1 if not set.
+	 */
+	protected int getForksCount() {
+		return environment.getProperty("forks", Integer.class, -1);
+	}
+
+	/**
+	 * Read {@code benchmarkReportDir} property from {@link org.springframework.core.env.Environment}.
+	 *
+	 * @return {@literal null} if not set.
+	 */
+	protected String getReportDirectory() {
+		return environment.getProperty("benchmarkReportDir");
+	}
+
+	/**
+	 * Read {@code measurementTime} property from {@link org.springframework.core.env.Environment}.
+	 *
+	 * @return -1 if not set.
+	 */
+	protected long getMeasurementTime() {
+		return environment.getProperty("measurementTime", Long.class, -1L);
+	}
+
+	/**
+	 * Read {@code warmupTime} property from {@link org.springframework.core.env.Environment}.
+	 *
+	 * @return -1 if not set.
+	 */
+	protected long getWarmupTime() {
+		return environment.getProperty("warmupTime", Long.class, -1L);
+	}
+
+	/**
+	 * {@code project.version_yyyy-MM-dd_ClassName.json} eg.
+	 * {@literal 1.11.0.BUILD-SNAPSHOT_2017-03-07_MappingMongoConverterBenchmark.json}
+	 *
+	 * @return
+	 */
+	protected String reportFilename() {
+
+		StringBuilder sb = new StringBuilder();
+
+		if (environment.containsProperty("project.version")) {
+
+			sb.append(environment.getProperty("project.version"));
+			sb.append("_");
+		}
+
+		sb.append(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
+		sb.append("_");
+		sb.append(org.springframework.util.ClassUtils.getShortName(getClass()));
+		sb.append(".json");
+		return sb.toString();
+	}
+
+	/**
+	 * Apply measurement options to {@link ChainedOptionsBuilder}.
+	 *
+	 * @param optionsBuilder must not be {@literal null}.
+	 * @return {@link ChainedOptionsBuilder} with options applied.
+	 * @see #getMeasurementIterations()
+	 * @see #getMeasurementTime()
+	 */
+	private ChainedOptionsBuilder measure(ChainedOptionsBuilder optionsBuilder) {
+
+		int measurementIterations = getMeasurementIterations();
+		long measurementTime = getMeasurementTime();
+
+		if (measurementIterations > 0) {
+			optionsBuilder = optionsBuilder.measurementIterations(measurementIterations);
+		}
+
+		if (measurementTime > 0) {
+			optionsBuilder = optionsBuilder.measurementTime(TimeValue.seconds(measurementTime));
+		}
+
+		return optionsBuilder;
+	}
+
+	/**
+	 * Apply warmup options to {@link ChainedOptionsBuilder}.
+	 *
+	 * @param optionsBuilder must not be {@literal null}.
+	 * @return {@link ChainedOptionsBuilder} with options applied.
+	 * @see #getWarmupIterations()
+	 * @see #getWarmupTime()
+	 */
+	private ChainedOptionsBuilder warmup(ChainedOptionsBuilder optionsBuilder) {
+
+		int warmupIterations = getWarmupIterations();
+		long warmupTime = getWarmupTime();
+
+		if (warmupIterations > 0) {
+			optionsBuilder = optionsBuilder.warmupIterations(warmupIterations);
+		}
+
+		if (warmupTime > 0) {
+			optionsBuilder = optionsBuilder.warmupTime(TimeValue.seconds(warmupTime));
+		}
+
+		return optionsBuilder;
+	}
+
+	/**
+	 * Apply forks option to {@link ChainedOptionsBuilder}.
+	 *
+	 * @param optionsBuilder must not be {@literal null}.
+	 * @return {@link ChainedOptionsBuilder} with options applied.
+	 * @see #getForksCount()
+	 */
+	private ChainedOptionsBuilder forks(ChainedOptionsBuilder optionsBuilder) {
+
+		int forks = getForksCount();
+
+		if (forks <= 0) {
+			return optionsBuilder;
+		}
+
+		return optionsBuilder.forks(forks);
+	}
+
+	/**
+	 * Apply report option to {@link ChainedOptionsBuilder}.
+	 *
+	 * @param optionsBuilder must not be {@literal null}.
+	 * @return {@link ChainedOptionsBuilder} with options applied.
+	 * @throws IOException if report file cannot be created.
+	 * @see #getReportDirectory()
+	 */
+	private ChainedOptionsBuilder report(ChainedOptionsBuilder optionsBuilder) throws IOException {
+
+		String reportDir = getReportDirectory();
+
+		if (!StringUtils.hasText(reportDir)) {
+			return optionsBuilder;
+		}
+
+		String reportFilePath = reportDir + (reportDir.endsWith(File.separator) ? "" : File.separator) + reportFilename();
+		File file = ResourceUtils.getFile(reportFilePath);
+
+		if (file.exists()) {
+			file.delete();
+		} else {
+
+			file.getParentFile().mkdirs();
+			file.createNewFile();
+		}
+
+		optionsBuilder.resultFormat(ResultFormatType.JSON);
+		optionsBuilder.result(reportFilePath);
+
+		return optionsBuilder;
+	}
+
+	/**
+	 * Publish results to an external system.
+	 *
+	 * @param results must not be {@literal null}.
+	 */
+	private void publishResults(Collection<RunResult> results) {
+
+		if (CollectionUtils.isEmpty(results) || !environment.containsProperty("publishTo")) {
+			return;
+		}
+
+		String uri = environment.getProperty("publishTo");
+		try {
+			ResultsWriter.forUri(uri).write(results);
+		} catch (Exception e) {
+			System.err.println(String.format("Cannot save benchmark results to '%s'. Error was %s.", uri, e));
+		}
+	}
+}

spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/microbenchmark/HttpResultsWriter.java

@@ -0,0 +1,81 @@
+/*
+ * Copyright 2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.microbenchmark;
+
+import lombok.SneakyThrows;
+
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.util.Collection;
+
+import org.openjdk.jmh.results.RunResult;
+import org.springframework.core.env.StandardEnvironment;
+import org.springframework.util.CollectionUtils;
+
+/**
+ * {@link ResultsWriter} implementation of {@link URLConnection}.
+ *
+ * @since 2.0
+ */
+class HttpResultsWriter implements ResultsWriter {
+
+	private final String url;
+
+	HttpResultsWriter(String url) {
+		this.url = url;
+	}
+
+	@Override
+	@SneakyThrows
+	public void write(Collection<RunResult> results) {
+
+		if (CollectionUtils.isEmpty(results)) {
+			return;
+		}
+
+		StandardEnvironment env = new StandardEnvironment();
+
+		String projectVersion = env.getProperty("project.version", "unknown");
+		String gitBranch = env.getProperty("git.branch", "unknown");
+		String gitDirty = env.getProperty("git.dirty", "no");
+		String gitCommitId = env.getProperty("git.commit.id", "unknown");
+
+		HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
+		connection.setConnectTimeout((int) Duration.ofSeconds(1).toMillis());
+		connection.setReadTimeout((int) Duration.ofSeconds(1).toMillis());
+		connection.setDoOutput(true);
+		connection.setRequestMethod("POST");
+
+		connection.setRequestProperty("Content-Type", "application/json");
+		connection.addRequestProperty("X-Project-Version", projectVersion);
+		connection.addRequestProperty("X-Git-Branch", gitBranch);
+		connection.addRequestProperty("X-Git-Dirty", gitDirty);
+		connection.addRequestProperty("X-Git-Commit-Id", gitCommitId);
+
+		try (OutputStream output = connection.getOutputStream()) {
+			output.write(ResultsWriter.jsonifyResults(results).getBytes(StandardCharsets.UTF_8));
+		}
+
+		if (connection.getResponseCode() >= 400) {
+			throw new IllegalStateException(
+					String.format("Status %d %s", connection.getResponseCode(), connection.getResponseMessage()));
+		}
+	}
+}

spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/microbenchmark/MongoResultsWriter.java

@@ -0,0 +1,131 @@
+/*
+ * Copyright 2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.microbenchmark;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+import org.bson.Document;
+import org.openjdk.jmh.results.RunResult;
+import org.springframework.core.env.StandardEnvironment;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+import com.mongodb.BasicDBObject;
+import com.mongodb.MongoClient;
+import com.mongodb.MongoClientURI;
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.util.JSON;
+
+/**
+ * MongoDB specific {@link ResultsWriter} implementation.
+ *
+ * @author Christoph Strobl
+ * @since 2.0
+ */
+class MongoResultsWriter implements ResultsWriter {
+
+	private final String uri;
+
+	MongoResultsWriter(String uri) {
+		this.uri = uri;
+	}
+
+	@Override
+	public void write(Collection<RunResult> results) {
+
+		Date now = new Date();
+		StandardEnvironment env = new StandardEnvironment();
+
+		String projectVersion = env.getProperty("project.version", "unknown");
+		String gitBranch = env.getProperty("git.branch", "unknown");
+		String gitDirty = env.getProperty("git.dirty", "no");
+		String gitCommitId = env.getProperty("git.commit.id", "unknown");
+
+		MongoClientURI uri = new MongoClientURI(this.uri);
+		MongoClient client = new MongoClient(uri);
+
+		String dbName = StringUtils.hasText(uri.getDatabase()) ? uri.getDatabase() : "spring-data-mongodb-benchmarks";
+		MongoDatabase db = client.getDatabase(dbName);
+
+		for (BasicDBObject dbo : (List<BasicDBObject>) JSON.parse(ResultsWriter.jsonifyResults(results))) {
+
+			String collectionName = extractClass(dbo.get("benchmark").toString());
+
+			Document sink = new Document();
+			sink.append("_version", projectVersion);
+			sink.append("_branch", gitBranch);
+			sink.append("_commit", gitCommitId);
+			sink.append("_dirty", gitDirty);
+			sink.append("_method", extractBenchmarkName(dbo.get("benchmark").toString()));
+			sink.append("_date", now);
+			sink.append("_snapshot", projectVersion.toLowerCase().contains("snapshot"));
+
+			sink.putAll(dbo);
+
+			db.getCollection(collectionName).insertOne(fixDocumentKeys(sink));
+		}
+
+		client.close();
+	}
+
+	/**
+	 * Replace {@code .} by {@code ,}.
+	 *
+	 * @param doc
+	 * @return
+	 */
+	private Document fixDocumentKeys(Document doc) {
+
+		Document sanitized = new Document();
+
+		for (Object key : doc.keySet()) {
+
+			Object value = doc.get(key);
+			if (value instanceof Document) {
+				value = fixDocumentKeys((Document) value);
+			} else if (value instanceof BasicDBObject) {
+				value = fixDocumentKeys(new Document((BasicDBObject) value));
+			}
+
+			if (key instanceof String) {
+
+				String newKey = (String) key;
+				if (newKey.contains(".")) {
+					newKey = newKey.replace('.', ',');
+				}
+
+				sanitized.put(newKey, value);
+			} else {
+				sanitized.put(ObjectUtils.nullSafeToString(key).replace('.', ','), value);
+			}
+		}
+
+		return sanitized;
+	}
+
+	private static String extractClass(String source) {
+
+		String tmp = source.substring(0, source.lastIndexOf('.'));
+		return tmp.substring(tmp.lastIndexOf(".") + 1);
+	}
+
+	private static String extractBenchmarkName(String source) {
+		return source.substring(source.lastIndexOf(".") + 1);
+	}
+
+}

spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/microbenchmark/ResultsWriter.java

@@ -0,0 +1,67 @@
+/*
+ * Copyright 2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.microbenchmark;
+
+import lombok.SneakyThrows;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
+
+import org.openjdk.jmh.results.RunResult;
+import org.openjdk.jmh.results.format.ResultFormatFactory;
+import org.openjdk.jmh.results.format.ResultFormatType;
+
+/**
+ * @author Christoph Strobl
+ * @since 2.0
+ */
+interface ResultsWriter {
+
+	/**
+	 * Write the {@link RunResult}s.
+	 *
+	 * @param results can be {@literal null}.
+	 */
+	void write(Collection<RunResult> results);
+
+	/**
+	 * Get the uri specific {@link ResultsWriter}.
+	 *
+	 * @param uri must not be {@literal null}.
+	 * @return
+	 */
+	static ResultsWriter forUri(String uri) {
+		return uri.startsWith("mongodb:") ? new MongoResultsWriter(uri) : new HttpResultsWriter(uri);
+	}
+
+	/**
+	 * Convert {@link RunResult}s to JMH Json representation.
+	 *
+	 * @param results
+	 * @return json string representation of results.
+	 * @see org.openjdk.jmh.results.format.JSONResultFormat
+	 */
+	@SneakyThrows
+	static String jsonifyResults(Collection<RunResult> results) {
+
+		ByteArrayOutputStream baos = new ByteArrayOutputStream();
+		ResultFormatFactory.getInstance(ResultFormatType.JSON, new PrintStream(baos, true, "UTF-8")).writeOut(results);
+
+		return new String(baos.toByteArray(), StandardCharsets.UTF_8);
+	}
+}

spring-data-mongodb-benchmarks/src/main/resources/logback.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d %5p %40.40c:%4L - %m%n</pattern>
+		</encoder>
+	</appender>
+
+	<root level="error">
+		<appender-ref ref="console" />
+	</root>
+
+</configuration>

spring-data-mongodb-cross-store/aop.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aspectj>
+    <aspects>
+        <aspect name="org.springframework.beans.factory.aspectj.AnnotationBeanConfigurerAspect" />
+        <aspect name="org.springframework.data.mongodb.crossstore.MongoDocumentBacking" />
+    </aspects>
+</aspectj>

spring-data-mongodb-cross-store/pom.xml

@@ -1,139 +1,146 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.springframework.data</groupId>
-    <artifactId>spring-data-mongodb-parent</artifactId>
-    <version>1.1.0.M2</version>
-    <relativePath>../spring-data-mongodb-parent/pom.xml</relativePath>
-  </parent>
-  <artifactId>spring-data-mongodb-cross-store</artifactId>
-  <name>Spring Data MongoDB Cross-store Persistence Support</name>
-  <dependencies>
 
-    <!--  Spring -->
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-beans</artifactId>
-      <version>${org.springframework.version.range}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-tx</artifactId>
-      <version>${org.springframework.version.range}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-aspects</artifactId>
-      <version>${org.springframework.version.range}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-orm</artifactId>
-      <version>${org.springframework.version.range}</version>
-    </dependency>
+	<modelVersion>4.0.0</modelVersion>
 
-    <!--  Spring Data -->
-    <dependency>
-      <groupId>org.springframework.data</groupId>
-      <artifactId>spring-data-commons-core</artifactId>
-      <version>${data.commons.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.data</groupId>
-      <artifactId>spring-data-mongodb</artifactId>
-      <version>1.1.0.M2</version>
-    </dependency>
+	<parent>
+		<groupId>org.springframework.data</groupId>
+		<artifactId>spring-data-mongodb-parent</artifactId>
+		<version>2.0.0.RC3</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
 
-    <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>aspectjrt</artifactId>
-      <version>${aspectj.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>cglib</groupId>
-      <artifactId>cglib</artifactId>
-      <version>2.2</version>
-    </dependency>
+	<artifactId>spring-data-mongodb-cross-store</artifactId>
+	<name>Spring Data MongoDB - Cross-Store Support</name>
 
-    <!-- JPA -->
-    <dependency>
-      <groupId>org.hibernate.javax.persistence</groupId>
-      <artifactId>hibernate-jpa-2.0-api</artifactId>
-      <version>1.0.0.Final</version>
-    </dependency>
+	<properties>
+		<jpa>2.1.1</jpa>
+		<hibernate>5.2.1.Final</hibernate>
+	</properties>
 
-  <!-- For Tests -->
-    <dependency>
-        <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-entitymanager</artifactId>
-        <version>3.5.5-Final</version>
-        <scope>test</scope>
-    </dependency>
-    <dependency>
-        <groupId>hsqldb</groupId>
-        <artifactId>hsqldb</artifactId>
-        <version>1.8.0.10</version>
-        <scope>test</scope>
-    </dependency>
-    <dependency>
-        <groupId>javax.validation</groupId>
-        <artifactId>validation-api</artifactId>
-        <version>1.0.0.GA</version>
-        <scope>test</scope>
-    </dependency>
-    <dependency>
-        <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-validator</artifactId>
-        <version>4.0.2.GA</version>
-        <scope>test</scope>
-    </dependency>
+	<dependencies>
 
-  </dependencies>
+		<!-- Spring -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-beans</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-tx</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-aspects</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-orm</artifactId>
+		</dependency>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>aspectj-maven-plugin</artifactId>
-        <version>1.2</version>
-        <dependencies>
-          <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjrt</artifactId>
-            <version>${aspectj.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjtools</artifactId>
-            <version>${aspectj.version}</version>
-          </dependency>
-        </dependencies>
-        <executions>
-          <execution>
-            <goals>
-              <goal>compile</goal>
-              <goal>test-compile</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <outxml>true</outxml>
-          <aspectLibraries>
-            <aspectLibrary>
-              <groupId>org.springframework</groupId>
-              <artifactId>spring-aspects</artifactId>
-            </aspectLibrary>
-            <!-- <aspectLibrary>
-              <groupId>org.springframework.data</groupId>
-              <artifactId>spring-data-commons-aspects</artifactId>
-            </aspectLibrary> -->
-          </aspectLibraries>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+		<!-- Spring Data -->
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-mongodb</artifactId>
+			<version>2.0.0.RC3</version>
+		</dependency>
+
+		<!-- reactive -->
+		<dependency>
+		 	<groupId>io.projectreactor</groupId>
+			<artifactId>reactor-core</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjrt</artifactId>
+			<version>${aspectj}</version>
+		</dependency>
+
+		<!-- JPA -->
+		<dependency>
+			<groupId>org.eclipse.persistence</groupId>
+			<artifactId>javax.persistence</artifactId>
+			<version>${jpa}</version>
+			<optional>true</optional>
+		</dependency>
+
+		<!-- For Tests -->
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-entitymanager</artifactId>
+			<version>${hibernate}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+			<version>1.8.0.10</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
+			<version>${validation}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>5.2.4.Final</version>
+			<scope>test</scope>
+		</dependency>
+
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>aspectj-maven-plugin</artifactId>
+				<version>1.6</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.aspectj</groupId>
+						<artifactId>aspectjrt</artifactId>
+						<version>${aspectj}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.aspectj</groupId>
+						<artifactId>aspectjtools</artifactId>
+						<version>${aspectj}</version>
+					</dependency>
+				</dependencies>
+				<executions>
+					<execution>
+						<goals>
+							<goal>compile</goal>
+							<goal>test-compile</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<outxml>true</outxml>
+					<aspectLibraries>
+						<aspectLibrary>
+							<groupId>org.springframework</groupId>
+							<artifactId>spring-aspects</artifactId>
+						</aspectLibrary>
+					</aspectLibraries>
+					<complianceLevel>${source.level}</complianceLevel>
+					<source>${source.level}</source>
+					<target>${source.level}</target>
+					<xmlConfigured>aop.xml</xmlConfigured>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 
 </project>

spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/DocumentBacked.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2017 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.
@@ -17,6 +17,12 @@ package org.springframework.data.mongodb.crossstore;
 
 import org.springframework.data.crossstore.ChangeSetBacked;
 
+/**
+ * @author Thomas Risberg
+ * @author Oliver Gierke
+ * @deprecated will be removed without replacement.
+ */
+@Deprecated
 public interface DocumentBacked extends ChangeSetBacked {
 
 }

spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoChangeSetPersister.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2017 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.
@@ -17,8 +17,9 @@ package org.springframework.data.mongodb.crossstore;
 
 import javax.persistence.EntityManagerFactory;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.bson.Document;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.dao.DataIntegrityViolationException;
@@ -29,25 +30,29 @@ import org.springframework.data.mongodb.core.CollectionCallback;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.util.ClassUtils;
 
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBCollection;
-import com.mongodb.DBObject;
 import com.mongodb.MongoException;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.model.Filters;
+import com.mongodb.client.result.DeleteResult;
 
+/**
+ * @author Thomas Risberg
+ * @author Oliver Gierke
+ * @author Alex Vengrovsk
+ * @author Mark Paluch
+ * @deprecated will be removed without replacement.
+ */
+@Deprecated
 public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 
 	private static final String ENTITY_CLASS = "_entity_class";
-
 	private static final String ENTITY_ID = "_entity_id";
-
 	private static final String ENTITY_FIELD_NAME = "_entity_field_name";
-
 	private static final String ENTITY_FIELD_CLASS = "_entity_field_class";
 
-	protected final Log log = LogFactory.getLog(getClass());
+	private final Logger log = LoggerFactory.getLogger(getClass());
 
 	private MongoTemplate mongoTemplate;
-
 	private EntityManagerFactory entityManagerFactory;
 
 	public void setMongoTemplate(MongoTemplate mongoTemplate) {
@@ -58,6 +63,10 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 		this.entityManagerFactory = entityManagerFactory;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.crossstore.ChangeSetPersister#getPersistentState(java.lang.Class, java.lang.Object, org.springframework.data.crossstore.ChangeSet)
+	 */
 	public void getPersistentState(Class<? extends ChangeSetBacked> entityClass, Object id, final ChangeSet changeSet)
 			throws DataAccessException, NotFoundException {
 
@@ -68,29 +77,29 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 
 		String collName = getCollectionNameForEntity(entityClass);
 
-		final DBObject dbk = new BasicDBObject();
+		final Document dbk = new Document();
 		dbk.put(ENTITY_ID, id);
 		dbk.put(ENTITY_CLASS, entityClass.getName());
 		if (log.isDebugEnabled()) {
-			log.debug("Loading MongoDB data for " + dbk);
+			log.debug("Loading MongoDB data for {}", dbk);
 		}
 		mongoTemplate.execute(collName, new CollectionCallback<Object>() {
-			public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
-				for (DBObject dbo : collection.find(dbk)) {
+			public Object doInCollection(MongoCollection<Document> collection) throws MongoException, DataAccessException {
+				for (Document dbo : collection.find(dbk)) {
 					String key = (String) dbo.get(ENTITY_FIELD_NAME);
 					if (log.isDebugEnabled()) {
-						log.debug("Processing key: " + key);
+						log.debug("Processing key: {}", key);
 					}
 					if (!changeSet.getValues().containsKey(key)) {
 						String className = (String) dbo.get(ENTITY_FIELD_CLASS);
 						if (className == null) {
-							throw new DataIntegrityViolationException("Unble to convert property " + key + ": Invalid metadata, "
-									+ ENTITY_FIELD_CLASS + " not available");
+							throw new DataIntegrityViolationException(
+									"Unble to convert property " + key + ": Invalid metadata, " + ENTITY_FIELD_CLASS + " not available");
 						}
 						Class<?> clazz = ClassUtils.resolveClassName(className, ClassUtils.getDefaultClassLoader());
 						Object value = mongoTemplate.getConverter().read(clazz, dbo);
 						if (log.isDebugEnabled()) {
-							log.debug("Adding to ChangeSet: " + key);
+							log.debug("Adding to ChangeSet: {}", key);
 						}
 						changeSet.set(key, value);
 					}
@@ -100,15 +109,25 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 		});
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.crossstore.ChangeSetPersister#getPersistentId(org.springframework.data.crossstore.ChangeSetBacked, org.springframework.data.crossstore.ChangeSet)
+	 */
 	public Object getPersistentId(ChangeSetBacked entity, ChangeSet cs) throws DataAccessException {
-		log.debug("getPersistentId called on " + entity);
+		if (log.isDebugEnabled()) {
+			log.debug("getPersistentId called on {}", entity);
+		}
 		if (entityManagerFactory == null) {
 			throw new DataAccessResourceFailureException("EntityManagerFactory cannot be null");
 		}
-		Object o = entityManagerFactory.getPersistenceUnitUtil().getIdentifier(entity);
-		return o;
+
+		return entityManagerFactory.getPersistenceUnitUtil().getIdentifier(entity);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.crossstore.ChangeSetPersister#persistState(org.springframework.data.crossstore.ChangeSetBacked, org.springframework.data.crossstore.ChangeSet)
+	 */
 	public Object persistState(ChangeSetBacked entity, ChangeSet cs) throws DataAccessException {
 		if (cs == null) {
 			log.debug("Flush: changeset was null, nothing to flush.");
@@ -116,7 +135,7 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 		}
 
 		if (log.isDebugEnabled()) {
-			log.debug("Flush: changeset: " + cs.getValues());
+			log.debug("Flush: changeset: {}", cs.getValues());
 		}
 
 		String collName = getCollectionNameForEntity(entity.getClass());
@@ -127,30 +146,34 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 		for (String key : cs.getValues().keySet()) {
 			if (key != null && !key.startsWith("_") && !key.equals(ChangeSetPersister.ID_KEY)) {
 				Object value = cs.getValues().get(key);
-				final DBObject dbQuery = new BasicDBObject();
+				final Document dbQuery = new Document();
 				dbQuery.put(ENTITY_ID, getPersistentId(entity, cs));
 				dbQuery.put(ENTITY_CLASS, entity.getClass().getName());
 				dbQuery.put(ENTITY_FIELD_NAME, key);
-				DBObject dbId = mongoTemplate.execute(collName, new CollectionCallback<DBObject>() {
-					public DBObject doInCollection(DBCollection collection) throws MongoException, DataAccessException {
-						return collection.findOne(dbQuery);
+				final Document dbId = mongoTemplate.execute(collName, new CollectionCallback<Document>() {
+					public Document doInCollection(MongoCollection<Document> collection)
+							throws MongoException, DataAccessException {
+						Document id = collection.find(dbQuery).first();
+						return id;
 					}
 				});
+
 				if (value == null) {
 					if (log.isDebugEnabled()) {
-						log.debug("Flush: removing: " + dbQuery);
+						log.debug("Flush: removing: {}", dbQuery);
 					}
 					mongoTemplate.execute(collName, new CollectionCallback<Object>() {
-						public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
-							collection.remove(dbQuery);
+						public Object doInCollection(MongoCollection<Document> collection)
+								throws MongoException, DataAccessException {
+							DeleteResult dr = collection.deleteMany(dbQuery);
 							return null;
 						}
 					});
 				} else {
-					final DBObject dbDoc = new BasicDBObject();
+					final Document dbDoc = new Document();
 					dbDoc.putAll(dbQuery);
 					if (log.isDebugEnabled()) {
-						log.debug("Flush: saving: " + dbQuery);
+						log.debug("Flush: saving: {}", dbQuery);
 					}
 					mongoTemplate.getConverter().write(value, dbDoc);
 					dbDoc.put(ENTITY_FIELD_CLASS, value.getClass().getName());
@@ -158,8 +181,18 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 						dbDoc.put("_id", dbId.get("_id"));
 					}
 					mongoTemplate.execute(collName, new CollectionCallback<Object>() {
-						public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
-							collection.save(dbDoc);
+						public Object doInCollection(MongoCollection<Document> collection)
+								throws MongoException, DataAccessException {
+
+							if (dbId != null) {
+								collection.replaceOne(Filters.eq("_id", dbId.get("_id")), dbDoc);
+							} else {
+
+								if (dbDoc.containsKey("_id") && dbDoc.get("_id") == null) {
+									dbDoc.remove("_id");
+								}
+								collection.insertOne(dbDoc);
+							}
 							return null;
 						}
 					});
@@ -169,8 +202,13 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 		return 0L;
 	}
 
+	/**
+	 * Returns the collection the given entity type shall be persisted to.
+	 * 
+	 * @param entityClass must not be {@literal null}.
+	 * @return
+	 */
 	private String getCollectionNameForEntity(Class<? extends ChangeSetBacked> entityClass) {
-		return ClassUtils.getQualifiedName(entityClass);
+		return mongoTemplate.getCollectionName(entityClass);
 	}
-
 }

spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoDocumentBacking.aj

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2017 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.
@@ -21,13 +21,12 @@ import javax.persistence.EntityManager;
 import javax.persistence.Transient;
 import javax.persistence.Entity;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.reflect.FieldSignature;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataAccessException;
-
 import org.springframework.data.mongodb.crossstore.RelatedDocument;
 import org.springframework.data.mongodb.crossstore.DocumentBacked;
 import org.springframework.data.crossstore.ChangeSetBackedTransactionSynchronization;
@@ -41,10 +40,12 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  * Aspect to turn an object annotated with @Document into a persistent document using Mongo.
  * 
  * @author Thomas Risberg
+ * @deprecated will be removed without replacement.
  */
+@Deprecated
 public aspect MongoDocumentBacking {
 
-	private static final Log LOGGER = LogFactory.getLog(MongoDocumentBacking.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(MongoDocumentBacking.class);
 
 	// Aspect shared config
 	private ChangeSetPersister<Object> changeSetPersister;

spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/RelatedDocument.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2017 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.
@@ -22,7 +22,9 @@ import java.lang.annotation.Target;
 
 /**
  * @author Thomas Risberg
+ * @deprecated will be removed without replacement.
  */
+@Deprecated
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.FIELD })
 public @interface RelatedDocument {

spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * Infrastructure for Spring Data's MongoDB cross store support.
+ */
+package org.springframework.data.mongodb.crossstore;
+

spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/CrossStoreMongoTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2013 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.
@@ -18,7 +18,10 @@ package org.springframework.data.mongodb.crossstore;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
+import org.bson.Document;
+import org.junit.After;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +29,6 @@ import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.crossstore.test.Address;
 import org.springframework.data.mongodb.crossstore.test.Person;
 import org.springframework.data.mongodb.crossstore.test.Resume;
-import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.PlatformTransactionManager;
@@ -35,55 +37,71 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionCallback;
 import org.springframework.transaction.support.TransactionTemplate;
 
-import com.mongodb.DBCollection;
-import com.mongodb.DBObject;
-
+/**
+ * Integration tests for MongoDB cross-store persistence (mainly {@link MongoChangeSetPersister}).
+ * 
+ * @author Thomas Risberg
+ * @author Oliver Gierke
+ */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext.xml")
+@ContextConfiguration("classpath:/META-INF/spring/applicationContext.xml")
 public class CrossStoreMongoTests {
 
-	@Autowired
-	private MongoTemplate mongoTemplate;
+	@Autowired MongoTemplate mongoTemplate;
 
-	private EntityManager entityManager;
+	@PersistenceContext EntityManager entityManager;
 
-	@Autowired
-	private PlatformTransactionManager transactionManager;
+	@Autowired PlatformTransactionManager transactionManager;
+	TransactionTemplate txTemplate;
 
-	@PersistenceContext
-	public void setEntityManager(EntityManager entityManager) {
-		this.entityManager = entityManager;
+	@Before
+	public void setUp() {
+
+		txTemplate = new TransactionTemplate(transactionManager);
+
+		clearData(Person.class);
+
+		Address address = new Address(12, "MAin St.", "Boston", "MA", "02101");
+
+		Resume resume = new Resume();
+		resume.addEducation("Skanstulls High School, 1975");
+		resume.addEducation("Univ. of Stockholm, 1980");
+		resume.addJob("DiMark, DBA, 1990-2000");
+		resume.addJob("VMware, Developer, 2007-");
+
+		final Person person = new Person("Thomas", 20);
+		person.setAddress(address);
+		person.setResume(resume);
+		person.setId(1L);
+
+		txTemplate.execute(new TransactionCallback<Void>() {
+			public Void doInTransaction(TransactionStatus status) {
+				entityManager.persist(person);
+				return null;
+			}
+		});
 	}
 
-	private void clearData(String collectionName) {
-		DBCollection col = this.mongoTemplate.getCollection(collectionName);
-		if (col != null) {
-			this.mongoTemplate.dropCollection(collectionName);
-		}
+	@After
+	public void tearDown() {
+		txTemplate.execute(new TransactionCallback<Void>() {
+			public Void doInTransaction(TransactionStatus status) {
+				entityManager.remove(entityManager.find(Person.class, 1L));
+				return null;
+			}
+		});
+	}
+
+	private void clearData(Class<?> domainType) {
+
+		String collectionName = mongoTemplate.getCollectionName(domainType);
+		mongoTemplate.dropCollection(collectionName);
 	}
 
 	@Test
 	@Transactional
-	@Rollback(false)
-	public void testCreateJpaToMongoEntityRelationship() {
-		clearData(Person.class.getName());
-		Person p = new Person("Thomas", 20);
-		Address a = new Address(12, "MAin St.", "Boston", "MA", "02101");
-		p.setAddress(a);
-		Resume r = new Resume();
-		r.addEducation("Skanstulls High School, 1975");
-		r.addEducation("Univ. of Stockholm, 1980");
-		r.addJob("DiMark, DBA, 1990-2000");
-		r.addJob("VMware, Developer, 2007-");
-		p.setResume(r);
-		p.setId(1L);
-		entityManager.persist(p);
-	}
-
-	@Test
-	@Transactional
-	@Rollback(false)
 	public void testReadJpaToMongoEntityRelationship() {
+
 		Person found = entityManager.find(Person.class, 1L);
 		Assert.assertNotNull(found);
 		Assert.assertEquals(Long.valueOf(1), found.getId());
@@ -91,15 +109,18 @@ public class CrossStoreMongoTests {
 		Assert.assertEquals(Long.valueOf(1), found.getId());
 		Assert.assertNotNull(found.getResume());
 		Assert.assertEquals("DiMark, DBA, 1990-2000" + "; " + "VMware, Developer, 2007-", found.getResume().getJobs());
-		found.getResume().addJob("SpringDeveloper.com, Consultant, 2005-2006");
-		found.setAge(44);
 	}
 
 	@Test
 	@Transactional
-	@Rollback(false)
 	public void testUpdatedJpaToMongoEntityRelationship() {
+
 		Person found = entityManager.find(Person.class, 1L);
+		found.setAge(44);
+		found.getResume().addJob("SpringDeveloper.com, Consultant, 2005-2006");
+
+		entityManager.merge(found);
+
 		Assert.assertNotNull(found);
 		Assert.assertEquals(Long.valueOf(1), found.getId());
 		Assert.assertNotNull(found);
@@ -111,14 +132,19 @@ public class CrossStoreMongoTests {
 
 	@Test
 	public void testMergeJpaEntityWithMongoDocument() {
-		TransactionTemplate txTemplate = new TransactionTemplate(transactionManager);
+
 		final Person detached = entityManager.find(Person.class, 1L);
+		entityManager.detach(detached);
 		detached.getResume().addJob("TargetRx, Developer, 2000-2005");
+
 		Person merged = txTemplate.execute(new TransactionCallback<Person>() {
 			public Person doInTransaction(TransactionStatus status) {
-				return entityManager.merge(detached);
+				Person result = entityManager.merge(detached);
+				entityManager.flush();
+				return result;
 			}
 		});
+
 		Assert.assertTrue(detached.getResume().getJobs().contains("TargetRx, Developer, 2000-2005"));
 		Assert.assertTrue(merged.getResume().getJobs().contains("TargetRx, Developer, 2000-2005"));
 		final Person updated = entityManager.find(Person.class, 1L);
@@ -127,7 +153,7 @@ public class CrossStoreMongoTests {
 
 	@Test
 	public void testRemoveJpaEntityWithMongoDocument() {
-		TransactionTemplate txTemplate = new TransactionTemplate(transactionManager);
+
 		txTemplate.execute(new TransactionCallback<Person>() {
 			public Person doInTransaction(TransactionStatus status) {
 				Person p2 = new Person("Thomas", 20);
@@ -154,8 +180,10 @@ public class CrossStoreMongoTests {
 				return null;
 			}
 		});
+
 		boolean weFound3 = false;
-		for (DBObject dbo : this.mongoTemplate.getCollection(Person.class.getName()).find()) {
+
+		for (Document dbo : this.mongoTemplate.getCollection(mongoTemplate.getCollectionName(Person.class)).find()) {
 			Assert.assertTrue(!dbo.get("_entity_id").equals(2L));
 			if (dbo.get("_entity_id").equals(3L)) {
 				weFound3 = true;

spring-data-mongodb-cross-store/src/test/resources/META-INF/spring/applicationContext.xml

@@ -20,13 +20,13 @@
   <mongo:mapping-converter/>
   
   <!--  Mongo config -->
-  <bean id="mongo" class="org.springframework.data.mongodb.core.MongoFactoryBean">
+  <bean id="mongoClient" class="org.springframework.data.mongodb.core.MongoClientFactoryBean">
     <property name="host" value="localhost"/>
     <property name="port" value="27017"/>
   </bean>
 
   <bean id="mongoDbFactory" class="org.springframework.data.mongodb.core.SimpleMongoDbFactory">
-  	<constructor-arg name="mongo" ref="mongo"/>
+  	<constructor-arg name="mongoClient" ref="mongoClient"/>
   	<constructor-arg name="databaseName" value="database"/>
   </bean>
 

spring-data-mongodb-cross-store/src/test/resources/log4j.properties

@@ -1,12 +0,0 @@
-log4j.rootCategory=INFO, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %40.40c:%4L - %m%n
-
-log4j.category.org.springframework=INFO
-log4j.category.org.springframework.data=TRACE
-
-log4j.category.org.hibernate.SQL=DEBUG
-# for debugging datasource initialization
-# log4j.category.test.jdbc=DEBUG

spring-data-mongodb-cross-store/src/test/resources/logback.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d %5p %40.40c:%4L - %m%n</pattern>
+		</encoder>
+	</appender>
+
+	<!-- 
+	<logger name="org.springframework" level="debug" />
+	 -->
+
+	<root level="error">
+		<appender-ref ref="console" />
+	</root>
+
+</configuration>

spring-data-mongodb-distribution/pom.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>spring-data-mongodb-distribution</artifactId>
+
+	<packaging>pom</packaging>
+
+	<name>Spring Data MongoDB - Distribution</name>
+	<description>Distribution build for Spring Data MongoDB</description>
+
+	<parent>
+		<groupId>org.springframework.data</groupId>
+		<artifactId>spring-data-mongodb-parent</artifactId>
+		<version>2.0.0.RC3</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<properties>
+		<project.root>${basedir}/..</project.root>
+		<dist.key>SDMONGO</dist.key>
+	</properties>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>wagon-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.asciidoctor</groupId>
+				<artifactId>asciidoctor-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>

spring-data-mongodb-log4j/README.md

@@ -1,52 +0,0 @@
-# MongoDB Log4J Appender
-
-This module sets up a Log4J appender that puts logging events in MongoDB. It is fully configurable
-and connects directly to the MongoDB server using the driver. It has no dependency on any Spring package.
-
-To use it, configure a host, port, (optionally) applicationId, and database property in your Log4J configuration:
-
-    log4j.appender.stdout=org.springframework.data.mongodb.log4j.MongoLog4jAppender
-    log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-    log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
-    log4j.appender.stdout.host = localhost
-    log4j.appender.stdout.port = 27017
-    log4j.appender.stdout.database = logs
-    log4j.appender.stdout.collectionPattern = %c
-    log4j.appender.stdout.applicationId = my.application
-    log4j.appender.stdout.warnOrHigherWriteConcern = FSYNC_SAFE
-
-It will even support properties in your MDC (so long as they're Strings or support .toString()).
-
-The collection name is configurable as well. If you don't specify anything, it will use the Category name.
-If you want to specify a collection name, you can give it a Log4J pattern layout format string which will have
-the following additional MDC variables in the context when the collection name is rendered:
-
-    "year" = Calendar.YEAR
-    "month" = Calendar.MONTH + 1
-    "day" = Calendar.DAY_OF_MONTH
-    "hour" = Calendar.HOUR_OF_DAY
-    "applicationId" = configured applicationId
-
-An example log entry might look like:
-
-    {
-      "_id" : ObjectId("4d89341a8ef397e06940d5cd"),
-      "applicationId" : "my.application",
-      "name" : "org.springframework.data.mongodb.log4j.AppenderTest",
-      "level" : "DEBUG",
-      "timestamp" : ISODate("2011-03-23T16:53:46.778Z"),
-      "properties" : {
-        "property" : "one"
-      },
-      "message" : "DEBUG message"
-    }
-
-To set WriteConcern levels for WARN or higher messages, set warnOrHigherWriteConcern to one of the following:
-
-* FSYNC_SAFE
-* NONE
-* NORMAL
-* REPLICAS_SAFE
-* SAFE
-
-[http://api.mongodb.org/java/2.5-pre-/com/mongodb/WriteConcern.html#field_detail](http://api.mongodb.org/java/2.5-pre-/com/mongodb/WriteConcern.html#field_detail)

spring-data-mongodb-log4j/pom.xml

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.springframework.data</groupId>
-    <artifactId>spring-data-mongodb-parent</artifactId>
-    <version>1.1.0.M2</version>
-    <relativePath>../spring-data-mongodb-parent/pom.xml</relativePath>
-  </parent>
-  <artifactId>spring-data-mongodb-log4j</artifactId>
-  <name>Spring Data MongoDB Log4J Appender</name>
-
-  <properties>
-    <mongo.version>2.3</mongo.version>
-  </properties>
-
-  <dependencies>
-
-    <!-- MongoDB -->
-    <dependency>
-      <groupId>org.mongodb</groupId>
-      <artifactId>mongo-java-driver</artifactId>
-      <version>${mongo.version}</version>
-    </dependency>
-
-    <!-- Logging -->
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>${log4j.version}</version>
-    </dependency>
-
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>com.springsource.bundlor</groupId>
-        <artifactId>com.springsource.bundlor.maven</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>

spring-data-mongodb-log4j/src/main/java/org/springframework/data/mongodb/log4j/MongoLog4jAppender.java

@@ -1,208 +0,0 @@
-/*
- * Copyright (c) 2011 by the original author(s).
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.data.mongodb.log4j;
-
-import java.net.UnknownHostException;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Map;
-
-import com.mongodb.BasicDBList;
-import com.mongodb.BasicDBObject;
-import com.mongodb.DB;
-import com.mongodb.Mongo;
-import com.mongodb.WriteConcern;
-import org.apache.log4j.AppenderSkeleton;
-import org.apache.log4j.Level;
-import org.apache.log4j.MDC;
-import org.apache.log4j.PatternLayout;
-import org.apache.log4j.spi.LoggingEvent;
-
-/**
- * @author Jon Brisbin <jbrisbin@vmware.com>
- */
-public class MongoLog4jAppender extends AppenderSkeleton {
-
-  public static final String LEVEL = "level";
-  public static final String NAME = "name";
-  public static final String APP_ID = "applicationId";
-  public static final String TIMESTAMP = "timestamp";
-  public static final String PROPERTIES = "properties";
-  public static final String TRACEBACK = "traceback";
-  public static final String MESSAGE = "message";
-  public static final String YEAR = "year";
-  public static final String MONTH = "month";
-  public static final String DAY = "day";
-  public static final String HOUR = "hour";
-
-  protected String host = "localhost";
-  protected int port = 27017;
-  protected String database = "logs";
-  protected String collectionPattern = "%c";
-  protected PatternLayout collectionLayout = new PatternLayout(collectionPattern);
-  protected String applicationId = System.getProperty("APPLICATION_ID", null);
-  protected WriteConcern warnOrHigherWriteConcern = WriteConcern.SAFE;
-  protected WriteConcern infoOrLowerWriteConcern = WriteConcern.NORMAL;
-  protected Mongo mongo;
-  protected DB db;
-
-  public MongoLog4jAppender() {
-  }
-
-  public MongoLog4jAppender(boolean isActive) {
-    super(isActive);
-  }
-
-  public String getHost() {
-    return host;
-  }
-
-  public void setHost(String host) {
-    this.host = host;
-  }
-
-  public int getPort() {
-    return port;
-  }
-
-  public void setPort(int port) {
-    this.port = port;
-  }
-
-  public String getDatabase() {
-    return database;
-  }
-
-  public void setDatabase(String database) {
-    this.database = database;
-  }
-
-  public String getCollectionPattern() {
-    return collectionPattern;
-  }
-
-  public void setCollectionPattern(String collectionPattern) {
-    this.collectionPattern = collectionPattern;
-    this.collectionLayout = new PatternLayout(collectionPattern);
-  }
-
-  public String getApplicationId() {
-    return applicationId;
-  }
-
-  public void setApplicationId(String applicationId) {
-    this.applicationId = applicationId;
-  }
-
-  public void setWarnOrHigherWriteConcern(String wc) {
-    this.warnOrHigherWriteConcern = WriteConcern.valueOf(wc);
-  }
-
-  public String getWarnOrHigherWriteConcern() {
-    return warnOrHigherWriteConcern.toString();
-  }
-
-  public String getInfoOrLowerWriteConcern() {
-    return infoOrLowerWriteConcern.toString();
-  }
-
-  public void setInfoOrLowerWriteConcern(String wc) {
-    this.infoOrLowerWriteConcern = WriteConcern.valueOf(wc);
-  }
-
-  protected void connectToMongo() throws UnknownHostException {
-    this.mongo = new Mongo(host, port);
-    this.db = mongo.getDB(database);
-  }
-
-  @SuppressWarnings({"unchecked"})
-  @Override
-  protected void append(final LoggingEvent event) {
-    if (null == db) {
-      try {
-        connectToMongo();
-      } catch (UnknownHostException e) {
-        throw new RuntimeException(e.getMessage(), e);
-      }
-    }
-
-    BasicDBObject dbo = new BasicDBObject();
-    if (null != applicationId) {
-      dbo.put(APP_ID, applicationId);
-      MDC.put(APP_ID, applicationId);
-    }
-    dbo.put(NAME, event.getLogger().getName());
-    dbo.put(LEVEL, event.getLevel().toString());
-    Calendar tstamp = Calendar.getInstance();
-    tstamp.setTimeInMillis(event.getTimeStamp());
-    dbo.put(TIMESTAMP, tstamp.getTime());
-
-    // Copy properties into document
-    Map<Object, Object> props = event.getProperties();
-    if (null != props && props.size() > 0) {
-      BasicDBObject propsDbo = new BasicDBObject();
-      for (Map.Entry<Object, Object> entry : props.entrySet()) {
-        propsDbo.put(entry.getKey().toString(), entry.getValue().toString());
-      }
-      dbo.put(PROPERTIES, propsDbo);
-    }
-
-    // Copy traceback info (if there is any) into the document
-    String[] traceback = event.getThrowableStrRep();
-    if (null != traceback && traceback.length > 0) {
-      BasicDBList tbDbo = new BasicDBList();
-      tbDbo.addAll(Arrays.asList(traceback));
-      dbo.put(TRACEBACK, tbDbo);
-    }
-
-    // Put the rendered message into the document
-    dbo.put(MESSAGE, event.getRenderedMessage());
-
-    // Insert the document
-    Calendar now = Calendar.getInstance();
-    MDC.put(YEAR, now.get(Calendar.YEAR));
-    MDC.put(MONTH, String.format("%1$02d", now.get(Calendar.MONTH) + 1));
-    MDC.put(DAY, String.format("%1$02d", now.get(Calendar.DAY_OF_MONTH)));
-    MDC.put(HOUR, String.format("%1$02d", now.get(Calendar.HOUR_OF_DAY)));
-
-    String coll = collectionLayout.format(event);
-
-    MDC.remove(YEAR);
-    MDC.remove(MONTH);
-    MDC.remove(DAY);
-    MDC.remove(HOUR);
-    if (null != applicationId) {
-      MDC.remove(APP_ID);
-    }
-
-    WriteConcern wc;
-    if (event.getLevel().isGreaterOrEqual(Level.WARN)) {
-      wc = warnOrHigherWriteConcern;
-    } else {
-      wc = infoOrLowerWriteConcern;
-    }
-    db.getCollection(coll).insert(dbo, wc);
-  }
-
-  public void close() {
-    mongo.close();
-  }
-
-  public boolean requiresLayout() {
-    return true;
-  }
-}

spring-data-mongodb-log4j/src/test/java/org/springframework/data/mongodb/log4j/AppenderTest.java

@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2011 by the original author(s).
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.data.mongodb.log4j;
-
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
-
-import java.net.UnknownHostException;
-import java.util.Calendar;
-
-import com.mongodb.DB;
-import com.mongodb.DBCursor;
-import com.mongodb.Mongo;
-import org.apache.log4j.Logger;
-import org.apache.log4j.MDC;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * @author Jon Brisbin <jbrisbin@vmware.com>
- */
-public class AppenderTest {
-
-  private static final String NAME = AppenderTest.class.getName();
-  private Logger log = Logger.getLogger(NAME);
-  private Mongo mongo;
-  private DB db;
-  private String collection;
-
-  @Before
-  public void setup() {
-    try {
-      mongo = new Mongo("localhost", 27017);
-      db = mongo.getDB("logs");
-      Calendar now = Calendar.getInstance();
-      collection = String.valueOf(now.get(Calendar.YEAR)) + String.format("%1$02d", now.get(Calendar.MONTH) + 1);
-      db.getCollection(collection).drop();
-    } catch (UnknownHostException e) {
-      throw new RuntimeException(e.getMessage(), e);
-    }
-  }
-
-  @Test
-  public void testLogging() {
-    log.debug("DEBUG message");
-    log.info("INFO message");
-    log.warn("WARN message");
-    log.error("ERROR message");
-
-    DBCursor msgs = db.getCollection(collection).find();
-    assertThat(msgs.count(), is(4));
-
-  }
-
-  @Test
-  public void testProperties() {
-    MDC.put("property", "one");
-    log.debug("DEBUG message");
-  }
-
-}

spring-data-mongodb-log4j/src/test/resources/log4j.properties

@@ -1,20 +0,0 @@
-log4j.rootCategory=INFO, stdout
-
-log4j.appender.stdout=org.springframework.data.mongodb.log4j.MongoLog4jAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
-log4j.appender.stdout.host = localhost
-log4j.appender.stdout.port = 27017
-log4j.appender.stdout.database = logs
-log4j.appender.stdout.collectionPattern = %X{year}%X{month}
-log4j.appender.stdout.applicationId = my.application
-log4j.appender.stdout.warnOrHigherWriteConcern = FSYNC_SAFE
-
-log4j.category.org.apache.activemq=ERROR
-log4j.category.org.springframework.batch=DEBUG
-log4j.category.org.springframework.data.document.mongodb=DEBUG
-log4j.category.org.springframework.transaction=INFO
-
-log4j.category.org.hibernate.SQL=DEBUG
-# for debugging datasource initialization
-# log4j.category.test.jdbc=DEBUG

spring-data-mongodb-log4j/template.mf

@@ -1,10 +0,0 @@
-Bundle-SymbolicName: org.springframework.data.mongodb.log4j
-Bundle-Name: Spring Data Mongo DB Log4J Appender
-Bundle-Vendor: SpringSource
-Bundle-ManifestVersion: 2
-Import-Package:
- sun.reflect;version="0";resolution:=optional
-Import-Template:
- com.mongodb.*;version="${mongo.version:[=.=,+1.0.0)}",
- org.apache.log4j.*;version="[1.2.15, 2.0.0)",
- org.apache.log4j.spi.*;version="[1.2.15, 2.0.0)"

spring-data-mongodb-parent/pom.xml

@@ -1,272 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.springframework.data</groupId>
-  <artifactId>spring-data-mongodb-parent</artifactId>
-  <name>Spring Data MongoDB Parent</name>
-  <url>http://www.springsource.org/spring-data/mongodb</url>
-  <version>1.1.0.M2</version>
-  <packaging>pom</packaging>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <!-- versions for commonly-used dependencies -->
-    <junit.version>4.10</junit.version>
-    <log4j.version>1.2.16</log4j.version>
-    <org.mockito.version>1.9.0</org.mockito.version>
-    <org.slf4j.version>1.6.1</org.slf4j.version>
-    <org.codehaus.jackson.version>1.6.1</org.codehaus.jackson.version>
-    <org.springframework.version.30>3.0.7.RELEASE</org.springframework.version.30>
-    <org.springframework.version.40>4.0.0.RELEASE</org.springframework.version.40>
-    <org.springframework.version.range>[${org.springframework.version.30}, ${org.springframework.version.40})</org.springframework.version.range>
-    <data.commons.version>1.4.0.M1</data.commons.version>
-    <aspectj.version>1.6.11.RELEASE</aspectj.version>
-    <bundlor.failOnWarnings>true</bundlor.failOnWarnings>
-  </properties>
- 
-  <distributionManagement>
-    <!-- see 'staging' profile for dry-run deployment settings -->
-    <downloadUrl>http://www.springsource.com/download/community
-    </downloadUrl>
-    <site>
-      <id>static.springframework.org</id>
-      <url>
-        scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-mongodb/snapshot-site
-      </url>
-    </site>
-    <repository>
-      <id>spring-milestone</id>
-      <name>Spring Milestone Repository</name>
-      <url>s3://maven.springframework.org/milestone</url>
-    </repository>
-    <snapshotRepository>
-      <id>spring-snapshot</id>
-      <name>Spring Snapshot Repository</name>
-      <url>s3://maven.springframework.org/snapshot</url>
-    </snapshotRepository>
-  </distributionManagement>
-  
-  <dependencies>
-
-		<!-- Test dependencies -->
-		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-library</artifactId>
-			<version>1.2.1</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit-dep</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<version>${org.mockito.version}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>joda-time</groupId>
-			<artifactId>joda-time</artifactId>
-			<version>1.6</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>${org.slf4j.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-			<version>${org.slf4j.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<version>${org.slf4j.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>${log4j.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<version>${org.springframework.version.range}</version>
-			<scope>test</scope>
-		</dependency>
-
-  </dependencies>
-
-  <build>
-    <extensions>
-      <extension>
-        <!--
-              available only in the springframework maven repository. see
-              <repositories> section below
-            -->
-        <groupId>org.springframework.build.aws</groupId>
-        <artifactId>org.springframework.build.aws.maven</artifactId>
-        <version>3.1.0.RELEASE</version>
-      </extension>
-    </extensions>
-    <resources>
-      <resource>
-        <directory>${project.basedir}/src/main/java</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-      <resource>
-        <directory>${project.basedir}/src/main/resources</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource>
-        <directory>${project.basedir}/src/test/java</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </testResource>
-      <testResource>
-        <directory>${project.basedir}/src/test/resources</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </testResource>
-    </testResources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-          <compilerArgument>-Xlint:-path</compilerArgument>
-          <showWarnings>true</showWarnings>
-          <showDeprecation>false</showDeprecation>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.3.1</version>
-        <configuration>
-           <useDefaultManifestFile>true</useDefaultManifestFile>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.12</version>
-        <configuration>
-          <useFile>false</useFile>
-          <includes>
-            <include>**/*Tests.java</include>
-          </includes>
-          <excludes>
-          	<exclude>**/PerformanceTests.java</exclude>
-          </excludes>
-          <junitArtifactName>junit:junit-dep</junitArtifactName>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-source-plugin</artifactId>
-        <version>2.1.2</version>
-        <executions>
-          <execution>
-            <id>attach-sources</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <!--
-                 configures the springsource bundlor plugin, which generates
-                 OSGI-compatible MANIFEST.MF files during the 'compile' phase of
-                 the maven build. this plugin is declared within the
-                 pluginManagement section because not every module that inherits
-                 from this pom needs bundlor's services, e.g.:
-                 spring-integration-samples and all its children. for this reason,
-                 all modules that wish to use bundlor must declare it explicitly.
-                 it is not necessary to specify the <version> or <configuration>
-                 sections, but groupId and artifactId are required. see
-                 http://static.springsource.org/s2-bundlor/1.0.x/user-guide/html/ch04s03.html
-                 for more info
-               -->
-          <groupId>com.springsource.bundlor</groupId>
-          <artifactId>com.springsource.bundlor.maven</artifactId>
-          <version>1.0.0.RELEASE</version>
-          <configuration>
-            <failOnWarnings>${bundlor.failOnWarnings}</failOnWarnings>
-          </configuration>
-          <executions>
-            <execution>
-              <id>bundlor</id>
-              <goals>
-                <goal>bundlor</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>spring-plugins-release</id>
-      <url>http://repo.springsource.org/plugins-release</url>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>spring-libs-snapshot</id>
-      <url>http://repo.springsource.org/libs-snapshot</url>
-    </repository>
-  </repositories>
-  <reporting>
-    <plugins>
-      <plugin>
-        <!--
-              significantly speeds up the 'Dependencies' report during site
-              creation see
-              http://old.nabble.com/Skipping-dependency-report-during-Maven2-site-generation-td20116761.html
-            -->
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.1</version>
-        <configuration>
-          <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-</project>

spring-data-mongodb/Spring Data MongoDB.sonargraph

@@ -1,146 +1,227 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<context version="7.0.3.1152">
-    <scope name="spring-data-mongodb" type="Project">
-        <element name="Filter" type="TypeFilterReferenceOverridden">
-            <element name="org.springframework.data.mongodb.**" type="IncludeTypePattern"/>
+<context version="7.2.2.230">
+    <scope type="Project" name="spring-data-mongodb">
+        <element type="TypeFilterReferenceOverridden" name="Filter">
+            <element type="IncludeTypePattern" name="org.springframework.data.mongodb.**"/>
         </element>
         <architecture>
-            <element name="Config" type="Layer">
-                <element name="Assignment" type="TypeFilter">
-                    <element name="**.config.**" type="WeakTypePattern"/>
+            <element type="Layer" name="Repositories">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="**.repository.**"/>
                 </element>
-                <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core"/>
-                <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Monitoring"/>
-                <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Repositories"/>
+                <element type="Subsystem" name="API">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.repository.*"/>
+                    </element>
+                </element>
+                <element type="Subsystem" name="Query">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.query.**"/>
+                    </element>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Repositories::Subsystem|API" type="AllowedDependency"/>
+                </element>
+                <element type="Subsystem" name="Implementation">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.support.**"/>
+                    </element>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Repositories::Subsystem|API" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Repositories::Subsystem|Query" type="AllowedDependency"/>
+                </element>
+                <element type="Subsystem" name="Config">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.config.**"/>
+                    </element>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Mapping" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Repositories::Subsystem|API" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Repositories::Subsystem|Implementation" type="AllowedDependency"/>
+                </element>
+                <element type="Subsystem" name="CDI">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.cdi.**"/>
+                    </element>
+                    <stereotype name="Unrestricted"/>
+                </element>
+                <dependency toName="Project|spring-data-mongodb::Layer|Config" type="AllowedDependency"/>
+                <dependency toName="Project|spring-data-mongodb::Layer|Core" type="AllowedDependency"/>
             </element>
-            <element name="Repositories" type="Layer">
-                <element name="Assignment" type="TypeFilter">
-                    <element name="**.repository.**" type="IncludeTypePattern"/>
+            <element type="Layer" name="Config">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="WeakTypePattern" name="**.config.**"/>
                 </element>
-                <element name="API" type="Subsystem">
-                    <element name="Assignment" type="TypeFilter">
-                        <element name="**.repository.*" type="IncludeTypePattern"/>
-                    </element>
-                </element>
-                <element name="Query" type="Subsystem">
-                    <element name="Assignment" type="TypeFilter">
-                        <element name="**.query.**" type="IncludeTypePattern"/>
-                    </element>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Repositories::Subsystem|API"/>
-                </element>
-                <element name="Implementation" type="Subsystem">
-                    <element name="Assignment" type="TypeFilter">
-                        <element name="**.support.**" type="IncludeTypePattern"/>
-                    </element>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Repositories::Subsystem|API"/>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Repositories::Subsystem|Query"/>
-                </element>
-                <element name="Config" type="Subsystem">
-                    <element name="Assignment" type="TypeFilter">
-                        <element name="**.config.**" type="IncludeTypePattern"/>
-                    </element>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Repositories::Subsystem|Implementation"/>
-                </element>
-                <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core"/>
+                <dependency toName="Project|spring-data-mongodb::Layer|Core" type="AllowedDependency"/>
+                <dependency toName="Project|spring-data-mongodb::Layer|GridFS" type="AllowedDependency"/>
+                <dependency toName="Project|spring-data-mongodb::Layer|Monitoring" type="AllowedDependency"/>
             </element>
-            <element name="Monitoring" type="Layer">
-                <element name="Assignment" type="TypeFilter">
-                    <element name="**.monitor.**" type="IncludeTypePattern"/>
+            <element type="Layer" name="Monitoring">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="**.monitor.**"/>
                 </element>
-                <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core"/>
+                <dependency toName="Project|spring-data-mongodb::Layer|Core" type="AllowedDependency"/>
             </element>
-            <element name="GridFS" type="Layer">
-                <element name="Assignment" type="TypeFilter">
-                    <element name="**.gridfs.**" type="IncludeTypePattern"/>
+            <element type="Layer" name="GridFS">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="**.gridfs.**"/>
                 </element>
-                <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core"/>
+                <dependency toName="Project|spring-data-mongodb::Layer|Core" type="AllowedDependency"/>
             </element>
-            <element name="Core" type="Layer">
-                <element name="Assignment" type="TypeFilter">
-                    <element name="**.core.**" type="IncludeTypePattern"/>
-                </element>
-                <element name="Mapping" type="Subsystem">
-                    <element name="Assignment" type="TypeFilter">
-                        <element name="**.mapping.**" type="IncludeTypePattern"/>
+            <element type="Layer" name="Core">
+                <element type="TypeFilter" name="Assignment"/>
+                <element type="Subsystem" name="Mapping">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.core.mapping.**"/>
                     </element>
                 </element>
-                <element name="Geospatial" type="Subsystem">
-                    <element name="Assignment" type="TypeFilter">
-                        <element name="**.geo.**" type="IncludeTypePattern"/>
+                <element type="Subsystem" name="Geospatial">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.core.geo.**"/>
                     </element>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Mapping"/>
                 </element>
-                <element name="Query" type="Subsystem">
-                    <element name="Assignment" type="TypeFilter">
-                        <element name="**.query.**" type="IncludeTypePattern"/>
+                <element type="Subsystem" name="Query">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.core.query.**"/>
                     </element>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Geospatial"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Geospatial" type="AllowedDependency"/>
                 </element>
-                <element name="Index" type="Subsystem">
-                    <element name="Assignment" type="TypeFilter">
-                        <element name="**.index.**" type="IncludeTypePattern"/>
+                <element type="Subsystem" name="Script">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.script.**"/>
                     </element>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Mapping"/>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Query"/>
                 </element>
-                <element name="Core" type="Subsystem">
-                    <element name="Assignment" type="TypeFilter">
-                        <element name="**.core.**" type="WeakTypePattern"/>
+                <element type="Subsystem" name="Conversion">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.core.convert.**"/>
                     </element>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Geospatial"/>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Index"/>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Mapping"/>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Query"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Geospatial" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Mapping" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Query" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Script" type="AllowedDependency"/>
                 </element>
+                <element type="Subsystem" name="SpEL">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.core.spel.**"/>
+                    </element>
+                </element>
+                <element type="Subsystem" name="Aggregation">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.core.aggregation.**"/>
+                    </element>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Conversion" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Mapping" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Query" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|SpEL" type="AllowedDependency"/>
+                </element>
+                <element type="Subsystem" name="Index">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.core.index.**"/>
+                    </element>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Mapping" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Query" type="AllowedDependency"/>
+                </element>
+                <element type="Subsystem" name="MapReduce">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.mapreduce.**"/>
+                    </element>
+                </element>
+                <element type="Subsystem" name="Core">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="WeakTypePattern" name="**.core.**"/>
+                    </element>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Aggregation" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Conversion" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Geospatial" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Index" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|MapReduce" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Mapping" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Query" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Script" type="AllowedDependency"/>
+                </element>
+                <element type="Subsystem" name="Util">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.util.**"/>
+                    </element>
+                    <stereotype name="Unrestricted"/>
+                    <stereotype name="Public"/>
+                </element>
+            </element>
+            <element type="Subsystem" name="API">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="org.springframework.data.mongodb.*"/>
+                </element>
+                <stereotype name="Public"/>
             </element>
         </architecture>
         <workspace>
-            <element name="src/main/java" type="JavaRootDirectory">
+            <element type="JavaRootDirectory" name="src/main/java">
                 <reference name="Project|spring-data-mongodb::BuildUnit|spring-data-mongodb"/>
             </element>
-            <element name="target/classes" type="JavaRootDirectory">
+            <element type="JavaRootDirectory" name="target/classes">
                 <reference name="Project|spring-data-mongodb::BuildUnit|spring-data-mongodb"/>
             </element>
         </workspace>
         <physical>
-            <element name="spring-data-mongodb" type="BuildUnit"/>
+            <element type="BuildUnit" name="spring-data-mongodb"/>
         </physical>
     </scope>
-    <scope name="External" type="External">
-        <element name="Filter" type="TypeFilter">
-            <element name="**" type="IncludeTypePattern"/>
-            <element name="java.**" type="ExcludeTypePattern"/>
-            <element name="javax.**" type="ExcludeTypePattern"/>
+    <scope type="External" name="External">
+        <element type="TypeFilter" name="Filter">
+            <element type="IncludeTypePattern" name="**"/>
+            <element type="ExcludeTypePattern" name="java.**"/>
+            <element type="ExcludeTypePattern" name="javax.**"/>
         </element>
         <architecture>
-            <element name="Spring" type="Subsystem">
-                <element name="Assignment" type="TypeFilter">
-                    <element name="org.springframework.**" type="IncludeTypePattern"/>
-                    <element name="org.springframework.data.**" type="ExcludeTypePattern"/>
+            <element type="Subsystem" name="Spring">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="org.springframework.**"/>
+                    <element type="ExcludeTypePattern" name="org.springframework.data.**"/>
                 </element>
             </element>
-            <element name="Spring Data Core" type="Subsystem">
-                <element name="Assignment" type="TypeFilter">
-                    <element name="org.springframework.data.**" type="IncludeTypePattern"/>
+            <element type="Subsystem" name="Spring Data Core">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="org.springframework.data.**"/>
                 </element>
             </element>
-            <element name="Mongo Java Driver" type="Subsystem">
-                <element name="Assignment" type="TypeFilter">
-                    <element name="com.mongodb.**" type="IncludeTypePattern"/>
-                    <element name="org.bson.**" type="IncludeTypePattern"/>
+            <element type="Subsystem" name="Mongo Java Driver">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="com.mongodb.**"/>
+                    <element type="IncludeTypePattern" name="org.bson.**"/>
                 </element>
             </element>
-            <element name="Querydsl" type="Subsystem">
-                <element name="Assignment" type="TypeFilter">
-                    <element name="com.mysema.query.**" type="IncludeTypePattern"/>
+            <element type="Subsystem" name="Querydsl">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="com.querydsl.**"/>
+                </element>
+            </element>
+            <element type="Subsystem" name="Slf4j">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="org.slf4j.**"/>
+                </element>
+            </element>
+            <element type="Subsystem" name="Jackson">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="com.fasterxml.jackson.**"/>
+                </element>
+            </element>
+            <element type="Subsystem" name="DOM">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="org.w3c.dom.**"/>
+                </element>
+            </element>
+            <element type="Subsystem" name="AOP Alliance">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="org.aopalliance.**"/>
+                </element>
+            </element>
+            <element type="Subsystem" name="Guava">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="com.google.common.**"/>
                 </element>
             </element>
         </architecture>
     </scope>
-    <scope name="Global" type="Global">
-        <element name="Configuration" type="Configuration"/>
-        <element name="Filter" type="TypeFilter">
-            <element name="**" type="IncludeTypePattern"/>
+    <scope type="Global" name="Global">
+        <element type="Configuration" name="Configuration"/>
+        <element type="TypeFilter" name="Filter">
+            <element type="IncludeTypePattern" name="**"/>
         </element>
     </scope>
 </context>

spring-data-mongodb/pom.xml

@@ -1,95 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
 	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>spring-data-mongodb</artifactId>
+
+	<name>Spring Data MongoDB - Core</name>
+	<description>MongoDB support for Spring Data</description>
+
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.1.0.M2</version>
-		<relativePath>../spring-data-mongodb-parent/pom.xml</relativePath>
+		<version>2.0.0.RC3</version>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
-	<artifactId>spring-data-mongodb</artifactId>
-	<name>Spring Data MongoDB</name>
 
 	<properties>
-		<mongo.version>2.7.1</mongo.version>
-		<querydsl.version>2.6.0</querydsl.version>
-		<cdi.version>1.0</cdi.version>
-		<validation.version>1.0.0.GA</validation.version>
-		<webbeans.version>1.1.3</webbeans.version>
+		<objenesis>1.3</objenesis>
+		<equalsverifier>1.5</equalsverifier>
 	</properties>
 
 	<dependencies>
 
-		<!--  Spring -->
+		<!-- Spring -->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-tx</artifactId>
-			<version>${org.springframework.version.range}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<version>${org.springframework.version.range}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
-			<version>${org.springframework.version.range}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
-			<version>${org.springframework.version.range}</version>
 			<exclusions>
 				<exclusion>
-          			<groupId>commons-logging</groupId>
-          			<artifactId>commons-logging</artifactId>
-        		</exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-expression</artifactId>
-			<version>${org.springframework.version.range}</version>
 		</dependency>
 
-		<!--  Spring Data -->
+		<!-- Spring Data -->
 		<dependency>
-			<groupId>org.springframework.data</groupId>
-			<artifactId>spring-data-commons-core</artifactId>
-			<version>${data.commons.version}</version>
-		</dependency>
-
-		<!-- MongoDB -->
-		<dependency>
-			<groupId>org.mongodb</groupId>
-			<artifactId>mongo-java-driver</artifactId>
-			<version>${mongo.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>javax.persistence</groupId>
-					<artifactId>persistence-api</artifactId>
-				</exclusion>
-			</exclusions>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-data-commons</artifactId>
+			<version>${springdata.commons}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>com.mysema.querydsl</groupId>
+			<groupId>com.querydsl</groupId>
 			<artifactId>querydsl-mongodb</artifactId>
-			<version>${querydsl.version}</version>
+			<version>${querydsl}</version>
 			<optional>true</optional>
-			<exclusions>
-				<exclusion>
-					<groupId>com.google.code.morphia</groupId>
-					<artifactId>morphia</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 
 		<dependency>
-			<groupId>com.mysema.querydsl</groupId>
+			<groupId>com.querydsl</groupId>
 			<artifactId>querydsl-apt</artifactId>
-			<version>${querydsl.version}</version>
+			<version>${querydsl}</version>
 			<scope>provided</scope>
 		</dependency>
 
@@ -99,30 +77,88 @@
 			<version>1.0</version>
 			<optional>true</optional>
 		</dependency>
-		
+
+		<!-- reactive -->
+		<dependency>
+		 	<groupId>org.mongodb</groupId>
+			<artifactId>mongodb-driver-reactivestreams</artifactId>
+			<version>${mongo.reactivestreams}</version>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+		 	<groupId>org.mongodb</groupId>
+			<artifactId>mongodb-driver-async</artifactId>
+			<version>${mongo}</version>
+			<optional>true</optional>
+			<exclusions>
+				<exclusion>
+					<groupId>org.mongodb</groupId>
+					<artifactId>mongodb-driver-core</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.mongodb</groupId>
+					<artifactId>bson</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+		 	<groupId>io.projectreactor</groupId>
+			<artifactId>reactor-core</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>io.projectreactor</groupId>
+			<artifactId>reactor-test</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+		 	<groupId>io.reactivex</groupId>
+			<artifactId>rxjava</artifactId>
+			<version>${rxjava}</version>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+		 	<groupId>io.reactivex</groupId>
+			<artifactId>rxjava-reactive-streams</artifactId>
+			<version>${rxjava-reactive-streams}</version>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>io.reactivex.rxjava2</groupId>
+			<artifactId>rxjava</artifactId>
+			<version>${rxjava2}</version>
+			<optional>true</optional>
+		</dependency>
+
 		<!-- CDI -->
 		<dependency>
 			<groupId>javax.enterprise</groupId>
 			<artifactId>cdi-api</artifactId>
-			<version>${cdi.version}</version>
+			<version>${cdi}</version>
 			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>javax.el</groupId>
 			<artifactId>el-api</artifactId>
-			<version>${cdi.version}</version>
+			<version>${cdi}</version>
 			<scope>test</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.apache.openwebbeans.test</groupId>
 			<artifactId>cditest-owb</artifactId>
-			<version>${webbeans.version}</version>
+			<version>${webbeans}</version>
 			<scope>test</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
@@ -134,54 +170,194 @@
 		<dependency>
 			<groupId>javax.validation</groupId>
 			<artifactId>validation-api</artifactId>
-			<version>${validation.version}</version>
+			<version>${validation}</version>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>org.objenesis</groupId>
+			<artifactId>objenesis</artifactId>
+			<version>${objenesis}</version>
 			<optional>true</optional>
 		</dependency>
 
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-validator</artifactId>
-			<version>4.2.0.Final</version>
+			<version>5.2.4.Final</version>
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+			<version>${jodatime}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.threeten</groupId>
+			<artifactId>threetenbp</artifactId>
+			<version>${threetenbp}</version>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>${jackson}</version>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jul-to-slf4j</artifactId>
+			<version>${slf4j}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>nl.jqno.equalsverifier</groupId>
+			<artifactId>equalsverifier</artifactId>
+			<version>${equalsverifier}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>de.schauderhaft.degraph</groupId>
+			<artifactId>degraph-check</artifactId>
+			<version>0.1.4</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- Kotlin extension -->
+		<dependency>
+			<groupId>org.jetbrains.kotlin</groupId>
+			<artifactId>kotlin-stdlib</artifactId>
+			<version>${kotlin}</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.jetbrains.kotlin</groupId>
+			<artifactId>kotlin-reflect</artifactId>
+			<version>${kotlin}</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.jetbrains.kotlin</groupId>
+			<artifactId>kotlin-test</artifactId>
+			<version>${kotlin}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.nhaarman</groupId>
+			<artifactId>mockito-kotlin</artifactId>
+			<version>1.5.0</version>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.jetbrains.kotlin</groupId>
+					<artifactId>kotlin-stdlib</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.jetbrains.kotlin</groupId>
+					<artifactId>kotlin-reflect</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.mockito</groupId>
+					<artifactId>mockito-core</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
 	</dependencies>
-	
-	<profiles>
-		<profile>
-			<id>performance-tests</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<version>2.8</version>
-						<configuration>
-							<includes>
-								<include>**/PerformanceTests.java</include>
-							</includes>
-							<excludes>
-								<exclude>none</exclude>
-							</excludes>
-							<junitArtifactName>junit:junit-dep</junitArtifactName>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-	
+
 	<build>
 		<plugins>
+
 			<plugin>
-				<groupId>com.springsource.bundlor</groupId>
-				<artifactId>com.springsource.bundlor.maven</artifactId>
+				<artifactId>kotlin-maven-plugin</artifactId>
+				<groupId>org.jetbrains.kotlin</groupId>
+				<version>${kotlin}</version>
+				<configuration>
+					<jvmTarget>${source.level}</jvmTarget>
+				</configuration>
+				<executions>
+					<execution>
+						<id>compile</id>
+						<phase>compile</phase>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+						<configuration>
+							<sourceDirs>
+								<sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
+								<sourceDir>${project.basedir}/src/main/java</sourceDir>
+							</sourceDirs>
+						</configuration>
+					</execution>
+					<execution>
+						<id>test-compile</id>
+						<phase>test-compile</phase>
+						<goals>
+							<goal>test-compile</goal>
+						</goals>
+						<configuration>
+							<sourceDirs>
+								<sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
+								<sourceDir>${project.basedir}/src/test/java</sourceDir>
+							</sourceDirs>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>default-compile</id>
+						<phase>none</phase>
+					</execution>
+					<execution>
+						<id>default-testCompile</id>
+						<phase>none</phase>
+					</execution>
+					<execution>
+						<id>java-compile</id>
+						<phase>compile</phase>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>java-test-compile</id>
+						<phase>test-compile</phase>
+						<goals>
+							<goal>testCompile</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 
 			<plugin>
 				<groupId>com.mysema.maven</groupId>
-				<artifactId>maven-apt-plugin</artifactId>
-				<version>1.0.2</version>
+				<artifactId>apt-maven-plugin</artifactId>
+				<version>${apt}</version>
+				<dependencies>
+					<dependency>
+						<groupId>com.querydsl</groupId>
+						<artifactId>querydsl-apt</artifactId>
+						<version>${querydsl}</version>
+					</dependency>
+				</dependencies>
 				<executions>
 					<execution>
 						<phase>generate-test-sources</phase>
@@ -195,7 +371,32 @@
 					</execution>
 				</executions>
 			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.12</version>
+				<configuration>
+					<useFile>false</useFile>
+					<includes>
+						<include>**/*Tests.java</include>
+					</includes>
+					<excludes>
+						<exclude>**/PerformanceTests.java</exclude>
+						<exclude>**/ReactivePerformanceTests.java</exclude>
+					</excludes>
+					<systemPropertyVariables>
+						<java.util.logging.config.file>src/test/resources/logging.properties</java.util.logging.config.file>
+						<reactor.trace.cancel>true</reactor.trace.cancel>
+					</systemPropertyVariables>
+					<properties>
+						<property>
+							<name>listener</name>
+							<value>org.springframework.data.mongodb.test.util.CleanMongoDBJunitRunListener</value>
+						</property>
+					</properties>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
-	
 </project>

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

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2015 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb;
+
+import java.util.List;
+
+import org.springframework.dao.DataAccessException;
+
+import com.mongodb.BulkWriteError;
+import com.mongodb.BulkWriteException;
+import com.mongodb.BulkWriteResult;
+
+/**
+ * Is thrown when errors occur during bulk operations.
+ * 
+ * @author Tobias Trelle
+ * @author Oliver Gierke
+ * @since 1.9
+ */
+public class BulkOperationException extends DataAccessException {
+
+	private static final long serialVersionUID = 73929601661154421L;
+
+	private final List<BulkWriteError> errors;
+	private final BulkWriteResult result;
+
+	/**
+	 * Creates a new {@link BulkOperationException} with the given message and source {@link BulkWriteException}.
+	 * 
+	 * @param message must not be {@literal null}.
+	 * @param source must not be {@literal null}.
+	 */
+	public BulkOperationException(String message, BulkWriteException source) {
+
+		super(message, source);
+
+		this.errors = source.getWriteErrors();
+		this.result = source.getWriteResult();
+	}
+
+	public List<BulkWriteError> getErrors() {
+		return errors;
+	}
+
+	public BulkWriteResult getResult() {
+		return result;
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 the original author or authors.
+ * Copyright 2010-2017 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.
@@ -17,16 +17,18 @@ package org.springframework.data.mongodb;
 
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.data.authentication.UserCredentials;
+import org.springframework.lang.Nullable;
 
 /**
  * Exception being thrown in case we cannot connect to a MongoDB instance.
- * 
+ *
  * @author Oliver Gierke
+ * @author Mark Paluch
  */
 public class CannotGetMongoDbConnectionException extends DataAccessResourceFailureException {
 
 	private final UserCredentials credentials;
-	private final String database;
+	private final @Nullable String database;
 
 	private static final long serialVersionUID = 1172099106475265589L;
 
@@ -40,7 +42,7 @@ public class CannotGetMongoDbConnectionException extends DataAccessResourceFailu
 		this(msg, null, UserCredentials.NO_CREDENTIALS);
 	}
 
-	public CannotGetMongoDbConnectionException(String msg, String database, UserCredentials credentials) {
+	public CannotGetMongoDbConnectionException(String msg, @Nullable String database, UserCredentials credentials) {
 		super(msg);
 		this.database = database;
 		this.credentials = credentials;
@@ -48,7 +50,7 @@ public class CannotGetMongoDbConnectionException extends DataAccessResourceFailu
 
 	/**
 	 * Returns the {@link UserCredentials} that were used when trying to connect to the MongoDB instance.
-	 * 
+	 *
 	 * @return
 	 */
 	public UserCredentials getCredentials() {
@@ -57,9 +59,10 @@ public class CannotGetMongoDbConnectionException extends DataAccessResourceFailu
 
 	/**
 	 * Returns the name of the database trying to be accessed.
-	 * 
+	 *
 	 * @return
 	 */
+	@Nullable
 	public String getDatabase() {
 		return database;
 	}

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

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2013 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb;
+
+import org.springframework.dao.UncategorizedDataAccessException;
+
+/**
+ * @author Oliver Gierke
+ */
+public class LazyLoadingException extends UncategorizedDataAccessException {
+
+	private static final long serialVersionUID = -7089224903873220037L;
+
+	/**
+	 * @param msg
+	 * @param cause
+	 */
+	public LazyLoadingException(String msg, Throwable cause) {
+		super(msg, cause);
+	}
+}

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

@@ -1,13 +1,32 @@
+/*
+ * Copyright 2011-2013 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.data.mongodb;
 
 import org.springframework.dao.DataAccessException;
+import org.springframework.dao.support.PersistenceExceptionTranslator;
+import org.springframework.data.mongodb.core.MongoExceptionTranslator;
 
 import com.mongodb.DB;
+import com.mongodb.client.MongoDatabase;
 
 /**
  * Interface for factories creating {@link DB} instances.
  * 
  * @author Mark Pollack
+ * @author Thomas Darimont
  */
 public interface MongoDbFactory {
 
@@ -17,7 +36,7 @@ public interface MongoDbFactory {
 	 * @return
 	 * @throws DataAccessException
 	 */
-	DB getDb() throws DataAccessException;
+	MongoDatabase getDb() throws DataAccessException;
 
 	/**
 	 * Creates a {@link DB} instance to access the database with the given name.
@@ -26,5 +45,14 @@ public interface MongoDbFactory {
 	 * @return
 	 * @throws DataAccessException
 	 */
-	DB getDb(String dbName) throws DataAccessException;
+	MongoDatabase getDb(String dbName) throws DataAccessException;
+
+	/**
+	 * Exposes a shared {@link MongoExceptionTranslator}.
+	 * 
+	 * @return will never be {@literal null}.
+	 */
+	PersistenceExceptionTranslator getExceptionTranslator();
+
+	DB getLegacyDb();
 }

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

@@ -0,0 +1,56 @@
+/*
+ * Copyright 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.mongodb;
+
+import org.springframework.dao.DataAccessException;
+import org.springframework.dao.support.PersistenceExceptionTranslator;
+import org.springframework.data.mongodb.core.MongoExceptionTranslator;
+
+import com.mongodb.reactivestreams.client.MongoDatabase;
+
+/**
+ * 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
+	 */
+	MongoDatabase getMongoDatabase(String dbName) throws DataAccessException;
+
+	/**
+	 * Exposes a shared {@link MongoExceptionTranslator}.
+	 *
+	 * @return will never be {@literal null}.
+	 */
+	PersistenceExceptionTranslator getExceptionTranslator();
+}

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

@@ -1,190 +1,114 @@
-/*
- * Copyright 2011-2012 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.config;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.core.type.filter.AnnotationTypeFilter;
-import org.springframework.data.annotation.Persistent;
-import org.springframework.data.authentication.UserCredentials;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
-import org.springframework.data.mongodb.core.convert.CustomConversions;
-import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
-import org.springframework.data.mongodb.core.mapping.Document;
-import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.StringUtils;
-
-import com.mongodb.Mongo;
-
-/**
- * Base class for Spring Data Mongo configuration using JavaConfig.
- * 
- * @author Mark Pollack
- * @author Oliver Gierke
- */
-@Configuration
-public abstract class AbstractMongoConfiguration {
-
-	/**
-	 * Return the name of the database to connect to.
-	 * 
-	 * @return must not be {@literal null}.
-	 */
-	protected abstract String getDatabaseName();
-
-	/**
-	 * Return the {@link Mongo} instance to connect to.
-	 * 
-	 * @return
-	 * @throws Exception
-	 */
-	@Bean
-	public abstract Mongo mongo() throws Exception;
-
-	/**
-	 * Creates a {@link MongoTemplate}.
-	 * 
-	 * @return
-	 * @throws Exception
-	 */
-	@Bean
-	public MongoTemplate mongoTemplate() throws Exception {
-		return new MongoTemplate(mongoDbFactory(), mappingMongoConverter());
-	}
-
-	/**
-	 * Creates a {@link SimpleMongoDbFactory} to be used by the {@link MongoTemplate}. Will use the {@link Mongo} instance
-	 * configured in {@link #mongo()}.
-	 * 
-	 * @see #mongo()
-	 * @see #mongoTemplate()
-	 * @return
-	 * @throws Exception
-	 */
-	@Bean
-	public SimpleMongoDbFactory mongoDbFactory() throws Exception {
-
-		UserCredentials credentials = getUserCredentials();
-
-		if (credentials == null) {
-			return new SimpleMongoDbFactory(mongo(), getDatabaseName());
-		} else {
-			return new SimpleMongoDbFactory(mongo(), getDatabaseName(), credentials);
-		}
-	}
-
-	/**
-	 * Return the base package to scan for mapped {@link Document}s.
-	 * 
-	 * @return
-	 */
-	protected String getMappingBasePackage() {
-		return null;
-	}
-
-	/**
-	 * Return {@link UserCredentials} to be used when connecting to the MongoDB instance or {@literal null} if none shall
-	 * be used.
-	 * 
-	 * @return
-	 */
-	protected UserCredentials getUserCredentials() {
-		return null;
-	}
-
-	/**
-	 * Creates a {@link MongoMappingContext} equipped with entity classes scanned from the mapping base package.
-	 * 
-	 * @see #getMappingBasePackage()
-	 * @return
-	 * @throws ClassNotFoundException
-	 */
-	@Bean
-	public MongoMappingContext mongoMappingContext() throws ClassNotFoundException {
-
-		MongoMappingContext mappingContext = new MongoMappingContext();
-		mappingContext.setInitialEntitySet(getInitialEntitySet());
-		mappingContext.setSimpleTypeHolder(customConversions().getSimpleTypeHolder());
-		mappingContext.initialize();
-
-		return mappingContext;
-	}
-
-	/**
-	 * 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
-	public CustomConversions customConversions() {
-		return new CustomConversions(Collections.emptyList());
-	}
-
-	/**
-	 * Creates a {@link MappingMongoConverter} using the configured {@link #mongoDbFactory()} and
-	 * {@link #mongoMappingContext()}. Will get {@link #customConversions()} applied.
-	 * 
-	 * @see #customConversions()
-	 * @see #mongoMappingContext()
-	 * @see #mongoDbFactory()
-	 * @return
-	 * @throws Exception
-	 */
-	@Bean
-	public MappingMongoConverter mappingMongoConverter() throws Exception {
-		MappingMongoConverter converter = new MappingMongoConverter(mongoDbFactory(), mongoMappingContext());
-		converter.setCustomConversions(customConversions());
-		return converter;
-	}
-
-	/**
-	 * Scans the mapping base package for classes annotated with {@link Document}.
-	 * 
-	 * @see #getMappingBasePackage()
-	 * @return
-	 * @throws ClassNotFoundException
-	 */
-	protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
-
-		String basePackage = getMappingBasePackage();
-		Set<Class<?>> initialEntitySet = new HashSet<Class<?>>();
-
-		if (StringUtils.hasText(basePackage)) {
-			ClassPathScanningCandidateComponentProvider componentProvider = new ClassPathScanningCandidateComponentProvider(
-					false);
-			componentProvider.addIncludeFilter(new AnnotationTypeFilter(Document.class));
-			componentProvider.addIncludeFilter(new AnnotationTypeFilter(Persistent.class));
-
-			for (BeanDefinition candidate : componentProvider.findCandidateComponents(basePackage)) {
-				initialEntitySet.add(ClassUtils.forName(candidate.getBeanClassName(),
-						AbstractMongoConfiguration.class.getClassLoader()));
-			}
-		}
-
-		return initialEntitySet;
-	}
-}
+/*
+ * Copyright 2011-2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
+import org.springframework.data.mongodb.core.convert.DbRefResolver;
+import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.lang.Nullable;
+
+import com.mongodb.MongoClient;
+
+/**
+ * Base class for Spring Data MongoDB configuration using JavaConfig.
+ *
+ * @author Mark Pollack
+ * @author Oliver Gierke
+ * @author Thomas Darimont
+ * @author Ryan Tenney
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @see MongoConfigurationSupport
+ */
+@Configuration
+public abstract class
+AbstractMongoConfiguration extends MongoConfigurationSupport {
+
+	/**
+	 * 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 MongoTemplate}.
+	 *
+	 * @return
+	 */
+	@Bean
+	public MongoTemplate mongoTemplate() throws Exception {
+		return new MongoTemplate(mongoDbFactory(), mappingMongoConverter());
+	}
+
+	/**
+	 * Creates a {@link SimpleMongoDbFactory} to be used by the {@link MongoTemplate}. Will use the {@link MongoClient}
+	 * instance configured in {@link #mongo()}.
+	 *
+	 * @see #mongoClient()
+	 * @see #mongoTemplate()
+	 * @return
+	 */
+	@Bean
+	public MongoDbFactory mongoDbFactory() {
+		return new SimpleMongoDbFactory(mongoClient(), getDatabaseName());
+	}
+
+	/**
+	 * Return the base package to scan for mapped {@link Document}s. Will return the package name of the configuration
+	 * class' (the concrete class, not this one here) by default. So if you have a {@code com.acme.AppConfig} extending
+	 * {@link AbstractMongoConfiguration} the base package will be considered {@code com.acme} unless the method is
+	 * overridden to implement alternate behavior.
+	 *
+	 * @return the base package to scan for mapped {@link Document} classes or {@literal null} to not enable scanning for
+	 *         entities.
+	 * @deprecated use {@link #getMappingBasePackages()} instead.
+	 */
+	@Deprecated
+	@Nullable
+	protected String getMappingBasePackage() {
+
+		Package mappingBasePackage = getClass().getPackage();
+		return mappingBasePackage == null ? null : mappingBasePackage.getName();
+	}
+
+	/**
+	 * Creates a {@link MappingMongoConverter} using the configured {@link #mongoDbFactory()} and
+	 * {@link #mongoMappingContext()}. Will get {@link #customConversions()} applied.
+	 *
+	 * @see #customConversions()
+	 * @see #mongoMappingContext()
+	 * @see #mongoDbFactory()
+	 * @return
+	 * @throws Exception
+	 */
+	@Bean
+	public MappingMongoConverter mappingMongoConverter() throws Exception {
+
+		DbRefResolver dbRefResolver = new DefaultDbRefResolver(mongoDbFactory());
+		MappingMongoConverter converter = new MappingMongoConverter(dbRefResolver, mongoMappingContext());
+		converter.setCustomConversions(customConversions());
+
+		return converter;
+	}
+}

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

@@ -0,0 +1,89 @@
+/*
+ * Copyright 2016-2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory;
+import org.springframework.data.mongodb.core.ReactiveMongoOperations;
+import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
+import org.springframework.data.mongodb.core.SimpleReactiveMongoDatabaseFactory;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+
+import com.mongodb.reactivestreams.client.MongoClient;
+
+/**
+ * Base class for reactive Spring Data MongoDB configuration using JavaConfig.
+ *
+ * @author Mark Paluch
+ * @author Christoph Strobl
+ * @since 2.0
+ * @see MongoConfigurationSupport
+ */
+@Configuration
+public abstract class AbstractReactiveMongoConfiguration extends MongoConfigurationSupport {
+
+	/**
+	 * Return the Reactive Streams {@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 never {@literal null}.
+	 */
+	public abstract MongoClient reactiveMongoClient();
+
+	/**
+	 * Creates {@link ReactiveMongoOperations}.
+	 *
+	 * @return never {@literal null}.
+	 */
+	@Bean
+	public ReactiveMongoOperations reactiveMongoTemplate() throws Exception {
+		return new ReactiveMongoTemplate(reactiveMongoDbFactory(), mappingMongoConverter());
+	}
+
+	/**
+	 * Creates a {@link ReactiveMongoDatabaseFactory} to be used by the {@link ReactiveMongoOperations}. Will use the
+	 * {@link MongoClient} instance configured in {@link #reactiveMongoClient()}.
+	 *
+	 * @see #reactiveMongoClient()
+	 * @see #reactiveMongoTemplate()
+	 * @return never {@literal null}.
+	 */
+	@Bean
+	public ReactiveMongoDatabaseFactory reactiveMongoDbFactory() {
+		return new SimpleReactiveMongoDatabaseFactory(reactiveMongoClient(), getDatabaseName());
+	}
+
+	/**
+	 * Creates a {@link MappingMongoConverter} using the configured {@link #reactiveMongoDbFactory()} and
+	 * {@link #mongoMappingContext()}. Will get {@link #customConversions()} applied.
+	 *
+	 * @see #customConversions()
+	 * @see #mongoMappingContext()
+	 * @see #reactiveMongoDbFactory()
+	 * @return never {@literal null}.
+	 * @throws Exception
+	 */
+	@Bean
+	public MappingMongoConverter mappingMongoConverter() throws Exception {
+
+		MappingMongoConverter converter = new MappingMongoConverter(ReactiveMongoTemplate.NO_OP_REF_RESOLVER,
+				mongoMappingContext());
+		converter.setCustomConversions(customConversions());
+
+		return converter;
+	}
+}

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

@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2011 by the original author(s).
+ * Copyright 2011-2017 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.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,17 +13,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.mongodb.config;
 
 /**
- * @author Jon Brisbin <jbrisbin@vmware.com>
+ * Constants to declare bean names used by the namespace configuration.
+ * 
+ * @author Jon Brisbin
+ * @author Oliver Gierke
+ * @author Martin Baumgartner
+ * @author Christoph Strobl
  */
 public abstract class BeanNames {
 
-	static final String MAPPING_CONTEXT = "mappingContext";
-	static final String INDEX_HELPER = "indexCreationHelper";
-	static final String MONGO = "mongo";
-	static final String DB_FACTORY = "mongoDbFactory";
-	static final String VALIDATING_EVENT_LISTENER = "validatingMongoEventListener";
+	public static final String MAPPING_CONTEXT_BEAN_NAME = "mongoMappingContext";
+
+	static final String INDEX_HELPER_BEAN_NAME = "indexCreationHelper";
+	static final String MONGO_BEAN_NAME = "mongoClient";
+	static final String DB_FACTORY_BEAN_NAME = "mongoDbFactory";
+	static final String VALIDATING_EVENT_LISTENER_BEAN_NAME = "validatingMongoEventListener";
+	static final String IS_NEW_STRATEGY_FACTORY_BEAN_NAME = "isNewStrategyFactory";
+	static final String DEFAULT_CONVERTER_BEAN_NAME = "mappingConverter";
+	static final String MONGO_TEMPLATE_BEAN_NAME = "mongoTemplate";
+	static final String GRID_FS_TEMPLATE_BEAN_NAME = "gridFsTemplate";
 }

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

@@ -0,0 +1,70 @@
+/*
+ * Copyright 2013 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.config;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.context.annotation.Import;
+import org.springframework.data.auditing.DateTimeProvider;
+import org.springframework.data.domain.AuditorAware;
+
+/**
+ * Annotation to enable auditing in MongoDB via annotation configuration.
+ * 
+ * @author Thomas Darimont
+ * @author Oliver Gierke
+ */
+@Inherited
+@Documented
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Import(MongoAuditingRegistrar.class)
+public @interface EnableMongoAuditing {
+
+	/**
+	 * Configures the {@link AuditorAware} bean to be used to lookup the current principal.
+	 * 
+	 * @return
+	 */
+	String auditorAwareRef() default "";
+
+	/**
+	 * Configures whether the creation and modification dates are set. Defaults to {@literal true}.
+	 * 
+	 * @return
+	 */
+	boolean setDates() default true;
+
+	/**
+	 * Configures whether the entity shall be marked as modified on creation. Defaults to {@literal true}.
+	 * 
+	 * @return
+	 */
+	boolean modifyOnCreate() default true;
+
+	/**
+	 * Configures a {@link DateTimeProvider} bean name that allows customizing the {@link org.joda.time.DateTime} to be
+	 * used for setting creation and modification dates.
+	 * 
+	 * @return
+	 */
+	String dateTimeProviderRef() default "";
+}

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

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015-2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.data.mongodb.core.geo.GeoJsonModule;
+import org.springframework.data.web.config.SpringDataJacksonModules;
+
+/**
+ * Configuration class to expose {@link GeoJsonModule} as a Spring bean.
+ * 
+ * @author Oliver Gierke
+ * @author Jens Schauder
+ */
+public class GeoJsonConfiguration implements SpringDataJacksonModules {
+
+	@Bean
+	public GeoJsonModule geoJsonModule() {
+		return new GeoJsonModule();
+	}
+}

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

@@ -0,0 +1,83 @@
+/*
+ * Copyright 2013-2014 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.config;
+
+import org.springframework.beans.factory.BeanDefinitionStoreException;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
+import org.springframework.beans.factory.xml.BeanDefinitionParser;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.data.config.BeanComponentDefinitionBuilder;
+import org.springframework.data.mongodb.gridfs.GridFsTemplate;
+import org.springframework.util.StringUtils;
+import org.w3c.dom.Element;
+
+/**
+ * {@link BeanDefinitionParser} to parse {@code gridFsTemplate} elements into {@link BeanDefinition}s.
+ * 
+ * @author Martin Baumgartner
+ */
+class GridFsTemplateParser extends AbstractBeanDefinitionParser {
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#resolveId(org.w3c.dom.Element, org.springframework.beans.factory.support.AbstractBeanDefinition, org.springframework.beans.factory.xml.ParserContext)
+	 */
+	@Override
+	protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext)
+			throws BeanDefinitionStoreException {
+
+		String id = super.resolveId(element, definition, parserContext);
+		return StringUtils.hasText(id) ? id : BeanNames.GRID_FS_TEMPLATE_BEAN_NAME;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#parseInternal(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext)
+	 */
+	@Override
+	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
+
+		BeanComponentDefinitionBuilder helper = new BeanComponentDefinitionBuilder(element, parserContext);
+
+		String converterRef = element.getAttribute("converter-ref");
+		String dbFactoryRef = element.getAttribute("db-factory-ref");
+		String bucket = element.getAttribute("bucket");
+
+		BeanDefinitionBuilder gridFsTemplateBuilder = BeanDefinitionBuilder.genericBeanDefinition(GridFsTemplate.class);
+
+		if (StringUtils.hasText(dbFactoryRef)) {
+			gridFsTemplateBuilder.addConstructorArgReference(dbFactoryRef);
+		} else {
+			gridFsTemplateBuilder.addConstructorArgReference(BeanNames.DB_FACTORY_BEAN_NAME);
+		}
+
+		if (StringUtils.hasText(converterRef)) {
+			gridFsTemplateBuilder.addConstructorArgReference(converterRef);
+		} else {
+			gridFsTemplateBuilder.addConstructorArgReference(BeanNames.DEFAULT_CONVERTER_BEAN_NAME);
+		}
+
+		if (StringUtils.hasText(bucket)) {
+			gridFsTemplateBuilder.addConstructorArgValue(bucket);
+		}
+
+		return (AbstractBeanDefinition) helper.getComponentIdButFallback(gridFsTemplateBuilder, BeanNames.GRID_FS_TEMPLATE_BEAN_NAME)
+				.getBeanDefinition();
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ * Copyright 2011-2017 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.
@@ -24,12 +24,13 @@ import java.util.List;
 import java.util.Set;
 
 import org.springframework.beans.BeanMetadataElement;
-import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.parsing.BeanComponentDefinition;
+import org.springframework.beans.factory.parsing.CompositeComponentDefinition;
+import org.springframework.beans.factory.parsing.ReaderContext;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -38,6 +39,7 @@ import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.support.ManagedSet;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
+import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
 import org.springframework.core.convert.converter.Converter;
@@ -48,8 +50,12 @@ import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.core.type.filter.AssignableTypeFilter;
 import org.springframework.core.type.filter.TypeFilter;
 import org.springframework.data.annotation.Persistent;
-import org.springframework.data.mongodb.core.convert.CustomConversions;
+import org.springframework.data.config.BeanComponentDefinitionBuilder;
+import org.springframework.data.mapping.context.MappingContextIsNewStrategyFactory;
+import org.springframework.data.mapping.model.CamelCaseAbbreviatingFieldNamingStrategy;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.index.MongoPersistentEntityIndexCreator;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
@@ -62,35 +68,44 @@ import org.w3c.dom.Element;
 
 /**
  * Bean definition parser for the {@code mapping-converter} element.
- * 
+ *
  * @author Jon Brisbin
  * @author Oliver Gierke
  * @author Maciej Walkowiak
+ * @author Thomas Darimont
+ * @author Christoph Strobl
+ * @author Mark Paluch
  */
-public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
+public class MappingMongoConverterParser implements BeanDefinitionParser {
 
 	private static final String BASE_PACKAGE = "base-package";
-	private static final boolean jsr303Present = ClassUtils.isPresent("javax.validation.Validator",
+	private static final boolean JSR_303_PRESENT = ClassUtils.isPresent("javax.validation.Validator",
 			MappingMongoConverterParser.class.getClassLoader());
 
-	@Override
-	protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext)
-			throws BeanDefinitionStoreException {
-		String id = super.resolveId(element, definition, parserContext);
-		return StringUtils.hasText(id) ? id : "mappingConverter";
-	}
+	/* (non-Javadoc)
+	 * @see org.springframework.beans.factory.xml.BeanDefinitionParser#parse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext)
+	 */
+	public BeanDefinition parse(Element element, ParserContext parserContext) {
+
+		if (parserContext.isNested()) {
+			parserContext.getReaderContext().error("Mongo Converter must not be defined as nested bean.", element);
+		}
 
-	@Override
-	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
 		BeanDefinitionRegistry registry = parserContext.getRegistry();
+		String id = element.getAttribute(AbstractBeanDefinitionParser.ID_ATTRIBUTE);
+		id = StringUtils.hasText(id) ? id : DEFAULT_CONVERTER_BEAN_NAME;
+
+		parserContext.pushContainingComponent(new CompositeComponentDefinition("Mapping Mongo Converter", element));
 
 		BeanDefinition conversionsDefinition = getCustomConversions(element, parserContext);
-		String ctxRef = potentiallyCreateMappingContext(element, parserContext, conversionsDefinition);
+		String ctxRef = potentiallyCreateMappingContext(element, parserContext, conversionsDefinition, id);
+
+		createIsNewStrategyFactoryBeanDefinition(ctxRef, parserContext, element);
 
 		// Need a reference to a Mongo instance
 		String dbFactoryRef = element.getAttribute("db-factory-ref");
 		if (!StringUtils.hasText(dbFactoryRef)) {
-			dbFactoryRef = DB_FACTORY;
+			dbFactoryRef = DB_FACTORY_BEAN_NAME;
 		}
 
 		// Converter
@@ -98,30 +113,50 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 		converterBuilder.addConstructorArgReference(dbFactoryRef);
 		converterBuilder.addConstructorArgReference(ctxRef);
 
+		String typeMapperRef = element.getAttribute("type-mapper-ref");
+		if (StringUtils.hasText(typeMapperRef)) {
+			converterBuilder.addPropertyReference("typeMapper", typeMapperRef);
+		}
+
 		if (conversionsDefinition != null) {
 			converterBuilder.addPropertyValue("customConversions", conversionsDefinition);
 		}
 
+		if (!registry.containsBeanDefinition("indexOperationsProvider")) {
+
+			BeanDefinitionBuilder indexOperationsProviderBuilder = BeanDefinitionBuilder
+					.genericBeanDefinition("org.springframework.data.mongodb.core.DefaultIndexOperationsProvider");
+			indexOperationsProviderBuilder.addConstructorArgReference(dbFactoryRef);
+			indexOperationsProviderBuilder.addConstructorArgValue(BeanDefinitionBuilder
+					.genericBeanDefinition(QueryMapper.class).addConstructorArgReference(id).getBeanDefinition());
+			parserContext.registerBeanComponent(
+					new BeanComponentDefinition(indexOperationsProviderBuilder.getBeanDefinition(), "indexOperationsProvider"));
+		}
+
 		try {
-			registry.getBeanDefinition(INDEX_HELPER);
+			registry.getBeanDefinition(INDEX_HELPER_BEAN_NAME);
 		} catch (NoSuchBeanDefinitionException ignored) {
-			if (!StringUtils.hasText(dbFactoryRef)) {
-				dbFactoryRef = DB_FACTORY;
-			}
+
 			BeanDefinitionBuilder indexHelperBuilder = BeanDefinitionBuilder
 					.genericBeanDefinition(MongoPersistentEntityIndexCreator.class);
-			indexHelperBuilder.addConstructorArgValue(new RuntimeBeanReference(ctxRef));
-			indexHelperBuilder.addConstructorArgValue(new RuntimeBeanReference(dbFactoryRef));
-			registry.registerBeanDefinition(INDEX_HELPER, indexHelperBuilder.getBeanDefinition());
+			indexHelperBuilder.addConstructorArgReference(ctxRef);
+			indexHelperBuilder.addConstructorArgReference("indexOperationsProvider");
+			indexHelperBuilder.addDependsOn(ctxRef);
+
+			parserContext.registerBeanComponent(
+					new BeanComponentDefinition(indexHelperBuilder.getBeanDefinition(), INDEX_HELPER_BEAN_NAME));
 		}
 
 		BeanDefinition validatingMongoEventListener = potentiallyCreateValidatingMongoEventListener(element, parserContext);
 
 		if (validatingMongoEventListener != null) {
-			registry.registerBeanDefinition(VALIDATING_EVENT_LISTENER, validatingMongoEventListener);
+			parserContext.registerBeanComponent(
+					new BeanComponentDefinition(validatingMongoEventListener, VALIDATING_EVENT_LISTENER_BEAN_NAME));
 		}
 
-		return converterBuilder.getBeanDefinition();
+		parserContext.registerBeanComponent(new BeanComponentDefinition(converterBuilder.getBeanDefinition(), id));
+		parserContext.popAndRegisterContainingComponent();
+		return null;
 	}
 
 	private BeanDefinition potentiallyCreateValidatingMongoEventListener(Element element, ParserContext parserContext) {
@@ -135,7 +170,6 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 			RuntimeBeanReference validator = getValidator(builder, parserContext);
 
 			if (validator != null) {
-
 				builder.getRawBeanDefinition().setBeanClass(ValidatingMongoEventListener.class);
 				builder.addConstructorArgValue(validator);
 
@@ -148,7 +182,7 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 
 	private RuntimeBeanReference getValidator(Object source, ParserContext parserContext) {
 
-		if (!jsr303Present) {
+		if (!JSR_303_PRESENT) {
 			return null;
 		}
 
@@ -157,39 +191,77 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 		validatorDef.setSource(source);
 		validatorDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
 		String validatorName = parserContext.getReaderContext().registerWithGeneratedName(validatorDef);
-		parserContext.registerComponent(new BeanComponentDefinition(validatorDef, validatorName));
+		parserContext.registerBeanComponent(new BeanComponentDefinition(validatorDef, validatorName));
 
 		return new RuntimeBeanReference(validatorName);
 	}
 
-	private String potentiallyCreateMappingContext(Element element, ParserContext parserContext,
-			BeanDefinition conversionsDefinition) {
+	public static String potentiallyCreateMappingContext(Element element, ParserContext parserContext,
+			BeanDefinition conversionsDefinition, String converterId) {
 
 		String ctxRef = element.getAttribute("mapping-context-ref");
-		if (!StringUtils.hasText(ctxRef)) {
-			BeanDefinitionBuilder mappingContextBuilder = BeanDefinitionBuilder
-					.genericBeanDefinition(MongoMappingContext.class);
 
-			Set<String> classesToAdd = getInititalEntityClasses(element, mappingContextBuilder);
-			if (classesToAdd != null) {
-				mappingContextBuilder.addPropertyValue("initialEntitySet", classesToAdd);
-			}
-
-			if (conversionsDefinition != null) {
-				AbstractBeanDefinition simpleTypesDefinition = new GenericBeanDefinition();
-				simpleTypesDefinition.setFactoryBeanName("customConversions");
-				simpleTypesDefinition.setFactoryMethodName("getSimpleTypeHolder");
-
-				mappingContextBuilder.addPropertyValue("simpleTypeHolder", simpleTypesDefinition);
-			}
-
-			parserContext.getRegistry().registerBeanDefinition(MAPPING_CONTEXT, mappingContextBuilder.getBeanDefinition());
-			ctxRef = MAPPING_CONTEXT;
+		if (StringUtils.hasText(ctxRef)) {
+			return ctxRef;
 		}
 
+		BeanComponentDefinitionBuilder componentDefinitionBuilder = new BeanComponentDefinitionBuilder(element,
+				parserContext);
+
+		BeanDefinitionBuilder mappingContextBuilder = BeanDefinitionBuilder
+				.genericBeanDefinition(MongoMappingContext.class);
+
+		Set<String> classesToAdd = getInititalEntityClasses(element);
+
+		if (classesToAdd != null) {
+			mappingContextBuilder.addPropertyValue("initialEntitySet", classesToAdd);
+		}
+
+		if (conversionsDefinition != null) {
+			AbstractBeanDefinition simpleTypesDefinition = new GenericBeanDefinition();
+			simpleTypesDefinition.setFactoryBeanName("customConversions");
+			simpleTypesDefinition.setFactoryMethodName("getSimpleTypeHolder");
+
+			mappingContextBuilder.addPropertyValue("simpleTypeHolder", simpleTypesDefinition);
+		}
+
+		parseFieldNamingStrategy(element, parserContext.getReaderContext(), mappingContextBuilder);
+
+		ctxRef = converterId == null || DEFAULT_CONVERTER_BEAN_NAME.equals(converterId) ? MAPPING_CONTEXT_BEAN_NAME
+				: converterId + "." + MAPPING_CONTEXT_BEAN_NAME;
+
+		parserContext.registerBeanComponent(componentDefinitionBuilder.getComponent(mappingContextBuilder, ctxRef));
 		return ctxRef;
 	}
 
+	private static void parseFieldNamingStrategy(Element element, ReaderContext context, BeanDefinitionBuilder builder) {
+
+		String abbreviateFieldNames = element.getAttribute("abbreviate-field-names");
+		String fieldNamingStrategy = element.getAttribute("field-naming-strategy-ref");
+
+		boolean fieldNamingStrategyReferenced = StringUtils.hasText(fieldNamingStrategy);
+		boolean abbreviationActivated = StringUtils.hasText(abbreviateFieldNames)
+				&& Boolean.parseBoolean(abbreviateFieldNames);
+
+		if (fieldNamingStrategyReferenced && abbreviationActivated) {
+			context.error("Field name abbreviation cannot be activated if a field-naming-strategy-ref is configured!",
+					element);
+			return;
+		}
+
+		Object value = null;
+
+		if ("true".equals(abbreviateFieldNames)) {
+			value = new RootBeanDefinition(CamelCaseAbbreviatingFieldNamingStrategy.class);
+		} else if (fieldNamingStrategyReferenced) {
+			value = new RuntimeBeanReference(fieldNamingStrategy);
+		}
+
+		if (value != null) {
+			builder.addPropertyValue("fieldNamingStrategy", value);
+		}
+	}
+
 	private BeanDefinition getCustomConversions(Element element, ParserContext parserContext) {
 
 		List<Element> customConvertersElements = DomUtils.getChildElementsByTagName(element, "custom-converters");
@@ -218,13 +290,13 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 				}
 			}
 
-			BeanDefinitionBuilder conversionsBuilder = BeanDefinitionBuilder.rootBeanDefinition(CustomConversions.class);
+			BeanDefinitionBuilder conversionsBuilder = BeanDefinitionBuilder.rootBeanDefinition(MongoCustomConversions.class);
 			conversionsBuilder.addConstructorArgValue(converterBeans);
 
 			AbstractBeanDefinition conversionsBean = conversionsBuilder.getBeanDefinition();
 			conversionsBean.setSource(parserContext.extractSource(element));
 
-			parserContext.getRegistry().registerBeanDefinition("customConversions", conversionsBean);
+			parserContext.registerBeanComponent(new BeanComponentDefinition(conversionsBean, "customConversions"));
 
 			return conversionsBean;
 		}
@@ -232,7 +304,7 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 		return null;
 	}
 
-	public Set<String> getInititalEntityClasses(Element element, BeanDefinitionBuilder builder) {
+	private static Set<String> getInititalEntityClasses(Element element) {
 
 		String basePackage = element.getAttribute(BASE_PACKAGE);
 
@@ -266,14 +338,28 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 			return beanDef;
 		}
 
-		parserContext.getReaderContext().error(
-				"Element <converter> must specify 'ref' or contain a bean definition for the converter", element);
+		parserContext.getReaderContext()
+				.error("Element <converter> must specify 'ref' or contain a bean definition for the converter", element);
 		return null;
 	}
 
+	public static String createIsNewStrategyFactoryBeanDefinition(String mappingContextRef, ParserContext context,
+			Element element) {
+
+		BeanDefinitionBuilder mappingContextStrategyFactoryBuilder = BeanDefinitionBuilder
+				.rootBeanDefinition(MappingContextIsNewStrategyFactory.class);
+		mappingContextStrategyFactoryBuilder.addConstructorArgReference(mappingContextRef);
+
+		BeanComponentDefinitionBuilder builder = new BeanComponentDefinitionBuilder(element, context);
+		context.registerBeanComponent(
+				builder.getComponent(mappingContextStrategyFactoryBuilder, IS_NEW_STRATEGY_FACTORY_BEAN_NAME));
+
+		return IS_NEW_STRATEGY_FACTORY_BEAN_NAME;
+	}
+
 	/**
 	 * {@link TypeFilter} that returns {@literal false} in case any of the given delegates matches.
-	 * 
+	 *
 	 * @author Oliver Gierke
 	 */
 	private static class NegatingFilter implements TypeFilter {
@@ -282,11 +368,13 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 
 		/**
 		 * Creates a new {@link NegatingFilter} with the given delegates.
-		 * 
+		 *
 		 * @param filters
 		 */
 		public NegatingFilter(TypeFilter... filters) {
-			Assert.notNull(filters);
+
+			Assert.notNull(filters, "TypeFilters must not be null");
+
 			this.delegates = new HashSet<TypeFilter>(Arrays.asList(filters));
 		}
 
@@ -294,7 +382,8 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 		 * (non-Javadoc)
 		 * @see org.springframework.core.type.filter.TypeFilter#match(org.springframework.core.type.classreading.MetadataReader, org.springframework.core.type.classreading.MetadataReaderFactory)
 		 */
-		public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory) throws IOException {
+		public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory)
+				throws IOException {
 
 			for (TypeFilter delegate : delegates) {
 				if (delegate.match(metadataReader, metadataReaderFactory)) {

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

@@ -0,0 +1,86 @@
+/*
+ * Copyright 2012-2014 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.config;
+
+import static org.springframework.data.config.ParsingUtils.*;
+import static org.springframework.data.mongodb.config.BeanNames.*;
+
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.support.RootBeanDefinition;
+import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
+import org.springframework.beans.factory.xml.BeanDefinitionParser;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.data.auditing.config.IsNewAwareAuditingHandlerBeanDefinitionParser;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.event.AuditingEventListener;
+import org.springframework.util.StringUtils;
+import org.w3c.dom.Element;
+
+/**
+ * {@link BeanDefinitionParser} to register a {@link AuditingEventListener} to transparently set auditing information on
+ * an entity.
+ * 
+ * @author Oliver Gierke
+ */
+public class MongoAuditingBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser#getBeanClass(org.w3c.dom.Element)
+	 */
+	@Override
+	protected Class<?> getBeanClass(Element element) {
+		return AuditingEventListener.class;
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#shouldGenerateId()
+	 */
+	@Override
+	protected boolean shouldGenerateId() {
+		return true;
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser#doParse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext, org.springframework.beans.factory.support.BeanDefinitionBuilder)
+	 */
+	@Override
+	protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
+
+		String mappingContextRef = element.getAttribute("mapping-context-ref");
+
+		if (!StringUtils.hasText(mappingContextRef)) {
+
+			BeanDefinitionRegistry registry = parserContext.getRegistry();
+
+			if (!registry.containsBeanDefinition(MAPPING_CONTEXT_BEAN_NAME)) {
+				registry.registerBeanDefinition(MAPPING_CONTEXT_BEAN_NAME, new RootBeanDefinition(MongoMappingContext.class));
+			}
+
+			mappingContextRef = MAPPING_CONTEXT_BEAN_NAME;
+		}
+
+		IsNewAwareAuditingHandlerBeanDefinitionParser parser = new IsNewAwareAuditingHandlerBeanDefinitionParser(
+				mappingContextRef);
+		parser.parse(element, parserContext);
+
+		builder.addConstructorArgValue(getObjectFactoryBeanDefinition(parser.getResolvedBeanName(),
+				parserContext.extractSource(element)));
+	}
+}

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

@@ -0,0 +1,162 @@
+/*
+ * Copyright 2013-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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.config;
+
+import java.lang.annotation.Annotation;
+
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
+import org.springframework.core.type.AnnotationMetadata;
+import org.springframework.data.auditing.IsNewAwareAuditingHandler;
+import org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport;
+import org.springframework.data.auditing.config.AuditingConfiguration;
+import org.springframework.data.config.ParsingUtils;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.mongodb.core.mapping.event.AuditingEventListener;
+import org.springframework.util.Assert;
+
+/**
+ * {@link ImportBeanDefinitionRegistrar} to enable {@link EnableMongoAuditing} annotation.
+ * 
+ * @author Thomas Darimont
+ * @author Oliver Gierke
+ */
+class MongoAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#getAnnotation()
+	 */
+	@Override
+	protected Class<? extends Annotation> getAnnotation() {
+		return EnableMongoAuditing.class;
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#getAuditingHandlerBeanName()
+	 */
+	@Override
+	protected String getAuditingHandlerBeanName() {
+		return "mongoAuditingHandler";
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#registerBeanDefinitions(org.springframework.core.type.AnnotationMetadata, org.springframework.beans.factory.support.BeanDefinitionRegistry)
+	 */
+	@Override
+	public void registerBeanDefinitions(AnnotationMetadata annotationMetadata, BeanDefinitionRegistry registry) {
+
+		Assert.notNull(annotationMetadata, "AnnotationMetadata must not be null!");
+		Assert.notNull(registry, "BeanDefinitionRegistry must not be null!");
+
+		super.registerBeanDefinitions(annotationMetadata, registry);
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#getAuditHandlerBeanDefinitionBuilder(org.springframework.data.auditing.config.AuditingConfiguration)
+	 */
+	@Override
+	protected BeanDefinitionBuilder getAuditHandlerBeanDefinitionBuilder(AuditingConfiguration configuration) {
+
+		Assert.notNull(configuration, "AuditingConfiguration must not be null!");
+
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(IsNewAwareAuditingHandler.class);
+
+		BeanDefinitionBuilder definition = BeanDefinitionBuilder.genericBeanDefinition(MongoMappingContextLookup.class);
+		definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_CONSTRUCTOR);
+
+		builder.addConstructorArgValue(definition.getBeanDefinition());
+		return configureDefaultAuditHandlerAttributes(configuration, builder);
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#registerAuditListener(org.springframework.beans.factory.config.BeanDefinition, org.springframework.beans.factory.support.BeanDefinitionRegistry)
+	 */
+	@Override
+	protected void registerAuditListenerBeanDefinition(BeanDefinition auditingHandlerDefinition,
+			BeanDefinitionRegistry registry) {
+
+		Assert.notNull(auditingHandlerDefinition, "BeanDefinition must not be null!");
+		Assert.notNull(registry, "BeanDefinitionRegistry must not be null!");
+
+		BeanDefinitionBuilder listenerBeanDefinitionBuilder = BeanDefinitionBuilder
+				.rootBeanDefinition(AuditingEventListener.class);
+		listenerBeanDefinitionBuilder
+				.addConstructorArgValue(ParsingUtils.getObjectFactoryBeanDefinition(getAuditingHandlerBeanName(), registry));
+
+		registerInfrastructureBeanWithId(listenerBeanDefinitionBuilder.getBeanDefinition(),
+				AuditingEventListener.class.getName(), registry);
+	}
+
+	/**
+	 * Simple helper to be able to wire the {@link MappingContext} from a {@link MappingMongoConverter} bean available in
+	 * the application context.
+	 *
+	 * @author Oliver Gierke
+	 */
+	static class MongoMappingContextLookup
+			implements FactoryBean<MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty>> {
+
+		private final MappingMongoConverter converter;
+
+		/**
+		 * Creates a new {@link MongoMappingContextLookup} for the given {@link MappingMongoConverter}.
+		 * 
+		 * @param converter must not be {@literal null}.
+		 */
+		public MongoMappingContextLookup(MappingMongoConverter converter) {
+			this.converter = converter;
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.beans.factory.FactoryBean#getObject()
+		 */
+		@Override
+		public MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> getObject() throws Exception {
+			return converter.getMappingContext();
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.beans.factory.FactoryBean#getObjectType()
+		 */
+		@Override
+		public Class<?> getObjectType() {
+			return MappingContext.class;
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.beans.factory.FactoryBean#isSingleton()
+		 */
+		@Override
+		public boolean isSingleton() {
+			return true;
+		}
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ * Copyright 2015 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.
@@ -15,29 +15,25 @@
  */
 package org.springframework.data.mongodb.config;
 
-import java.util.Map;
-
 import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.CustomEditorConfigurer;
 import org.springframework.beans.factory.parsing.BeanComponentDefinition;
 import org.springframework.beans.factory.parsing.CompositeComponentDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.ManagedMap;
 import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.data.config.BeanComponentDefinitionBuilder;
 import org.springframework.data.config.ParsingUtils;
-import org.springframework.data.mongodb.core.MongoFactoryBean;
+import org.springframework.data.mongodb.core.MongoClientFactoryBean;
 import org.springframework.util.StringUtils;
 import org.w3c.dom.Element;
 
 /**
- * Parser for <mongo;gt; definitions.
+ * Parser for {@code mongo-client} definitions.
  * 
- * @author Mark Pollack
- * @author Oliver Gierke
+ * @author Christoph Strobl
+ * @since 1.7
  */
-public class MongoParser implements BeanDefinitionParser {
+public class MongoClientParser implements BeanDefinitionParser {
 
 	/* 
 	 * (non-Javadoc)
@@ -50,44 +46,40 @@ public class MongoParser implements BeanDefinitionParser {
 
 		BeanComponentDefinitionBuilder helper = new BeanComponentDefinitionBuilder(element, parserContext);
 
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MongoFactoryBean.class);
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MongoClientFactoryBean.class);
+
 		ParsingUtils.setPropertyValue(builder, element, "port", "port");
 		ParsingUtils.setPropertyValue(builder, element, "host", "host");
-		ParsingUtils.setPropertyValue(builder, element, "write-concern", "writeConcern");
+		ParsingUtils.setPropertyValue(builder, element, "credentials", "credentials");
 
-		MongoParsingUtils.parseMongoOptions(element, builder);
+		MongoParsingUtils.parseMongoClientOptions(element, builder);
 		MongoParsingUtils.parseReplicaSet(element, builder);
 
-		String defaultedId = StringUtils.hasText(id) ? id : BeanNames.MONGO;
+		String defaultedId = StringUtils.hasText(id) ? id : BeanNames.MONGO_BEAN_NAME;
 
 		parserContext.pushContainingComponent(new CompositeComponentDefinition("Mongo", source));
 
 		BeanComponentDefinition mongoComponent = helper.getComponent(builder, defaultedId);
 		parserContext.registerBeanComponent(mongoComponent);
-		BeanComponentDefinition serverAddressPropertyEditor = helper.getComponent(registerServerAddressPropertyEditor());
+
+		BeanComponentDefinition serverAddressPropertyEditor = helper.getComponent(MongoParsingUtils
+				.getServerAddressPropertyEditorBuilder());
 		parserContext.registerBeanComponent(serverAddressPropertyEditor);
-		BeanComponentDefinition writeConcernPropertyEditor = helper.getComponent(MongoParsingUtils
+
+		BeanComponentDefinition writeConcernEditor = helper.getComponent(MongoParsingUtils
 				.getWriteConcernPropertyEditorBuilder());
-		parserContext.registerBeanComponent(writeConcernPropertyEditor);
+		parserContext.registerBeanComponent(writeConcernEditor);
+
+		BeanComponentDefinition readPreferenceEditor = helper.getComponent(MongoParsingUtils
+				.getReadPreferencePropertyEditorBuilder());
+		parserContext.registerBeanComponent(readPreferenceEditor);
+
+		BeanComponentDefinition credentialsEditor = helper.getComponent(MongoParsingUtils
+				.getMongoCredentialPropertyEditor());
+		parserContext.registerBeanComponent(credentialsEditor);
 
 		parserContext.popAndRegisterContainingComponent();
 
 		return mongoComponent.getBeanDefinition();
 	}
-
-	/**
-	 * One should only register one bean definition but want to have the convenience of using
-	 * AbstractSingleBeanDefinitionParser but have the side effect of registering a 'default' property editor with the
-	 * container.
-	 */
-	private BeanDefinitionBuilder registerServerAddressPropertyEditor() {
-
-		Map<String, String> customEditors = new ManagedMap<String, String>();
-		customEditors.put("com.mongodb.ServerAddress[]",
-				"org.springframework.data.mongodb.config.ServerAddressPropertyEditor");
-
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CustomEditorConfigurer.class);
-		builder.addPropertyValue("customEditors", customEditors);
-		return builder;
-	}
 }

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

@@ -0,0 +1,193 @@
+/*
+ * Copyright 2016-2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.config;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.core.type.filter.AnnotationTypeFilter;
+import org.springframework.data.annotation.Persistent;
+import org.springframework.data.convert.CustomConversions;
+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;
+import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
+import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.support.CachingIsNewStrategyFactory;
+import org.springframework.data.support.IsNewStrategyFactory;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.StringUtils;
+
+/**
+ * Base class for Spring Data MongoDB to be extended for JavaConfiguration usage.
+ *
+ * @author Mark Paluch
+ * @since 2.0
+ */
+public abstract class MongoConfigurationSupport {
+
+	/**
+	 * Return the name of the database to connect to.
+	 *
+	 * @return must not be {@literal null}.
+	 */
+	protected abstract String getDatabaseName();
+
+	/**
+	 * Returns the base packages to scan for MongoDB mapped entities at startup. Will return the package name of the
+	 * configuration class' (the concrete class, not this one here) by default. So if you have a
+	 * {@code com.acme.AppConfig} extending {@link MongoConfigurationSupport} the base package will be considered
+	 * {@code com.acme} unless the method is overridden to implement alternate behavior.
+	 *
+	 * @return the base packages to scan for mapped {@link Document} classes or an empty collection to not enable scanning
+	 *         for entities.
+	 * @since 1.10
+	 */
+	protected Collection<String> getMappingBasePackages() {
+
+		Package mappingBasePackage = getClass().getPackage();
+		return Collections.singleton(mappingBasePackage == null ? null : mappingBasePackage.getName());
+	}
+
+	/**
+	 * Creates a {@link MongoMappingContext} equipped with entity classes scanned from the mapping base package.
+	 *
+	 * @see #getMappingBasePackages()
+	 * @return
+	 * @throws ClassNotFoundException
+	 */
+	@Bean
+	public MongoMappingContext mongoMappingContext() throws ClassNotFoundException {
+
+		MongoMappingContext mappingContext = new MongoMappingContext();
+		mappingContext.setInitialEntitySet(getInitialEntitySet());
+		mappingContext.setSimpleTypeHolder(customConversions().getSimpleTypeHolder());
+		mappingContext.setFieldNamingStrategy(fieldNamingStrategy());
+
+		return mappingContext;
+	}
+
+	/**
+	 * Returns a {@link MappingContextIsNewStrategyFactory} wrapped into a {@link CachingIsNewStrategyFactory}.
+	 *
+	 * @return
+	 * @throws ClassNotFoundException
+	 */
+	@Bean
+	public IsNewStrategyFactory isNewStrategyFactory() throws ClassNotFoundException {
+
+		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 MongoCustomConversions} instance by default.
+	 *
+	 * @return must not be {@literal null}.
+	 */
+	@Bean
+	public CustomConversions customConversions() {
+		return new MongoCustomConversions(Collections.emptyList());
+	}
+
+	/**
+	 * 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
+	 */
+	protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
+
+		Set<Class<?>> initialEntitySet = new HashSet<Class<?>>();
+
+		for (String basePackage : getMappingBasePackages()) {
+			initialEntitySet.addAll(scanForEntities(basePackage));
+		}
+
+		return initialEntitySet;
+	}
+
+	/**
+	 * 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
+	 * @since 1.10
+	 */
+	protected Set<Class<?>> scanForEntities(String basePackage) throws ClassNotFoundException {
+
+		if (!StringUtils.hasText(basePackage)) {
+			return Collections.emptySet();
+		}
+
+		Set<Class<?>> initialEntitySet = new HashSet<Class<?>>();
+
+		if (StringUtils.hasText(basePackage)) {
+
+			ClassPathScanningCandidateComponentProvider componentProvider = new ClassPathScanningCandidateComponentProvider(
+					false);
+			componentProvider.addIncludeFilter(new AnnotationTypeFilter(Document.class));
+			componentProvider.addIncludeFilter(new AnnotationTypeFilter(Persistent.class));
+
+			for (BeanDefinition candidate : componentProvider.findCandidateComponents(basePackage)) {
+
+				initialEntitySet
+						.add(ClassUtils.forName(candidate.getBeanClassName(), MongoConfigurationSupport.class.getClassLoader()));
+			}
+		}
+
+		return initialEntitySet;
+	}
+
+	/**
+	 * 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() {
+		return false;
+	}
+
+	/**
+	 * Configures a {@link FieldNamingStrategy} on the {@link MongoMappingContext} instance created.
+	 *
+	 * @return
+	 * @since 1.5
+	 */
+	protected FieldNamingStrategy fieldNamingStrategy() {
+		return abbreviateFieldNames() ? new CamelCaseAbbreviatingFieldNamingStrategy()
+				: PropertyNameFieldNamingStrategy.INSTANCE;
+	}
+}

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

@@ -0,0 +1,214 @@
+/*
+ * Copyright 2015-2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.config;
+
+import java.beans.PropertyEditorSupport;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Properties;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.springframework.lang.Nullable;
+import org.springframework.util.StringUtils;
+
+import com.mongodb.MongoCredential;
+
+/**
+ * Parse a {@link String} to a Collection of {@link MongoCredential}.
+ *
+ * @author Christoph Strobl
+ * @author Oliver Gierke
+ * @since 1.7
+ */
+public class MongoCredentialPropertyEditor extends PropertyEditorSupport {
+
+	private static final Pattern GROUP_PATTERN = Pattern.compile("(\\\\?')(.*?)\\1");
+
+	private static final String AUTH_MECHANISM_KEY = "uri.authMechanism";
+	private static final String USERNAME_PASSWORD_DELIMITER = ":";
+	private static final String DATABASE_DELIMITER = "@";
+	private static final String OPTIONS_DELIMITER = "?";
+	private static final String OPTION_VALUE_DELIMITER = "&";
+
+	/*
+	 * (non-Javadoc)
+	 * @see java.beans.PropertyEditorSupport#setAsText(java.lang.String)
+	 */
+	@Override
+	public void setAsText(@Nullable String text) throws IllegalArgumentException {
+
+		if (!StringUtils.hasText(text)) {
+			return;
+		}
+
+		List<MongoCredential> credentials = new ArrayList<>();
+
+		for (String credentialString : extractCredentialsString(text)) {
+
+			String[] userNameAndPassword = extractUserNameAndPassword(credentialString);
+			String database = extractDB(credentialString);
+			Properties options = extractOptions(credentialString);
+
+			if (!options.isEmpty()) {
+
+				if (options.containsKey(AUTH_MECHANISM_KEY)) {
+
+					String authMechanism = options.getProperty(AUTH_MECHANISM_KEY);
+
+					if (MongoCredential.GSSAPI_MECHANISM.equals(authMechanism)) {
+
+						verifyUserNamePresent(userNameAndPassword);
+						credentials.add(MongoCredential.createGSSAPICredential(userNameAndPassword[0]));
+					} else if (MongoCredential.MONGODB_CR_MECHANISM.equals(authMechanism)) {
+
+						verifyUsernameAndPasswordPresent(userNameAndPassword);
+						verifyDatabasePresent(database);
+						credentials.add(MongoCredential.createMongoCRCredential(userNameAndPassword[0], database,
+								userNameAndPassword[1].toCharArray()));
+					} else if (MongoCredential.MONGODB_X509_MECHANISM.equals(authMechanism)) {
+
+						verifyUserNamePresent(userNameAndPassword);
+						credentials.add(MongoCredential.createMongoX509Credential(userNameAndPassword[0]));
+					} else if (MongoCredential.PLAIN_MECHANISM.equals(authMechanism)) {
+
+						verifyUsernameAndPasswordPresent(userNameAndPassword);
+						verifyDatabasePresent(database);
+						credentials.add(MongoCredential.createPlainCredential(userNameAndPassword[0], database,
+								userNameAndPassword[1].toCharArray()));
+					} else if (MongoCredential.SCRAM_SHA_1_MECHANISM.equals(authMechanism)) {
+
+						verifyUsernameAndPasswordPresent(userNameAndPassword);
+						verifyDatabasePresent(database);
+						credentials.add(MongoCredential.createScramSha1Credential(userNameAndPassword[0], database,
+								userNameAndPassword[1].toCharArray()));
+					} else {
+						throw new IllegalArgumentException(
+								String.format("Cannot create MongoCredentials for unknown auth mechanism '%s'!", authMechanism));
+					}
+				}
+			} else {
+
+				verifyUsernameAndPasswordPresent(userNameAndPassword);
+				verifyDatabasePresent(database);
+				credentials.add(
+						MongoCredential.createCredential(userNameAndPassword[0], database, userNameAndPassword[1].toCharArray()));
+			}
+		}
+
+		setValue(credentials);
+	}
+
+	private List<String> extractCredentialsString(String source) {
+
+		Matcher matcher = GROUP_PATTERN.matcher(source);
+		List<String> list = new ArrayList<>();
+
+		while (matcher.find()) {
+
+			String value = StringUtils.trimLeadingCharacter(matcher.group(), '\'');
+			list.add(StringUtils.trimTrailingCharacter(value, '\''));
+		}
+
+		if (!list.isEmpty()) {
+			return list;
+		}
+
+		return Arrays.asList(source.split(","));
+	}
+
+	private static String[] extractUserNameAndPassword(String text) {
+
+		int index = text.lastIndexOf(DATABASE_DELIMITER);
+
+		index = index != -1 ? index : text.lastIndexOf(OPTIONS_DELIMITER);
+
+		if (index == -1) {
+			return new String[] {};
+		}
+
+		return Arrays.stream(text.substring(0, index).split(USERNAME_PASSWORD_DELIMITER))
+				.map(MongoCredentialPropertyEditor::decodeParameter).toArray(String[]::new);
+	}
+
+	private static String extractDB(String text) {
+
+		int dbSeparationIndex = text.lastIndexOf(DATABASE_DELIMITER);
+
+		if (dbSeparationIndex == -1) {
+			return "";
+		}
+
+		String tmp = text.substring(dbSeparationIndex + 1);
+		int optionsSeparationIndex = tmp.lastIndexOf(OPTIONS_DELIMITER);
+
+		return optionsSeparationIndex > -1 ? tmp.substring(0, optionsSeparationIndex) : tmp;
+	}
+
+	private static Properties extractOptions(String text) {
+
+		int optionsSeparationIndex = text.lastIndexOf(OPTIONS_DELIMITER);
+		int dbSeparationIndex = text.lastIndexOf(OPTIONS_DELIMITER);
+
+		if (optionsSeparationIndex == -1 || dbSeparationIndex > optionsSeparationIndex) {
+			return new Properties();
+		}
+
+		Properties properties = new Properties();
+
+		for (String option : text.substring(optionsSeparationIndex + 1).split(OPTION_VALUE_DELIMITER)) {
+			String[] optionArgs = option.split("=");
+			properties.put(optionArgs[0], optionArgs[1]);
+		}
+
+		return properties;
+	}
+
+	private static void verifyUsernameAndPasswordPresent(String[] source) {
+
+		verifyUserNamePresent(source);
+
+		if (source.length != 2) {
+			throw new IllegalArgumentException(
+					"Credentials need to specify username and password like in 'username:password@database'!");
+		}
+	}
+
+	private static void verifyDatabasePresent(String source) {
+
+		if (!StringUtils.hasText(source)) {
+			throw new IllegalArgumentException("Credentials need to specify database like in 'username:password@database'!");
+		}
+	}
+
+	private static void verifyUserNamePresent(String[] source) {
+
+		if (source.length == 0 || !StringUtils.hasText(source[0])) {
+			throw new IllegalArgumentException("Credentials need to specify username!");
+		}
+	}
+
+	private static String decodeParameter(String it) {
+		try {
+			return URLDecoder.decode(it, "UTF-8");
+		} catch (UnsupportedEncodingException e) {
+			throw new IllegalArgumentException("o_O UTF-8 not supported!", e);
+		}
+	}
+}

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2012 by the original author(s).
+ * Copyright 2011-2017 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.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,6 +18,10 @@ package org.springframework.data.mongodb.config;
 import static org.springframework.data.config.ParsingUtils.*;
 import static org.springframework.data.mongodb.config.MongoParsingUtils.*;
 
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.parsing.BeanComponentDefinition;
@@ -26,25 +30,41 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
 import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.data.authentication.UserCredentials;
 import org.springframework.data.config.BeanComponentDefinitionBuilder;
-import org.springframework.data.mongodb.core.MongoFactoryBean;
+import org.springframework.data.mongodb.core.MongoClientFactoryBean;
 import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
+import org.springframework.lang.Nullable;
 import org.springframework.util.StringUtils;
 import org.w3c.dom.Element;
 
 import com.mongodb.Mongo;
+import com.mongodb.MongoClientURI;
 import com.mongodb.MongoURI;
 
 /**
  * {@link BeanDefinitionParser} to parse {@code db-factory} elements into {@link BeanDefinition}s.
- * 
+ *
  * @author Jon Brisbin
  * @author Oliver Gierke
+ * @author Thomas Darimont
+ * @author Christoph Strobl
+ * @author Viktor Khoroshko
+ * @author Mark Paluch
  */
 public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 
-	/* 
+	private static final Set<String> MONGO_URI_ALLOWED_ADDITIONAL_ATTRIBUTES;
+
+	static {
+
+		Set<String> mongoUriAllowedAdditionalAttributes = new HashSet<String>();
+		mongoUriAllowedAdditionalAttributes.add("id");
+		mongoUriAllowedAdditionalAttributes.add("write-concern");
+
+		MONGO_URI_ALLOWED_ADDITIONAL_ATTRIBUTES = Collections.unmodifiableSet(mongoUriAllowedAdditionalAttributes);
+	}
+
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#resolveId(org.w3c.dom.Element, org.springframework.beans.factory.support.AbstractBeanDefinition, org.springframework.beans.factory.xml.ParserContext)
 	 */
@@ -53,38 +73,33 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 			throws BeanDefinitionStoreException {
 
 		String id = super.resolveId(element, definition, parserContext);
-		return StringUtils.hasText(id) ? id : BeanNames.DB_FACTORY;
+		return StringUtils.hasText(id) ? id : BeanNames.DB_FACTORY_BEAN_NAME;
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#parseInternal(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext)
 	 */
 	@Override
 	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
 
-		Object source = parserContext.extractSource(element);
-
-		BeanComponentDefinitionBuilder helper = new BeanComponentDefinitionBuilder(element, parserContext);
-
-		String uri = element.getAttribute("uri");
-		String mongoRef = element.getAttribute("mongo-ref");
-		String dbname = element.getAttribute("dbname");
-		BeanDefinition userCredentials = getUserCredentialsBeanDefinition(element, parserContext);
-
 		// Common setup
 		BeanDefinitionBuilder dbFactoryBuilder = BeanDefinitionBuilder.genericBeanDefinition(SimpleMongoDbFactory.class);
 		setPropertyValue(dbFactoryBuilder, element, "write-concern", "writeConcern");
 
-		if (StringUtils.hasText(uri)) {
-			if (StringUtils.hasText(mongoRef) || StringUtils.hasText(dbname) || userCredentials != null) {
-				parserContext.getReaderContext().error("Configure either Mongo URI or details individually!", source);
-			}
+		BeanDefinition mongoUri = getMongoUri(element, parserContext);
 
-			dbFactoryBuilder.addConstructorArgValue(getMongoUri(uri));
+		if (mongoUri != null) {
+
+			dbFactoryBuilder.addConstructorArgValue(mongoUri);
 			return getSourceBeanDefinition(dbFactoryBuilder, parserContext, element);
 		}
 
+		BeanComponentDefinitionBuilder helper = new BeanComponentDefinitionBuilder(element, parserContext);
+
+		String mongoRef = element.getAttribute("mongo-ref");
+		String dbname = element.getAttribute("dbname");
+
 		// Defaulting
 		if (StringUtils.hasText(mongoRef)) {
 			dbFactoryBuilder.addConstructorArgReference(mongoRef);
@@ -92,33 +107,28 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 			dbFactoryBuilder.addConstructorArgValue(registerMongoBeanDefinition(element, parserContext));
 		}
 
-		dbname = StringUtils.hasText(dbname) ? dbname : "db";
-		dbFactoryBuilder.addConstructorArgValue(dbname);
-
-		if (userCredentials != null) {
-			dbFactoryBuilder.addConstructorArgValue(userCredentials);
-		}
+		dbFactoryBuilder.addConstructorArgValue(StringUtils.hasText(dbname) ? dbname : "db");
 
 		BeanDefinitionBuilder writeConcernPropertyEditorBuilder = getWriteConcernPropertyEditorBuilder();
 
 		BeanComponentDefinition component = helper.getComponent(writeConcernPropertyEditorBuilder);
 		parserContext.registerBeanComponent(component);
 
-		return (AbstractBeanDefinition) helper.getComponentIdButFallback(dbFactoryBuilder, BeanNames.DB_FACTORY)
+		return (AbstractBeanDefinition) helper.getComponentIdButFallback(dbFactoryBuilder, BeanNames.DB_FACTORY_BEAN_NAME)
 				.getBeanDefinition();
 	}
 
 	/**
 	 * Registers a default {@link BeanDefinition} of a {@link Mongo} instance and returns the name under which the
 	 * {@link Mongo} instance was registered under.
-	 * 
+	 *
 	 * @param element must not be {@literal null}.
 	 * @param parserContext must not be {@literal null}.
 	 * @return
 	 */
 	private BeanDefinition registerMongoBeanDefinition(Element element, ParserContext parserContext) {
 
-		BeanDefinitionBuilder mongoBuilder = BeanDefinitionBuilder.genericBeanDefinition(MongoFactoryBean.class);
+		BeanDefinitionBuilder mongoBuilder = BeanDefinitionBuilder.genericBeanDefinition(MongoClientFactoryBean.class);
 		setPropertyValue(mongoBuilder, element, "host");
 		setPropertyValue(mongoBuilder, element, "port");
 
@@ -126,36 +136,43 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 	}
 
 	/**
-	 * Returns a {@link BeanDefinition} for a {@link UserCredentials} object.
-	 * 
-	 * @param element
-	 * @return the {@link BeanDefinition} or {@literal null} if neither username nor password given.
+	 * Creates a {@link BeanDefinition} for a {@link MongoURI} or {@link MongoClientURI} depending on configured
+	 * attributes. <br />
+	 * Errors when configured element contains {@literal uri} or {@literal client-uri} along with other attributes except
+	 * {@literal write-concern} and/or {@literal id}.
+	 *
+	 * @param element must not be {@literal null}.
+	 * @param parserContext
+	 * @return {@literal null} in case no client-/uri defined.
 	 */
-	private BeanDefinition getUserCredentialsBeanDefinition(Element element, ParserContext context) {
+	@Nullable
+	private BeanDefinition getMongoUri(Element element, ParserContext parserContext) {
 
-		String username = element.getAttribute("username");
-		String password = element.getAttribute("password");
+		boolean hasClientUri = element.hasAttribute("client-uri");
 
-		if (!StringUtils.hasText(username) && !StringUtils.hasText(password)) {
+		if (!hasClientUri && !element.hasAttribute("uri")) {
 			return null;
 		}
 
-		BeanDefinitionBuilder userCredentialsBuilder = BeanDefinitionBuilder.genericBeanDefinition(UserCredentials.class);
-		userCredentialsBuilder.addConstructorArgValue(StringUtils.hasText(username) ? username : null);
-		userCredentialsBuilder.addConstructorArgValue(StringUtils.hasText(password) ? password : null);
+		int allowedAttributesCount = 1;
+		for (String attribute : MONGO_URI_ALLOWED_ADDITIONAL_ATTRIBUTES) {
 
-		return getSourceBeanDefinition(userCredentialsBuilder, context, element);
-	}
+			if (element.hasAttribute(attribute)) {
+				allowedAttributesCount++;
+			}
+		}
 
-	/**
-	 * Creates a {@link BeanDefinition} for a {@link MongoURI}.
-	 * 
-	 * @param uri
-	 * @return
-	 */
-	private BeanDefinition getMongoUri(String uri) {
+		if (element.getAttributes().getLength() > allowedAttributesCount) {
 
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MongoURI.class);
+			parserContext.getReaderContext().error(
+					"Configure either " + (hasClientUri ? "Mongo Client URI" : "Mongo URI") + " or details individually!",
+					parserContext.extractSource(element));
+		}
+
+		Class<?> type = MongoClientURI.class;
+		String uri = hasClientUri ? element.getAttribute("client-uri") : element.getAttribute("uri");
+
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(type);
 		builder.addConstructorArgValue(uri);
 
 		return builder.getBeanDefinition();

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

@@ -1,69 +1,76 @@
-/*
- * Copyright 2011 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.config;
-
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.parsing.BeanComponentDefinition;
-import org.springframework.beans.factory.parsing.CompositeComponentDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.data.mongodb.core.MongoAdmin;
-import org.springframework.data.mongodb.monitor.*;
-import org.springframework.util.StringUtils;
-import org.w3c.dom.Element;
-
-public class MongoJmxParser implements BeanDefinitionParser {
-
-	public BeanDefinition parse(Element element, ParserContext parserContext) {
-		String name = element.getAttribute("mongo-ref");
-		if (!StringUtils.hasText(name)) {
-			name = "mongo";
-		}
-		registerJmxComponents(name, element, parserContext);
-		return null;
-	}
-
-	protected void registerJmxComponents(String mongoRefName, Element element, ParserContext parserContext) {
-		Object eleSource = parserContext.extractSource(element);
-
-		CompositeComponentDefinition compositeDef = new CompositeComponentDefinition(element.getTagName(), eleSource);
-
-		createBeanDefEntry(AssertMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
-		createBeanDefEntry(BackgroundFlushingMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
-		createBeanDefEntry(BtreeIndexCounters.class, compositeDef, mongoRefName, eleSource, parserContext);
-		createBeanDefEntry(ConnectionMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
-		createBeanDefEntry(GlobalLockMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
-		createBeanDefEntry(MemoryMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
-		createBeanDefEntry(OperationCounters.class, compositeDef, mongoRefName, eleSource, parserContext);
-		createBeanDefEntry(ServerInfo.class, compositeDef, mongoRefName, eleSource, parserContext);
-		createBeanDefEntry(MongoAdmin.class, compositeDef, mongoRefName, eleSource, parserContext);
-
-		parserContext.registerComponent(compositeDef);
-
-	}
-
-	protected void createBeanDefEntry(Class<?> clazz, CompositeComponentDefinition compositeDef, String mongoRefName,
-			Object eleSource, ParserContext parserContext) {
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(clazz);
-		builder.getRawBeanDefinition().setSource(eleSource);
-		builder.addConstructorArgReference(mongoRefName);
-		BeanDefinition assertDef = builder.getBeanDefinition();
-		String assertName = parserContext.getReaderContext().registerWithGeneratedName(assertDef);
-		compositeDef.addNestedComponent(new BeanComponentDefinition(assertDef, assertName));
-	}
-
-}
+/*
+ * Copyright 2011-2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.config;
+
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.parsing.BeanComponentDefinition;
+import org.springframework.beans.factory.parsing.CompositeComponentDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.BeanDefinitionParser;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.data.mongodb.core.MongoAdmin;
+import org.springframework.data.mongodb.monitor.*;
+import org.springframework.util.StringUtils;
+import org.w3c.dom.Element;
+
+/**
+ * @author Mark Pollack
+ * @author Thomas Risberg
+ * @author John Brisbin
+ * @author Oliver Gierke
+ * @author Christoph Strobl
+ */
+public class MongoJmxParser implements BeanDefinitionParser {
+
+	public BeanDefinition parse(Element element, ParserContext parserContext) {
+		String name = element.getAttribute("mongo-ref");
+		if (!StringUtils.hasText(name)) {
+			name = BeanNames.MONGO_BEAN_NAME;
+		}
+		registerJmxComponents(name, element, parserContext);
+		return null;
+	}
+
+	protected void registerJmxComponents(String mongoRefName, Element element, ParserContext parserContext) {
+		Object eleSource = parserContext.extractSource(element);
+
+		CompositeComponentDefinition compositeDef = new CompositeComponentDefinition(element.getTagName(), eleSource);
+
+		createBeanDefEntry(AssertMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
+		createBeanDefEntry(BackgroundFlushingMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
+		createBeanDefEntry(BtreeIndexCounters.class, compositeDef, mongoRefName, eleSource, parserContext);
+		createBeanDefEntry(ConnectionMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
+		createBeanDefEntry(GlobalLockMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
+		createBeanDefEntry(MemoryMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
+		createBeanDefEntry(OperationCounters.class, compositeDef, mongoRefName, eleSource, parserContext);
+		createBeanDefEntry(ServerInfo.class, compositeDef, mongoRefName, eleSource, parserContext);
+		createBeanDefEntry(MongoAdmin.class, compositeDef, mongoRefName, eleSource, parserContext);
+
+		parserContext.registerComponent(compositeDef);
+
+	}
+
+	protected void createBeanDefEntry(Class<?> clazz, CompositeComponentDefinition compositeDef, String mongoRefName,
+			Object eleSource, ParserContext parserContext) {
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(clazz);
+		builder.getRawBeanDefinition().setSource(eleSource);
+		builder.addConstructorArgReference(mongoRefName);
+		BeanDefinition assertDef = builder.getBeanDefinition();
+		String assertName = parserContext.getReaderContext().registerWithGeneratedName(assertDef);
+		compositeDef.addNestedComponent(new BeanComponentDefinition(assertDef, assertName));
+	}
+
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2017 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.
@@ -16,31 +16,28 @@
 package org.springframework.data.mongodb.config;
 
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
-import org.springframework.data.mongodb.repository.config.MongoRepositoryConfigurationExtension;
-import org.springframework.data.repository.config.RepositoryBeanDefinitionParser;
-import org.springframework.data.repository.config.RepositoryConfigurationExtension;
 
 /**
- * {@link org.springframework.beans.factory.xml.NamespaceHandler} for Mongo DB based repositories.
+ * {@link org.springframework.beans.factory.xml.NamespaceHandler} for Mongo DB configuration.
  * 
  * @author Oliver Gierke
+ * @author Martin Baumgartner
+ * @author Christoph Strobl
  */
 public class MongoNamespaceHandler extends NamespaceHandlerSupport {
 
 	/*
-	* (non-Javadoc)
-	*
-	* @see org.springframework.beans.factory.xml.NamespaceHandler#init()
-	*/
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.xml.NamespaceHandler#init()
+	 */
 	public void init() {
 
-		RepositoryConfigurationExtension extension = new MongoRepositoryConfigurationExtension();
-		RepositoryBeanDefinitionParser repositoryBeanDefinitionParser = new RepositoryBeanDefinitionParser(extension);
-
-		registerBeanDefinitionParser("repositories", repositoryBeanDefinitionParser);
 		registerBeanDefinitionParser("mapping-converter", new MappingMongoConverterParser());
-		registerBeanDefinitionParser("mongo", new MongoParser());
+		registerBeanDefinitionParser("mongo-client", new MongoClientParser());
 		registerBeanDefinitionParser("db-factory", new MongoDbFactoryParser());
 		registerBeanDefinitionParser("jmx", new MongoJmxParser());
+		registerBeanDefinitionParser("auditing", new MongoAuditingBeanDefinitionParser());
+		registerBeanDefinitionParser("template", new MongoTemplateParser());
+		registerBeanDefinitionParser("gridFsTemplate", new GridFsTemplateParser());
 	}
 }

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

@@ -1,103 +1,170 @@
-/*
- * Copyright 2011-2012 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.config;
-
-import static org.springframework.data.config.ParsingUtils.*;
-
-import java.util.Map;
-
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.CustomEditorConfigurer;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.ManagedMap;
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
-import org.springframework.data.mongodb.core.MongoOptionsFactoryBean;
-import org.springframework.util.xml.DomUtils;
-import org.w3c.dom.Element;
-
-/**
- * Utility methods for {@link BeanDefinitionParser} implementations for MongoDB.
- * 
- * @author Mark Pollack
- * @author Oliver Gierke
- */
-abstract class MongoParsingUtils {
-
-	private MongoParsingUtils() {
-
-	}
-
-	/**
-	 * Parses the mongo replica-set element.
-	 * 
-	 * @param parserContext the parser context
-	 * @param element the mongo element
-	 * @param mongoBuilder the bean definition builder to populate
-	 * @return
-	 */
-	static void parseReplicaSet(Element element, BeanDefinitionBuilder mongoBuilder) {
-		setPropertyValue(mongoBuilder, element, "replica-set", "replicaSetSeeds");
-	}
-
-	/**
-	 * Parses the mongo:options sub-element. Populates the given attribute factory with the proper attributes.
-	 * 
-	 * @return true if parsing actually occured, false otherwise
-	 */
-	static boolean parseMongoOptions(Element element, BeanDefinitionBuilder mongoBuilder) {
-		Element optionsElement = DomUtils.getChildElementByTagName(element, "options");
-		if (optionsElement == null) {
-			return false;
-		}
-
-		BeanDefinitionBuilder optionsDefBuilder = BeanDefinitionBuilder
-				.genericBeanDefinition(MongoOptionsFactoryBean.class);
-
-		setPropertyValue(optionsDefBuilder, optionsElement, "connections-per-host", "connectionsPerHost");
-		setPropertyValue(optionsDefBuilder, optionsElement, "threads-allowed-to-block-for-connection-multiplier",
-				"threadsAllowedToBlockForConnectionMultiplier");
-		setPropertyValue(optionsDefBuilder, optionsElement, "max-wait-time", "maxWaitTime");
-		setPropertyValue(optionsDefBuilder, optionsElement, "connect-timeout", "connectTimeout");
-		setPropertyValue(optionsDefBuilder, optionsElement, "socket-timeout", "socketTimeout");
-		setPropertyValue(optionsDefBuilder, optionsElement, "socket-keep-alive", "socketKeepAlive");
-		setPropertyValue(optionsDefBuilder, optionsElement, "auto-connect-retry", "autoConnectRetry");
-		setPropertyValue(optionsDefBuilder, optionsElement, "max-auto-connect-retry-time", "maxAutoConnectRetryTime");
-		setPropertyValue(optionsDefBuilder, optionsElement, "write-number", "writeNumber");
-		setPropertyValue(optionsDefBuilder, optionsElement, "write-timeout", "writeTimeout");
-		setPropertyValue(optionsDefBuilder, optionsElement, "write-fsync", "writeFsync");
-		setPropertyValue(optionsDefBuilder, optionsElement, "slave-ok", "slaveOk");
-
-		mongoBuilder.addPropertyValue("mongoOptions", optionsDefBuilder.getBeanDefinition());
-		return true;
-	}
-
-	/**
-	 * Returns the {@link BeanDefinitionBuilder} to build a {@link BeanDefinition} for a
-	 * {@link WriteConcernPropertyEditor}.
-	 * 
-	 * @return
-	 */
-	static BeanDefinitionBuilder getWriteConcernPropertyEditorBuilder() {
-
-		Map<String, Class<?>> customEditors = new ManagedMap<String, Class<?>>();
-		customEditors.put("com.mongodb.WriteConcern", WriteConcernPropertyEditor.class);
-
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CustomEditorConfigurer.class);
-		builder.addPropertyValue("customEditors", customEditors);
-
-		return builder;
-	}
-}
+/*
+ * Copyright 2011-2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.config;
+
+import static org.springframework.data.config.ParsingUtils.*;
+
+import java.util.Map;
+
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.CustomEditorConfigurer;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.ManagedMap;
+import org.springframework.beans.factory.xml.BeanDefinitionParser;
+import org.springframework.data.mongodb.core.MongoClientOptionsFactoryBean;
+import org.springframework.util.xml.DomUtils;
+import org.w3c.dom.Element;
+
+/**
+ * Utility methods for {@link BeanDefinitionParser} implementations for MongoDB.
+ * 
+ * @author Mark Pollack
+ * @author Oliver Gierke
+ * @author Thomas Darimont
+ * @author Christoph Strobl
+ */
+@SuppressWarnings("deprecation")
+abstract class MongoParsingUtils {
+
+	private MongoParsingUtils() {}
+
+	/**
+	 * Parses the mongo replica-set element.
+	 * 
+	 * @param parserContext the parser context
+	 * @param element the mongo element
+	 * @param mongoBuilder the bean definition builder to populate
+	 * @return
+	 */
+	static void parseReplicaSet(Element element, BeanDefinitionBuilder mongoBuilder) {
+		setPropertyValue(mongoBuilder, element, "replica-set", "replicaSetSeeds");
+	}
+
+	/**
+	 * Parses the {@code mongo:client-options} sub-element. Populates the given attribute factory with the proper
+	 * attributes.
+	 * 
+	 * @param element must not be {@literal null}.
+	 * @param mongoClientBuilder must not be {@literal null}.
+	 * @return
+	 * @since 1.7
+	 */
+	public static boolean parseMongoClientOptions(Element element, BeanDefinitionBuilder mongoClientBuilder) {
+
+		Element optionsElement = DomUtils.getChildElementByTagName(element, "client-options");
+
+		if (optionsElement == null) {
+			return false;
+		}
+
+		BeanDefinitionBuilder clientOptionsDefBuilder = BeanDefinitionBuilder
+				.genericBeanDefinition(MongoClientOptionsFactoryBean.class);
+
+		setPropertyValue(clientOptionsDefBuilder, optionsElement, "description", "description");
+		setPropertyValue(clientOptionsDefBuilder, optionsElement, "min-connections-per-host", "minConnectionsPerHost");
+		setPropertyValue(clientOptionsDefBuilder, optionsElement, "connections-per-host", "connectionsPerHost");
+		setPropertyValue(clientOptionsDefBuilder, optionsElement, "threads-allowed-to-block-for-connection-multiplier",
+				"threadsAllowedToBlockForConnectionMultiplier");
+		setPropertyValue(clientOptionsDefBuilder, optionsElement, "max-wait-time", "maxWaitTime");
+		setPropertyValue(clientOptionsDefBuilder, optionsElement, "max-connection-idle-time", "maxConnectionIdleTime");
+		setPropertyValue(clientOptionsDefBuilder, optionsElement, "max-connection-life-time", "maxConnectionLifeTime");
+		setPropertyValue(clientOptionsDefBuilder, optionsElement, "connect-timeout", "connectTimeout");
+		setPropertyValue(clientOptionsDefBuilder, optionsElement, "socket-timeout", "socketTimeout");
+		setPropertyValue(clientOptionsDefBuilder, optionsElement, "socket-keep-alive", "socketKeepAlive");
+		setPropertyValue(clientOptionsDefBuilder, optionsElement, "read-preference", "readPreference");
+		setPropertyValue(clientOptionsDefBuilder, optionsElement, "write-concern", "writeConcern");
+		setPropertyValue(clientOptionsDefBuilder, optionsElement, "heartbeat-frequency", "heartbeatFrequency");
+		setPropertyValue(clientOptionsDefBuilder, optionsElement, "min-heartbeat-frequency", "minHeartbeatFrequency");
+		setPropertyValue(clientOptionsDefBuilder, optionsElement, "heartbeat-connect-timeout", "heartbeatConnectTimeout");
+		setPropertyValue(clientOptionsDefBuilder, optionsElement, "heartbeat-socket-timeout", "heartbeatSocketTimeout");
+		setPropertyValue(clientOptionsDefBuilder, optionsElement, "ssl", "ssl");
+		setPropertyReference(clientOptionsDefBuilder, optionsElement, "ssl-socket-factory-ref", "sslSocketFactory");
+		setPropertyValue(clientOptionsDefBuilder, optionsElement, "server-selection-timeout", "serverSelectionTimeout");
+
+		mongoClientBuilder.addPropertyValue("mongoClientOptions", clientOptionsDefBuilder.getBeanDefinition());
+
+		return true;
+	}
+
+	/**
+	 * Returns the {@link BeanDefinitionBuilder} to build a {@link BeanDefinition} for a
+	 * {@link WriteConcernPropertyEditor}.
+	 * 
+	 * @return
+	 */
+	static BeanDefinitionBuilder getWriteConcernPropertyEditorBuilder() {
+
+		Map<String, Class<?>> customEditors = new ManagedMap<String, Class<?>>();
+		customEditors.put("com.mongodb.WriteConcern", WriteConcernPropertyEditor.class);
+
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CustomEditorConfigurer.class);
+		builder.addPropertyValue("customEditors", customEditors);
+
+		return builder;
+	}
+
+	/**
+	 * One should only register one bean definition but want to have the convenience of using
+	 * AbstractSingleBeanDefinitionParser but have the side effect of registering a 'default' property editor with the
+	 * container.
+	 */
+	static BeanDefinitionBuilder getServerAddressPropertyEditorBuilder() {
+
+		Map<String, String> customEditors = new ManagedMap<String, String>();
+		customEditors.put("com.mongodb.ServerAddress[]",
+				"org.springframework.data.mongodb.config.ServerAddressPropertyEditor");
+
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CustomEditorConfigurer.class);
+		builder.addPropertyValue("customEditors", customEditors);
+		return builder;
+	}
+
+	/**
+	 * Returns the {@link BeanDefinitionBuilder} to build a {@link BeanDefinition} for a
+	 * {@link ReadPreferencePropertyEditor}.
+	 * 
+	 * @return
+	 * @since 1.7
+	 */
+	static BeanDefinitionBuilder getReadPreferencePropertyEditorBuilder() {
+
+		Map<String, Class<?>> customEditors = new ManagedMap<String, Class<?>>();
+		customEditors.put("com.mongodb.ReadPreference", ReadPreferencePropertyEditor.class);
+
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CustomEditorConfigurer.class);
+		builder.addPropertyValue("customEditors", customEditors);
+
+		return builder;
+	}
+
+	/**
+	 * Returns the {@link BeanDefinitionBuilder} to build a {@link BeanDefinition} for a
+	 * {@link MongoCredentialPropertyEditor}.
+	 * 
+	 * @return
+	 * @since 1.7
+	 */
+	static BeanDefinitionBuilder getMongoCredentialPropertyEditor() {
+
+		Map<String, Class<?>> customEditors = new ManagedMap<String, Class<?>>();
+		customEditors.put("com.mongodb.MongoCredential[]", MongoCredentialPropertyEditor.class);
+
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CustomEditorConfigurer.class);
+		builder.addPropertyValue("customEditors", customEditors);
+
+		return builder;
+	}
+}

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

@@ -0,0 +1,87 @@
+/*
+ * Copyright 2011-2014 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.config;
+
+import static org.springframework.data.config.ParsingUtils.*;
+import static org.springframework.data.mongodb.config.MongoParsingUtils.*;
+
+import org.springframework.beans.factory.BeanDefinitionStoreException;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.parsing.BeanComponentDefinition;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
+import org.springframework.beans.factory.xml.BeanDefinitionParser;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.data.config.BeanComponentDefinitionBuilder;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.util.StringUtils;
+import org.w3c.dom.Element;
+
+/**
+ * {@link BeanDefinitionParser} to parse {@code template} elements into {@link BeanDefinition}s.
+ * 
+ * @author Martin Baumgartner
+ * @author Oliver Gierke
+ */
+class MongoTemplateParser extends AbstractBeanDefinitionParser {
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#resolveId(org.w3c.dom.Element, org.springframework.beans.factory.support.AbstractBeanDefinition, org.springframework.beans.factory.xml.ParserContext)
+	 */
+	@Override
+	protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext)
+			throws BeanDefinitionStoreException {
+
+		String id = super.resolveId(element, definition, parserContext);
+		return StringUtils.hasText(id) ? id : BeanNames.MONGO_TEMPLATE_BEAN_NAME;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#parseInternal(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext)
+	 */
+	@Override
+	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
+
+		BeanComponentDefinitionBuilder helper = new BeanComponentDefinitionBuilder(element, parserContext);
+
+		String converterRef = element.getAttribute("converter-ref");
+		String dbFactoryRef = element.getAttribute("db-factory-ref");
+
+		BeanDefinitionBuilder mongoTemplateBuilder = BeanDefinitionBuilder.genericBeanDefinition(MongoTemplate.class);
+		setPropertyValue(mongoTemplateBuilder, element, "write-concern", "writeConcern");
+
+		if (StringUtils.hasText(dbFactoryRef)) {
+			mongoTemplateBuilder.addConstructorArgReference(dbFactoryRef);
+		} else {
+			mongoTemplateBuilder.addConstructorArgReference(BeanNames.DB_FACTORY_BEAN_NAME);
+		}
+
+		if (StringUtils.hasText(converterRef)) {
+			mongoTemplateBuilder.addConstructorArgReference(converterRef);
+		}
+
+		BeanDefinitionBuilder writeConcernPropertyEditorBuilder = getWriteConcernPropertyEditorBuilder();
+
+		BeanComponentDefinition component = helper.getComponent(writeConcernPropertyEditorBuilder);
+		parserContext.registerBeanComponent(component);
+
+		return (AbstractBeanDefinition) helper.getComponentIdButFallback(mongoTemplateBuilder,
+				BeanNames.MONGO_TEMPLATE_BEAN_NAME).getBeanDefinition();
+	}
+}

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

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2015-2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.config;
+
+import java.beans.PropertyEditorSupport;
+
+import org.springframework.lang.Nullable;
+
+import com.mongodb.ReadPreference;
+
+/**
+ * Parse a {@link String} to a {@link ReadPreference}.
+ * 
+ * @author Christoph Strobl
+ * @since 1.7
+ */
+public class ReadPreferencePropertyEditor extends PropertyEditorSupport {
+
+	/*
+	 * (non-Javadoc)
+	 * @see java.beans.PropertyEditorSupport#setAsText(java.lang.String)
+	 */
+	@Override
+	public void setAsText(@Nullable String readPreferenceString) throws IllegalArgumentException {
+
+		if (readPreferenceString == null) {
+			return;
+		}
+
+		ReadPreference preference = null;
+
+		try {
+			preference = ReadPreference.valueOf(readPreferenceString);
+		} catch (IllegalArgumentException ex) {
+			// ignore this one and try to map it differently
+		}
+
+		if (preference != null) {
+			setValue(preference);
+		} else if ("PRIMARY".equalsIgnoreCase(readPreferenceString)) {
+			setValue(ReadPreference.primary());
+		} else if ("PRIMARY_PREFERRED".equalsIgnoreCase(readPreferenceString)) {
+			setValue(ReadPreference.primaryPreferred());
+		} else if ("SECONDARY".equalsIgnoreCase(readPreferenceString)) {
+			setValue(ReadPreference.secondary());
+		} else if ("SECONDARY_PREFERRED".equalsIgnoreCase(readPreferenceString)) {
+			setValue(ReadPreference.secondaryPreferred());
+		} else if ("NEAREST".equalsIgnoreCase(readPreferenceString)) {
+			setValue(ReadPreference.nearest());
+		} else {
+			throw new IllegalArgumentException(
+					String.format("Cannot find matching ReadPreference for %s", readPreferenceString));
+		}
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2017 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.
@@ -16,24 +16,34 @@
 package org.springframework.data.mongodb.config;
 
 import java.beans.PropertyEditorSupport;
+import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.HashSet;
 import java.util.Set;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 import com.mongodb.ServerAddress;
 
 /**
  * Parse a {@link String} to a {@link ServerAddress} array. The format is host1:port1,host2:port2,host3:port3.
- * 
+ *
  * @author Mark Pollack
  * @author Oliver Gierke
+ * @author Thomas Darimont
+ * @author Christoph Strobl
  */
 public class ServerAddressPropertyEditor extends PropertyEditorSupport {
 
+	/**
+	 * A port is a number without a leading 0 at the end of the address that is proceeded by just a single :.
+	 */
+	private static final String HOST_PORT_SPLIT_PATTERN = "(?<!:):(?=[123456789]\\d*$)";
+	private static final String COULD_NOT_PARSE_ADDRESS_MESSAGE = "Could not parse address {} '{}'. Check your replica set configuration!";
 	private static final Logger LOG = LoggerFactory.getLogger(ServerAddressPropertyEditor.class);
 
 	/*
@@ -41,7 +51,12 @@ public class ServerAddressPropertyEditor extends PropertyEditorSupport {
 	 * @see java.beans.PropertyEditorSupport#setAsText(java.lang.String)
 	 */
 	@Override
-	public void setAsText(String replicaSetString) {
+	public void setAsText(@Nullable String replicaSetString) {
+
+		if (!StringUtils.hasText(replicaSetString)) {
+			setValue(null);
+			return;
+		}
 
 		String[] replicaSetStringArray = StringUtils.commaDelimitedListToStringArray(replicaSetString);
 		Set<ServerAddress> serverAddresses = new HashSet<ServerAddress>(replicaSetStringArray.length);
@@ -65,28 +80,60 @@ public class ServerAddressPropertyEditor extends PropertyEditorSupport {
 
 	/**
 	 * Parses the given source into a {@link ServerAddress}.
-	 * 
+	 *
 	 * @param source
 	 * @return the
 	 */
+	@Nullable
 	private ServerAddress parseServerAddress(String source) {
 
-		String[] hostAndPort = StringUtils.delimitedListToStringArray(source.trim(), ":");
+		if (!StringUtils.hasText(source)) {
+			LOG.warn(COULD_NOT_PARSE_ADDRESS_MESSAGE, "source", source);
+			return null;
+		}
 
-		if (!StringUtils.hasText(source) || hostAndPort.length > 2) {
-			LOG.warn("Could not parse address source '{}'. Check your replica set configuration!", source);
+		String[] hostAndPort = extractHostAddressAndPort(source.trim());
+
+		if (hostAndPort.length > 2) {
+			LOG.warn(COULD_NOT_PARSE_ADDRESS_MESSAGE, "source", source);
 			return null;
 		}
 
 		try {
-			return hostAndPort.length == 1 ? new ServerAddress(hostAndPort[0]) : new ServerAddress(hostAndPort[0],
-					Integer.parseInt(hostAndPort[1]));
+			InetAddress hostAddress = InetAddress.getByName(hostAndPort[0]);
+			Integer port = hostAndPort.length == 1 ? null : Integer.parseInt(hostAndPort[1]);
+
+			return port == null ? new ServerAddress(hostAddress) : new ServerAddress(hostAddress, port);
 		} catch (UnknownHostException e) {
-			LOG.warn("Could not parse host '{}'. Check your replica set configuration!", hostAndPort[0]);
+			LOG.warn(COULD_NOT_PARSE_ADDRESS_MESSAGE, "host", hostAndPort[0]);
 		} catch (NumberFormatException e) {
-			LOG.warn("Could not parse port '{}'. Check your replica set configuration!", hostAndPort[1]);
+			LOG.warn(COULD_NOT_PARSE_ADDRESS_MESSAGE, "port", hostAndPort[1]);
 		}
 
 		return null;
 	}
+
+	/**
+	 * Extract the host and port from the given {@link String}.
+	 *
+	 * @param addressAndPortSource must not be {@literal null}.
+	 * @return
+	 */
+	private String[] extractHostAddressAndPort(String addressAndPortSource) {
+
+		Assert.notNull(addressAndPortSource, "Address and port source must not be null!");
+
+		String[] hostAndPort = addressAndPortSource.split(HOST_PORT_SPLIT_PATTERN);
+		String hostAddress = hostAndPort[0];
+
+		if (isHostAddressInIPv6BracketNotation(hostAddress)) {
+			hostAndPort[0] = hostAddress.substring(1, hostAddress.length() - 1);
+		}
+
+		return hostAndPort;
+	}
+
+	private boolean isHostAddressInIPv6BracketNotation(String hostAddress) {
+		return hostAddress.startsWith("[") && hostAddress.endsWith("]");
+	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2017 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.
@@ -17,6 +17,9 @@ package org.springframework.data.mongodb.config;
 
 import java.beans.PropertyEditorSupport;
 
+import org.springframework.lang.Nullable;
+import org.springframework.util.StringUtils;
+
 import com.mongodb.WriteConcern;
 
 /**
@@ -26,6 +29,7 @@ import com.mongodb.WriteConcern;
  * string value.
  * 
  * @author Mark Pollack
+ * @author Christoph Strobl
  */
 public class WriteConcernPropertyEditor extends PropertyEditorSupport {
 
@@ -33,7 +37,11 @@ public class WriteConcernPropertyEditor extends PropertyEditorSupport {
 	 * Parse a string to a List<ServerAddress>
 	 */
 	@Override
-	public void setAsText(String writeConcernString) {
+	public void setAsText(@Nullable String writeConcernString) {
+
+		if (!StringUtils.hasText(writeConcernString)) {
+			return;
+		}
 
 		WriteConcern writeConcern = WriteConcern.valueOf(writeConcernString);
 		if (writeConcern != null) {

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

@@ -1,5 +1,6 @@
 /**
  * Spring XML namespace configuration for MongoDB specific repositories.
  */
+@org.springframework.lang.NonNullApi
 package org.springframework.data.mongodb.config;
 

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

@@ -0,0 +1,145 @@
+/*
+ * Copyright 2015-2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import java.util.List;
+
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
+import org.springframework.data.util.Pair;
+
+import com.mongodb.bulk.BulkWriteResult;
+
+/**
+ * Bulk operations for insert/update/remove actions on a collection. These bulks operation are available since MongoDB
+ * 2.6 and make use of low level bulk commands on the protocol level. This interface defines a fluent API to add
+ * multiple single operations or list of similar operations in sequence which can then eventually be executed by calling
+ * {@link #execute()}.
+ *
+ * @author Tobias Trelle
+ * @author Oliver Gierke
+ * @since 1.9
+ */
+public interface BulkOperations {
+
+	/**
+	 * Mode for bulk operation.
+	 **/
+	enum BulkMode {
+
+		/** Perform bulk operations in sequence. The first error will cancel processing. */
+		ORDERED,
+
+		/** Perform bulk operations in parallel. Processing will continue on errors. */
+		UNORDERED
+	};
+
+	/**
+	 * Add a single insert to the bulk operation.
+	 *
+	 * @param documents the document to insert, must not be {@literal null}.
+	 * @return the current {@link BulkOperations} instance with the insert added, will never be {@literal null}.
+	 */
+	BulkOperations insert(Object documents);
+
+	/**
+	 * Add a list of inserts to the bulk operation.
+	 *
+	 * @param documents List of documents to insert, must not be {@literal null}.
+	 * @return the current {@link BulkOperations} instance with the insert added, will never be {@literal null}.
+	 */
+	BulkOperations insert(List<? extends Object> documents);
+
+	/**
+	 * Add a single update to the bulk operation. For the update request, only the first matching document is updated.
+	 *
+	 * @param query update criteria, must not be {@literal null}.
+	 * @param update {@link Update} operation to perform, must not be {@literal null}.
+	 * @return the current {@link BulkOperations} instance with the update added, will never be {@literal null}.
+	 */
+	BulkOperations updateOne(Query query, Update update);
+
+	/**
+	 * Add a list of updates to the bulk operation. For each update request, only the first matching document is updated.
+	 *
+	 * @param updates Update operations to perform.
+	 * @return the current {@link BulkOperations} instance with the update added, will never be {@literal null}.
+	 */
+	BulkOperations updateOne(List<Pair<Query, Update>> updates);
+
+	/**
+	 * Add a single update to the bulk operation. For the update request, all matching documents are updated.
+	 *
+	 * @param query Update criteria.
+	 * @param update Update operation to perform.
+	 * @return the current {@link BulkOperations} instance with the update added, will never be {@literal null}.
+	 */
+	BulkOperations updateMulti(Query query, Update update);
+
+	/**
+	 * Add a list of updates to the bulk operation. For each update request, all matching documents are updated.
+	 *
+	 * @param updates Update operations to perform.
+	 * @return The bulk operation.
+	 * @return the current {@link BulkOperations} instance with the update added, will never be {@literal null}.
+	 */
+	BulkOperations updateMulti(List<Pair<Query, Update>> updates);
+
+	/**
+	 * Add a single upsert to the bulk operation. An upsert is an update if the set of matching documents is not empty,
+	 * else an insert.
+	 *
+	 * @param query Update criteria.
+	 * @param update Update operation to perform.
+	 * @return The bulk operation.
+	 * @return the current {@link BulkOperations} instance with the update added, will never be {@literal null}.
+	 */
+	BulkOperations upsert(Query query, Update update);
+
+	/**
+	 * Add a list of upserts to the bulk operation. An upsert is an update if the set of matching documents is not empty,
+	 * else an insert.
+	 *
+	 * @param updates Updates/insert operations to perform.
+	 * @return The bulk operation.
+	 * @return the current {@link BulkOperations} instance with the update added, will never be {@literal null}.
+	 */
+	BulkOperations upsert(List<Pair<Query, Update>> updates);
+
+	/**
+	 * Add a single remove operation to the bulk operation.
+	 *
+	 * @param remove the {@link Query} to select the documents to be removed, must not be {@literal null}.
+	 * @return the current {@link BulkOperations} instance with the removal added, will never be {@literal null}.
+	 */
+	BulkOperations remove(Query remove);
+
+	/**
+	 * Add a list of remove operations to the bulk operation.
+	 *
+	 * @param removes the remove operations to perform, must not be {@literal null}.
+	 * @return the current {@link BulkOperations} instance with the removal added, will never be {@literal null}.
+	 */
+	BulkOperations remove(List<Query> removes);
+
+	/**
+	 * Execute all bulk operations using the default write concern.
+	 *
+	 * @return Result of the bulk operation providing counters for inserts/updates etc.
+	 * @throws org.springframework.data.mongodb.BulkOperationException if an error occurred during bulk processing.
+	 */
+	BulkWriteResult execute();
+}

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

@@ -1,26 +1,46 @@
-/*
- * Copyright 2010-2011 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import com.mongodb.DBCollection;
-import com.mongodb.MongoException;
-import org.springframework.dao.DataAccessException;
-
-public interface CollectionCallback<T> {
-
-	T doInCollection(DBCollection collection) throws MongoException, DataAccessException;
-
-}
+/*
+ * Copyright 2010-2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import org.bson.Document;
+import org.springframework.dao.DataAccessException;
+import org.springframework.lang.Nullable;
+
+import com.mongodb.MongoException;
+import com.mongodb.client.MongoCollection;
+
+/**
+ * Callback interface for executing actions against a {@link MongoCollection}.
+ *
+ * @author Mark Pollak
+ * @author Grame Rocher
+ * @author Oliver Gierke
+ * @author John Brisbin
+ * @auhtor Christoph Strobl
+ * @since 1.0
+ */
+public interface CollectionCallback<T> {
+
+	/**
+	 * @param collection never {@literal null}.
+	 * @return can be {@literal null}.
+	 * @throws MongoException
+	 * @throws DataAccessException
+	 */
+	@Nullable
+	T doInCollection(MongoCollection<Document> collection) throws MongoException, DataAccessException;
+
+}

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

@@ -1,70 +1,166 @@
-/*
- * Copyright 2010-2011 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-/**
- * Provides a simple wrapper to encapsulate the variety of settings you can use when creating a collection.
- * 
- * @author Thomas Risberg
- */
-public class CollectionOptions {
-
-	private Integer maxDocuments;
-
-	private Integer size;
-
-	private Boolean capped;
-
-	/**
-	 * Constructs a new <code>CollectionOptions</code> instance.
-	 * 
-	 * @param size the collection size in bytes, this data space is preallocated
-	 * @param maxDocuments the maximum number of documents in the collection.
-	 * @param capped true to created a "capped" collection (fixed size with auto-FIFO behavior based on insertion order),
-	 *          false otherwise.
-	 */
-	public CollectionOptions(Integer size, Integer maxDocuments, Boolean capped) {
-		super();
-		this.maxDocuments = maxDocuments;
-		this.size = size;
-		this.capped = capped;
-	}
-
-	public Integer getMaxDocuments() {
-		return maxDocuments;
-	}
-
-	public void setMaxDocuments(Integer maxDocuments) {
-		this.maxDocuments = maxDocuments;
-	}
-
-	public Integer getSize() {
-		return size;
-	}
-
-	public void setSize(Integer size) {
-		this.size = size;
-	}
-
-	public Boolean getCapped() {
-		return capped;
-	}
-
-	public void setCapped(Boolean capped) {
-		this.capped = capped;
-	}
-
-}
+/*
+ * Copyright 2010-2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import java.util.Optional;
+
+import org.springframework.data.mongodb.core.query.Collation;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+
+/**
+ * Provides a simple wrapper to encapsulate the variety of settings you can use when creating a collection.
+ *
+ * @author Thomas Risberg
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ */
+public class CollectionOptions {
+
+	private @Nullable Long maxDocuments;
+	private @Nullable Long size;
+	private @Nullable Boolean capped;
+	private @Nullable Collation collation;
+
+	/**
+	 * Constructs a new <code>CollectionOptions</code> instance.
+	 *
+	 * @param size the collection size in bytes, this data space is preallocated. Can be {@literal null}.
+	 * @param maxDocuments the maximum number of documents in the collection. Can be {@literal null}.
+	 * @param capped true to created a "capped" collection (fixed size with auto-FIFO behavior based on insertion order),
+	 *          false otherwise. Can be {@literal null}.
+	 * @deprecated since 2.0 please use {@link CollectionOptions#empty()} as entry point.
+	 */
+	@Deprecated
+	public CollectionOptions(@Nullable Long size, @Nullable Long maxDocuments, @Nullable Boolean capped) {
+		this(size, maxDocuments, capped, null);
+	}
+
+	private CollectionOptions(@Nullable Long size, @Nullable Long maxDocuments, @Nullable Boolean capped,
+			@Nullable Collation collation) {
+
+		this.maxDocuments = maxDocuments;
+		this.size = size;
+		this.capped = capped;
+		this.collation = collation;
+	}
+
+	/**
+	 * Create new {@link CollectionOptions} by just providing the {@link Collation} to use.
+	 *
+	 * @param collation must not be {@literal null}.
+	 * @return new {@link CollectionOptions}.
+	 * @since 2.0
+	 */
+	public static CollectionOptions just(Collation collation) {
+
+		Assert.notNull(collation, "Collation must not be null!");
+
+		return new CollectionOptions(null, null, null, collation);
+	}
+
+	/**
+	 * Create new empty {@link CollectionOptions}.
+	 *
+	 * @return new {@link CollectionOptions}.
+	 * @since 2.0
+	 */
+	public static CollectionOptions empty() {
+		return new CollectionOptions(null, null, null, null);
+	}
+
+	/**
+	 * Create new {@link CollectionOptions} with already given settings and capped set to {@literal true}. <br />
+	 * <strong>NOTE</strong> Using capped collections requires defining {@link #size(int)}.
+	 *
+	 * @return new {@link CollectionOptions}.
+	 * @since 2.0
+	 */
+	public CollectionOptions capped() {
+		return new CollectionOptions(size, maxDocuments, true, collation);
+	}
+
+	/**
+	 * Create new {@link CollectionOptions} with already given settings and {@code maxDocuments} set to given value.
+	 *
+	 * @param maxDocuments can be {@literal null}.
+	 * @return new {@link CollectionOptions}.
+	 * @since 2.0
+	 */
+	public CollectionOptions maxDocuments(long maxDocuments) {
+		return new CollectionOptions(size, maxDocuments, capped, collation);
+	}
+
+	/**
+	 * Create new {@link CollectionOptions} with already given settings and {@code size} set to given value.
+	 *
+	 * @param size can be {@literal null}.
+	 * @return new {@link CollectionOptions}.
+	 * @since 2.0
+	 */
+	public CollectionOptions size(long size) {
+		return new CollectionOptions(size, maxDocuments, capped, collation);
+	}
+
+	/**
+	 * Create new {@link CollectionOptions} with already given settings and {@code collation} set to given value.
+	 *
+	 * @param collation can be {@literal null}.
+	 * @return new {@link CollectionOptions}.
+	 * @since 2.0
+	 */
+	public CollectionOptions collation(@Nullable Collation collation) {
+		return new CollectionOptions(size, maxDocuments, capped, collation);
+	}
+
+	/**
+	 * Get the max number of documents the collection should be limited to.
+	 *
+	 * @return {@link Optional#empty()} if not set.
+	 */
+	public Optional<Long> getMaxDocuments() {
+		return Optional.ofNullable(maxDocuments);
+	}
+
+	/**
+	 * Get the {@literal size} in bytes the collection should be limited to.
+	 *
+	 * @return {@link Optional#empty()} if not set.
+	 */
+	public Optional<Long> getSize() {
+		return Optional.ofNullable(size);
+	}
+
+	/**
+	 * Get if the collection should be capped.
+	 *
+	 * @return {@link Optional#empty()} if not set.
+	 * @since 2.0
+	 */
+	public Optional<Boolean> getCapped() {
+		return Optional.ofNullable(capped);
+	}
+
+	/**
+	 * Get the {@link Collation} settings.
+	 *
+	 * @return {@link Optional#empty()} if not set.
+	 * @since 2.0
+	 */
+	public Optional<Collation> getCollation() {
+		return Optional.ofNullable(collation);
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-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.
@@ -15,19 +15,22 @@
  */
 package org.springframework.data.mongodb.core;
 
-import com.mongodb.DBCursor;
+import org.bson.Document;
+
+import com.mongodb.client.FindIterable;
 
 /**
- * Simple callback interface to allow customization of a {@link DBCursor}.
+ * Simple callback interface to allow customization of a {@link FindIterable}.
  * 
  * @author Oliver Gierke
+ * @author Christoph Strobl
  */
 interface CursorPreparer {
 
 	/**
-	 * Prepare the given cursor (apply limits, skips and so on). Returns th eprepared cursor.
+	 * Prepare the given cursor (apply limits, skips and so on). Returns the prepared cursor.
 	 * 
 	 * @param cursor
 	 */
-	DBCursor prepare(DBCursor cursor);
+	FindIterable<Document> prepare(FindIterable<Document> cursor);
 }

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

@@ -1,25 +1,44 @@
-/*
- * Copyright 2010-2011 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import com.mongodb.DB;
-import com.mongodb.MongoException;
-import org.springframework.dao.DataAccessException;
-
-public interface DbCallback<T> {
-
-	T doInDB(DB db) throws MongoException, DataAccessException;
-}
+/*
+ * Copyright 2010-2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import org.springframework.dao.DataAccessException;
+import org.springframework.lang.Nullable;
+
+import com.mongodb.MongoException;
+import com.mongodb.client.MongoDatabase;
+
+/**
+ * Callback interface for executing actions against a {@link MongoDatabase}.
+ *
+ * @author Mark Pollak
+ * @author Graeme Rocher
+ * @author Thomas Risberg
+ * @author Oliver Gierke
+ * @author John Brisbin
+ * @author Christoph Strobl
+ */
+public interface DbCallback<T> {
+
+	/**
+	 * @param db must not be {@literal null}.
+	 * @return can be {@literal null}.
+	 * @throws MongoException
+	 * @throws DataAccessException
+	 */
+	@Nullable
+	T doInDB(MongoDatabase db) throws MongoException, DataAccessException;
+}

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

@@ -1,66 +0,0 @@
-package org.springframework.data.mongodb.core;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import com.mongodb.DB;
-import org.springframework.transaction.support.ResourceHolderSupport;
-import org.springframework.util.Assert;
-
-class DbHolder extends ResourceHolderSupport {
-	private static final Object DEFAULT_KEY = new Object();
-
-	private final Map<Object, DB> dbMap = new ConcurrentHashMap<Object, DB>();
-
-	public DbHolder(DB db) {
-		addDB(db);
-	}
-
-	public DbHolder(Object key, DB db) {
-		addDB(key, db);
-	}
-
-	public DB getDB() {
-		return getDB(DEFAULT_KEY);
-	}
-
-	public DB getDB(Object key) {
-		return this.dbMap.get(key);
-	}
-
-	public DB getAnyDB() {
-		if (!this.dbMap.isEmpty()) {
-			return this.dbMap.values().iterator().next();
-		}
-		return null;
-	}
-
-	public void addDB(DB session) {
-		addDB(DEFAULT_KEY, session);
-	}
-
-	public void addDB(Object key, DB session) {
-		Assert.notNull(key, "Key must not be null");
-		Assert.notNull(session, "DB must not be null");
-		this.dbMap.put(key, session);
-	}
-
-	public DB removeDB(Object key) {
-		return this.dbMap.remove(key);
-	}
-
-	public boolean containsDB(DB session) {
-		return this.dbMap.containsValue(session);
-	}
-
-	public boolean isEmpty() {
-		return this.dbMap.isEmpty();
-	}
-
-	public boolean doesNotHoldNonDefaultDB() {
-		synchronized (this.dbMap) {
-			return this.dbMap.isEmpty() || (this.dbMap.size() == 1 && this.dbMap.containsKey(DEFAULT_KEY));
-		}
-	}
-
-}

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

@@ -0,0 +1,395 @@
+/*
+ * Copyright 2015-2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import lombok.NonNull;
+import lombok.Value;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.bson.Document;
+import org.bson.conversions.Bson;
+import org.springframework.dao.DataAccessException;
+import org.springframework.dao.support.PersistenceExceptionTranslator;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.convert.UpdateMapper;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.query.Collation;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
+import org.springframework.data.util.Pair;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+
+import com.mongodb.BulkWriteException;
+import com.mongodb.WriteConcern;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.model.BulkWriteOptions;
+import com.mongodb.client.model.DeleteManyModel;
+import com.mongodb.client.model.DeleteOneModel;
+import com.mongodb.client.model.DeleteOptions;
+import com.mongodb.client.model.InsertOneModel;
+import com.mongodb.client.model.UpdateManyModel;
+import com.mongodb.client.model.UpdateOneModel;
+import com.mongodb.client.model.UpdateOptions;
+import com.mongodb.client.model.WriteModel;
+
+/**
+ * Default implementation for {@link BulkOperations}.
+ *
+ * @author Tobias Trelle
+ * @author Oliver Gierke
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @since 1.9
+ */
+class DefaultBulkOperations implements BulkOperations {
+
+	private final MongoOperations mongoOperations;
+	private final String collectionName;
+	private final BulkOperationContext bulkOperationContext;
+	private final List<WriteModel<Document>> models = new ArrayList<>();
+
+	private PersistenceExceptionTranslator exceptionTranslator;
+	private @Nullable WriteConcern defaultWriteConcern;
+
+	private BulkWriteOptions bulkOptions;
+
+	/**
+	 * Creates a new {@link DefaultBulkOperations} for the given {@link MongoOperations}, collection name and
+	 * {@link BulkOperationContext}.
+	 *
+	 * @param mongoOperations must not be {@literal null}.
+	 * @param collectionName must not be {@literal null}.
+	 * @param bulkOperationContext must not be {@literal null}.
+	 * @since 2.0
+	 */
+	DefaultBulkOperations(MongoOperations mongoOperations, String collectionName,
+			BulkOperationContext bulkOperationContext) {
+
+		Assert.notNull(mongoOperations, "MongoOperations must not be null!");
+		Assert.hasText(collectionName, "CollectionName must not be null nor empty!");
+		Assert.notNull(bulkOperationContext, "BulkOperationContext must not be null!");
+
+		this.mongoOperations = mongoOperations;
+		this.collectionName = collectionName;
+		this.bulkOperationContext = bulkOperationContext;
+		this.exceptionTranslator = new MongoExceptionTranslator();
+		this.bulkOptions = getBulkWriteOptions(bulkOperationContext.getBulkMode());
+	}
+
+	/**
+	 * Configures the {@link PersistenceExceptionTranslator} to be used. Defaults to {@link MongoExceptionTranslator}.
+	 *
+	 * @param exceptionTranslator can be {@literal null}.
+	 */
+	public void setExceptionTranslator(@Nullable PersistenceExceptionTranslator exceptionTranslator) {
+		this.exceptionTranslator = exceptionTranslator == null ? new MongoExceptionTranslator() : exceptionTranslator;
+	}
+
+	/**
+	 * Configures the default {@link WriteConcern} to be used. Defaults to {@literal null}.
+	 *
+	 * @param defaultWriteConcern can be {@literal null}.
+	 */
+	void setDefaultWriteConcern(@Nullable WriteConcern defaultWriteConcern) {
+		this.defaultWriteConcern = defaultWriteConcern;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.BulkOperations#insert(java.lang.Object)
+	 */
+	@Override
+	public BulkOperations insert(Object document) {
+
+		Assert.notNull(document, "Document must not be null!");
+
+		if (document instanceof Document) {
+
+			models.add(new InsertOneModel<>((Document) document));
+			return this;
+		}
+
+		Document sink = new Document();
+		mongoOperations.getConverter().write(document, sink);
+
+		models.add(new InsertOneModel<>(sink));
+
+		return this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.BulkOperations#insert(java.util.List)
+	 */
+	@Override
+	public BulkOperations insert(List<? extends Object> documents) {
+
+		Assert.notNull(documents, "Documents must not be null!");
+
+		documents.forEach(this::insert);
+
+		return this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.BulkOperations#updateOne(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.Update)
+	 */
+	@Override
+	@SuppressWarnings("unchecked")
+	public BulkOperations updateOne(Query query, Update update) {
+
+		Assert.notNull(query, "Query must not be null!");
+		Assert.notNull(update, "Update must not be null!");
+
+		return updateOne(Collections.singletonList(Pair.of(query, update)));
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.BulkOperations#updateOne(java.util.List)
+	 */
+	@Override
+	public BulkOperations updateOne(List<Pair<Query, Update>> updates) {
+
+		Assert.notNull(updates, "Updates must not be null!");
+
+		for (Pair<Query, Update> update : updates) {
+			update(update.getFirst(), update.getSecond(), false, false);
+		}
+
+		return this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.BulkOperations#updateMulti(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.Update)
+	 */
+	@Override
+	@SuppressWarnings("unchecked")
+	public BulkOperations updateMulti(Query query, Update update) {
+
+		Assert.notNull(query, "Query must not be null!");
+		Assert.notNull(update, "Update must not be null!");
+
+		return updateMulti(Collections.singletonList(Pair.of(query, update)));
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.BulkOperations#updateMulti(java.util.List)
+	 */
+	@Override
+	public BulkOperations updateMulti(List<Pair<Query, Update>> updates) {
+
+		Assert.notNull(updates, "Updates must not be null!");
+
+		for (Pair<Query, Update> update : updates) {
+			update(update.getFirst(), update.getSecond(), false, true);
+		}
+
+		return this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.BulkOperations#upsert(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.Update)
+	 */
+	@Override
+	public BulkOperations upsert(Query query, Update update) {
+		return update(query, update, true, true);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.BulkOperations#upsert(java.util.List)
+	 */
+	@Override
+	public BulkOperations upsert(List<Pair<Query, Update>> updates) {
+
+		for (Pair<Query, Update> update : updates) {
+			upsert(update.getFirst(), update.getSecond());
+		}
+
+		return this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.BulkOperations#remove(org.springframework.data.mongodb.core.query.Query)
+	 */
+	@Override
+	public BulkOperations remove(Query query) {
+
+		Assert.notNull(query, "Query must not be null!");
+
+		DeleteOptions deleteOptions = new DeleteOptions();
+		query.getCollation().map(Collation::toMongoCollation).ifPresent(deleteOptions::collation);
+
+		models.add(new DeleteManyModel<>(query.getQueryObject(), deleteOptions));
+
+		return this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.BulkOperations#remove(java.util.List)
+	 */
+	@Override
+	public BulkOperations remove(List<Query> removes) {
+
+		Assert.notNull(removes, "Removals must not be null!");
+
+		for (Query query : removes) {
+			remove(query);
+		}
+
+		return this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.BulkOperations#executeBulk()
+	 */
+	@Override
+	public com.mongodb.bulk.BulkWriteResult execute() {
+
+		try {
+
+			MongoCollection<Document> collection = mongoOperations.getCollection(collectionName);
+			if (defaultWriteConcern != null) {
+				collection = collection.withWriteConcern(defaultWriteConcern);
+			}
+
+			return collection.bulkWrite(models.stream().map(this::mapWriteModel).collect(Collectors.toList()), bulkOptions);
+
+		} catch (BulkWriteException o_O) {
+
+			DataAccessException toThrow = exceptionTranslator.translateExceptionIfPossible(o_O);
+			throw toThrow == null ? o_O : toThrow;
+
+		} finally {
+			this.bulkOptions = getBulkWriteOptions(bulkOperationContext.getBulkMode());
+		}
+	}
+
+	/**
+	 * Performs update and upsert bulk operations.
+	 *
+	 * @param query the {@link Query} to determine documents to update.
+	 * @param update the {@link Update} to perform, must not be {@literal null}.
+	 * @param upsert whether to upsert.
+	 * @param multi whether to issue a multi-update.
+	 * @return the {@link BulkOperations} with the update registered.
+	 */
+	private BulkOperations update(Query query, Update update, boolean upsert, boolean multi) {
+
+		Assert.notNull(query, "Query must not be null!");
+		Assert.notNull(update, "Update must not be null!");
+
+		UpdateOptions options = new UpdateOptions();
+		options.upsert(upsert);
+		query.getCollation().map(Collation::toMongoCollation).ifPresent(options::collation);
+
+		if (multi) {
+			models.add(new UpdateManyModel<>(query.getQueryObject(), update.getUpdateObject(), options));
+		} else {
+			models.add(new UpdateOneModel<>(query.getQueryObject(), update.getUpdateObject(), options));
+		}
+
+		return this;
+	}
+
+	private WriteModel<Document> mapWriteModel(WriteModel<Document> writeModel) {
+
+		if (writeModel instanceof UpdateOneModel) {
+
+			UpdateOneModel<Document> model = (UpdateOneModel<Document>) writeModel;
+
+			return new UpdateOneModel<>(getMappedQuery(model.getFilter()), getMappedUpdate(model.getUpdate()),
+					model.getOptions());
+		}
+
+		if (writeModel instanceof UpdateManyModel) {
+
+			UpdateManyModel<Document> model = (UpdateManyModel<Document>) writeModel;
+
+			return new UpdateManyModel<>(getMappedQuery(model.getFilter()), getMappedUpdate(model.getUpdate()),
+					model.getOptions());
+		}
+
+		if (writeModel instanceof DeleteOneModel) {
+
+			DeleteOneModel<Document> model = (DeleteOneModel<Document>) writeModel;
+
+			return new DeleteOneModel<>(getMappedQuery(model.getFilter()), model.getOptions());
+		}
+
+		if (writeModel instanceof DeleteManyModel) {
+
+			DeleteManyModel<Document> model = (DeleteManyModel<Document>) writeModel;
+
+			return new DeleteManyModel<>(getMappedQuery(model.getFilter()), model.getOptions());
+		}
+
+		return writeModel;
+	}
+
+	private Bson getMappedUpdate(Bson update) {
+		return bulkOperationContext.getUpdateMapper().getMappedObject(update, bulkOperationContext.getEntity());
+	}
+
+	private Bson getMappedQuery(Bson query) {
+		return bulkOperationContext.getQueryMapper().getMappedObject(query, bulkOperationContext.getEntity());
+	}
+
+	private static BulkWriteOptions getBulkWriteOptions(BulkMode bulkMode) {
+
+		BulkWriteOptions options = new BulkWriteOptions();
+
+		switch (bulkMode) {
+			case ORDERED:
+				return options.ordered(true);
+			case UNORDERED:
+				return options.ordered(false);
+		}
+
+		throw new IllegalStateException("BulkMode was null!");
+	}
+
+	/**
+	 * {@link BulkOperationContext} holds information about
+	 * {@link org.springframework.data.mongodb.core.BulkOperations.BulkMode} the entity in use as well as references to
+	 * {@link QueryMapper} and {@link UpdateMapper}.
+	 *
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	@Value
+	static class BulkOperationContext {
+
+		@NonNull BulkMode bulkMode;
+		@NonNull Optional<? extends MongoPersistentEntity<?>> entity;
+		@NonNull QueryMapper queryMapper;
+		@NonNull UpdateMapper updateMapper;
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2017 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.
@@ -15,81 +15,137 @@
  */
 package org.springframework.data.mongodb.core;
 
+import static org.springframework.data.mongodb.core.MongoTemplate.*;
+
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
+import org.bson.Document;
 import org.springframework.dao.DataAccessException;
+import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.index.IndexDefinition;
-import org.springframework.data.mongodb.core.index.IndexField;
 import org.springframework.data.mongodb.core.index.IndexInfo;
-import org.springframework.data.mongodb.core.query.Order;
+import org.springframework.data.mongodb.core.index.IndexOperations;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
-import com.mongodb.DBCollection;
-import com.mongodb.DBObject;
 import com.mongodb.MongoException;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoCursor;
+import com.mongodb.client.model.IndexOptions;
 
 /**
  * Default implementation of {@link IndexOperations}.
- * 
+ *
  * @author Mark Pollack
  * @author Oliver Gierke
+ * @author Komi Innocent
+ * @author Christoph Strobl
+ * @author Mark Paluch
  */
 public class DefaultIndexOperations implements IndexOperations {
 
-	private final MongoOperations mongoOperations;
+	private static final String PARTIAL_FILTER_EXPRESSION_KEY = "partialFilterExpression";
+
+	private final MongoDbFactory mongoDbFactory;
 	private final String collectionName;
+	private final QueryMapper mapper;
+	private final @Nullable Class<?> type;
 
 	/**
 	 * Creates a new {@link DefaultIndexOperations}.
-	 * 
-	 * @param mongoOperations must not be {@literal null}.
+	 *
+	 * @param mongoDbFactory must not be {@literal null}.
 	 * @param collectionName must not be {@literal null}.
+	 * @param queryMapper must not be {@literal null}.
 	 */
-	public DefaultIndexOperations(MongoOperations mongoOperations, String collectionName) {
+	public DefaultIndexOperations(MongoDbFactory mongoDbFactory, String collectionName, QueryMapper queryMapper) {
+		this(mongoDbFactory, collectionName, queryMapper, null);
+	}
 
-		Assert.notNull(mongoOperations, "MongoOperations must not be null!");
+	/**
+	 * Creates a new {@link DefaultIndexOperations}.
+	 *
+	 * @param mongoDbFactory must not be {@literal null}.
+	 * @param collectionName must not be {@literal null}.
+	 * @param queryMapper must not be {@literal null}.
+	 * @param type Type used for mapping potential partial index filter expression. Can be {@literal null}.
+	 * @since 1.10
+	 */
+	public DefaultIndexOperations(MongoDbFactory mongoDbFactory, String collectionName, QueryMapper queryMapper,
+			@Nullable Class<?> type) {
+
+		Assert.notNull(mongoDbFactory, "MongoDbFactory must not be null!");
 		Assert.notNull(collectionName, "Collection name can not be null!");
+		Assert.notNull(queryMapper, "QueryMapper must not be null!");
 
-		this.mongoOperations = mongoOperations;
+		this.mongoDbFactory = mongoDbFactory;
 		this.collectionName = collectionName;
+		this.mapper = queryMapper;
+		this.type = type;
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.IndexOperations#ensureIndex(org.springframework.data.mongodb.core.index.IndexDefinition)
+	 * @see org.springframework.data.mongodb.core.index.IndexOperations#ensureIndex(org.springframework.data.mongodb.core.index.IndexDefinition)
 	 */
-	public void ensureIndex(final IndexDefinition indexDefinition) {
-		mongoOperations.execute(collectionName, new CollectionCallback<Object>() {
-			public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
-				DBObject indexOptions = indexDefinition.getIndexOptions();
-				if (indexOptions != null) {
-					collection.ensureIndex(indexDefinition.getIndexKeys(), indexOptions);
-				} else {
-					collection.ensureIndex(indexDefinition.getIndexKeys());
-				}
-				return null;
+	public String ensureIndex(final IndexDefinition indexDefinition) {
+
+		return execute(collection -> {
+
+			Document indexOptions = indexDefinition.getIndexOptions();
+
+			IndexOptions ops = IndexConverters.indexDefinitionToIndexOptionsConverter().convert(indexDefinition);
+
+			if (indexOptions.containsKey(PARTIAL_FILTER_EXPRESSION_KEY)) {
+
+				Assert.isInstanceOf(Document.class, indexOptions.get(PARTIAL_FILTER_EXPRESSION_KEY));
+
+				ops.partialFilterExpression(mapper.getMappedObject((Document) indexOptions.get(PARTIAL_FILTER_EXPRESSION_KEY),
+						lookupPersistentEntity(type, collectionName)));
 			}
+
+			return collection.createIndex(indexDefinition.getIndexKeys(), ops);
 		});
 	}
 
+	@Nullable
+	private MongoPersistentEntity<?> lookupPersistentEntity(@Nullable Class<?> entityType, String collection) {
+
+		if (entityType != null) {
+			return mapper.getMappingContext().getRequiredPersistentEntity(entityType);
+		}
+
+		Collection<? extends MongoPersistentEntity<?>> entities = mapper.getMappingContext().getPersistentEntities();
+
+		for (MongoPersistentEntity<?> entity : entities) {
+			if (entity.getCollection().equals(collection)) {
+				return entity;
+			}
+		}
+
+		return null;
+	}
+
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.IndexOperations#dropIndex(java.lang.String)
+	 * @see org.springframework.data.mongodb.core.index.IndexOperations#dropIndex(java.lang.String)
 	 */
 	public void dropIndex(final String name) {
-		mongoOperations.execute(collectionName, new CollectionCallback<Void>() {
-			public Void doInCollection(DBCollection collection) throws MongoException, DataAccessException {
-				collection.dropIndex(name);
-				return null;
-			}
+
+		execute(collection -> {
+			collection.dropIndex(name);
+			return null;
 		});
 
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.IndexOperations#dropAllIndexes()
+	 * @see org.springframework.data.mongodb.core.index.IndexOperations#dropAllIndexes()
 	 */
 	public void dropAllIndexes() {
 		dropIndex("*");
@@ -97,64 +153,45 @@ public class DefaultIndexOperations implements IndexOperations {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.IndexOperations#resetIndexCache()
-	 */
-	public void resetIndexCache() {
-		mongoOperations.execute(collectionName, new CollectionCallback<Void>() {
-			public Void doInCollection(DBCollection collection) throws MongoException, DataAccessException {
-				collection.resetIndexCache();
-				return null;
-			}
-		});
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.IndexOperations#getIndexInfo()
+	 * @see org.springframework.data.mongodb.core.index.IndexOperations#getIndexInfo()
 	 */
 	public List<IndexInfo> getIndexInfo() {
 
-		return mongoOperations.execute(collectionName, new CollectionCallback<List<IndexInfo>>() {
-			public List<IndexInfo> doInCollection(DBCollection collection) throws MongoException, DataAccessException {
-				List<DBObject> dbObjectList = collection.getIndexInfo();
-				return getIndexData(dbObjectList);
+		return execute(new CollectionCallback<List<IndexInfo>>() {
+
+			public List<IndexInfo> doInCollection(MongoCollection<Document> collection)
+					throws MongoException, DataAccessException {
+
+				MongoCursor<Document> cursor = collection.listIndexes(Document.class).iterator();
+				return getIndexData(cursor);
 			}
 
-			private List<IndexInfo> getIndexData(List<DBObject> dbObjectList) {
+			private List<IndexInfo> getIndexData(MongoCursor<Document> cursor) {
 
 				List<IndexInfo> indexInfoList = new ArrayList<IndexInfo>();
 
-				for (DBObject ix : dbObjectList) {
+				while (cursor.hasNext()) {
 
-					DBObject keyDbObject = (DBObject) ix.get("key");
-					int numberOfElements = keyDbObject.keySet().size();
-
-					List<IndexField> indexFields = new ArrayList<IndexField>(numberOfElements);
-
-					for (String key : keyDbObject.keySet()) {
-
-						Object value = keyDbObject.get(key);
-
-						if (Integer.valueOf(1).equals(value)) {
-							indexFields.add(IndexField.create(key, Order.ASCENDING));
-						} else if (Integer.valueOf(-1).equals(value)) {
-							indexFields.add(IndexField.create(key, Order.DESCENDING));
-						} else if ("2d".equals(value)) {
-							indexFields.add(IndexField.geo(key));
-						}
-					}
-
-					String name = ix.get("name").toString();
-
-					boolean unique = ix.containsField("unique") ? (Boolean) ix.get("unique") : false;
-					boolean dropDuplicates = ix.containsField("dropDups") ? (Boolean) ix.get("dropDups") : false;
-					boolean sparse = ix.containsField("sparse") ? (Boolean) ix.get("sparse") : false;
-
-					indexInfoList.add(new IndexInfo(indexFields, name, unique, dropDuplicates, sparse));
+					Document ix = cursor.next();
+					IndexInfo indexInfo = IndexConverters.documentToIndexInfoConverter().convert(ix);
+					indexInfoList.add(indexInfo);
 				}
 
 				return indexInfoList;
 			}
 		});
 	}
+
+	@Nullable
+	public <T> T execute(CollectionCallback<T> callback) {
+
+		Assert.notNull(callback, "CollectionCallback must not be null!");
+
+		try {
+			MongoCollection<Document> collection = mongoDbFactory.getDb().getCollection(collectionName);
+			return callback.doInCollection(collection);
+		} catch (RuntimeException e) {
+			throw potentiallyConvertRuntimeException(e, mongoDbFactory.getExceptionTranslator());
+		}
+	}
 }

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

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2016-2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.index.IndexOperations;
+import org.springframework.data.mongodb.core.index.IndexOperationsProvider;
+
+/**
+ * {@link IndexOperationsProvider} to obtain {@link IndexOperations} from a given {@link MongoDbFactory}.
+ *
+ * @author Mark Paluch
+ * @author Christoph Strobl
+ * @since 2.0
+ */
+class DefaultIndexOperationsProvider implements IndexOperationsProvider {
+
+	private final MongoDbFactory mongoDbFactory;
+	private final QueryMapper mapper;
+
+	/**
+	 * @param mongoDbFactory must not be {@literal null}.
+	 * @param mapper must not be {@literal null}.
+	 */
+	DefaultIndexOperationsProvider(MongoDbFactory mongoDbFactory, QueryMapper mapper) {
+
+		this.mongoDbFactory = mongoDbFactory;
+		this.mapper = mapper;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.index.IndexOperationsProvider#reactiveIndexOps(java.lang.String)
+	 */
+	@Override
+	public IndexOperations indexOps(String collectionName) {
+		return new DefaultIndexOperations(mongoDbFactory, collectionName, mapper);
+	}
+}

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

@@ -0,0 +1,151 @@
+/*
+ * Copyright 2016-2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.util.Collection;
+import java.util.Optional;
+
+import org.bson.Document;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.index.IndexDefinition;
+import org.springframework.data.mongodb.core.index.IndexInfo;
+import org.springframework.data.mongodb.core.index.ReactiveIndexOperations;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+
+import com.mongodb.client.model.IndexOptions;
+
+/**
+ * Default implementation of {@link ReactiveIndexOperations}.
+ *
+ * @author Mark Paluch
+ * @author Christoph Strobl
+ * @since 2.0
+ */
+public class DefaultReactiveIndexOperations implements ReactiveIndexOperations {
+
+	private static final String PARTIAL_FILTER_EXPRESSION_KEY = "partialFilterExpression";
+
+	private final ReactiveMongoOperations mongoOperations;
+	private final String collectionName;
+	private final QueryMapper queryMapper;
+	private final Optional<Class<?>> type;
+
+	/**
+	 * Creates a new {@link DefaultReactiveIndexOperations}.
+	 *
+	 * @param mongoOperations must not be {@literal null}.
+	 * @param collectionName must not be {@literal null}.
+	 * @param queryMapper must not be {@literal null}.
+	 */
+	public DefaultReactiveIndexOperations(ReactiveMongoOperations mongoOperations, String collectionName,
+			QueryMapper queryMapper) {
+		this(mongoOperations, collectionName, queryMapper, Optional.empty());
+	}
+
+	/**
+	 * Creates a new {@link DefaultReactiveIndexOperations}.
+	 *
+	 * @param mongoOperations must not be {@literal null}.
+	 * @param collectionName must not be {@literal null}.
+	 * @param queryMapper must not be {@literal null}.
+	 * @param type used for mapping potential partial index filter expression, must not be {@literal null}.
+	 */
+	public DefaultReactiveIndexOperations(ReactiveMongoOperations mongoOperations, String collectionName,
+			QueryMapper queryMapper, Class<?> type) {
+		this(mongoOperations, collectionName, queryMapper, Optional.of(type));
+	}
+
+	private DefaultReactiveIndexOperations(ReactiveMongoOperations mongoOperations, String collectionName,
+			QueryMapper queryMapper, Optional<Class<?>> type) {
+
+		Assert.notNull(mongoOperations, "ReactiveMongoOperations must not be null!");
+		Assert.notNull(collectionName, "Collection must not be null!");
+		Assert.notNull(queryMapper, "QueryMapper must not be null!");
+
+		this.mongoOperations = mongoOperations;
+		this.collectionName = collectionName;
+		this.queryMapper = queryMapper;
+		this.type = type;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.index.ReactiveIndexOperations#ensureIndex(org.springframework.data.mongodb.core.index.IndexDefinition)
+	 */
+	public Mono<String> ensureIndex(final IndexDefinition indexDefinition) {
+
+		return mongoOperations.execute(collectionName, collection -> {
+
+			Document indexOptions = indexDefinition.getIndexOptions();
+
+			IndexOptions ops = IndexConverters.indexDefinitionToIndexOptionsConverter().convert(indexDefinition);
+
+			if (indexOptions.containsKey(PARTIAL_FILTER_EXPRESSION_KEY)) {
+
+				Assert.isInstanceOf(Document.class, indexOptions.get(PARTIAL_FILTER_EXPRESSION_KEY));
+
+				MongoPersistentEntity<?> entity = type
+						.map(val -> (MongoPersistentEntity) queryMapper.getMappingContext().getRequiredPersistentEntity(val))
+						.orElseGet(() -> lookupPersistentEntity(collectionName));
+
+				ops = ops.partialFilterExpression(
+						queryMapper.getMappedObject(indexOptions.get(PARTIAL_FILTER_EXPRESSION_KEY, Document.class), entity));
+			}
+
+			return collection.createIndex(indexDefinition.getIndexKeys(), ops);
+
+		}).next();
+	}
+
+	@Nullable
+	private MongoPersistentEntity<?> lookupPersistentEntity(String collection) {
+
+		Collection<? extends MongoPersistentEntity<?>> entities = queryMapper.getMappingContext().getPersistentEntities();
+
+		return entities.stream() //
+				.filter(entity -> entity.getCollection().equals(collection)) //
+				.findFirst() //
+				.orElse(null);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.index.ReactiveIndexOperations#dropIndex(java.lang.String)
+	 */
+	public Mono<Void> dropIndex(final String name) {
+		return mongoOperations.execute(collectionName, collection -> collection.dropIndex(name)).then();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.index.ReactiveIndexOperations#dropAllIndexes()
+	 */
+	public Mono<Void> dropAllIndexes() {
+		return dropIndex("*");
+	}
+
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.index.ReactiveIndexOperations#getIndexInfo()
+	 */
+	public Flux<IndexInfo> getIndexInfo() {
+
+		return mongoOperations.execute(collectionName, collection -> collection.listIndexes(Document.class)) //
+				.map(IndexConverters.documentToIndexInfoConverter()::convert);
+	}
+}

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

@@ -0,0 +1,199 @@
+/*
+ * Copyright 2014-2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import static java.util.UUID.*;
+import static org.springframework.data.mongodb.core.query.Criteria.*;
+import static org.springframework.data.mongodb.core.query.Query.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.bson.Document;
+import org.bson.types.ObjectId;
+import org.springframework.dao.DataAccessException;
+import org.springframework.data.mongodb.core.script.ExecutableMongoScript;
+import org.springframework.data.mongodb.core.script.NamedMongoScript;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+import com.mongodb.BasicDBList;
+import com.mongodb.MongoException;
+import com.mongodb.client.MongoDatabase;
+
+/**
+ * Default implementation of {@link ScriptOperations} capable of saving and executing {@link ServerSideJavaScript}.
+ * 
+ * @author Christoph Strobl
+ * @author Oliver Gierke
+ * @since 1.7
+ */
+class DefaultScriptOperations implements ScriptOperations {
+
+	private static final String SCRIPT_COLLECTION_NAME = "system.js";
+	private static final String SCRIPT_NAME_PREFIX = "func_";
+
+	private final MongoOperations mongoOperations;
+
+	/**
+	 * Creates new {@link DefaultScriptOperations} using given {@link MongoOperations}.
+	 *
+	 * @param mongoOperations must not be {@literal null}.
+	 */
+	public DefaultScriptOperations(MongoOperations mongoOperations) {
+
+		Assert.notNull(mongoOperations, "MongoOperations must not be null!");
+
+		this.mongoOperations = mongoOperations;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ScriptOperations#register(org.springframework.data.mongodb.core.script.ExecutableMongoScript)
+	 */
+	@Override
+	public NamedMongoScript register(ExecutableMongoScript script) {
+		return register(new NamedMongoScript(generateScriptName(), script));
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ScriptOperations#register(org.springframework.data.mongodb.core.script.NamedMongoScript)
+	 */
+	@Override
+	public NamedMongoScript register(NamedMongoScript script) {
+
+		Assert.notNull(script, "Script must not be null!");
+
+		mongoOperations.save(script, SCRIPT_COLLECTION_NAME);
+		return script;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ScriptOperations#execute(org.springframework.data.mongodb.core.script.ExecutableMongoScript, java.lang.Object[])
+	 */
+	@Override
+	public Object execute(final ExecutableMongoScript script, final Object... args) {
+
+		Assert.notNull(script, "Script must not be null!");
+
+		return mongoOperations.execute(new DbCallback<Object>() {
+
+			@Override
+			public Object doInDB(MongoDatabase db) throws MongoException, DataAccessException {
+
+				Document command = new Document("$eval", script.getCode());
+				BasicDBList commandArgs = new BasicDBList();
+				commandArgs.addAll(Arrays.asList(convertScriptArgs(false, args)));
+				command.append("args", commandArgs);
+				return db.runCommand(command).get("retval");
+			}
+		});
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ScriptOperations#call(java.lang.String, java.lang.Object[])
+	 */
+	@Override
+	public Object call(final String scriptName, final Object... args) {
+
+		Assert.hasText(scriptName, "ScriptName must not be null or empty!");
+
+		return mongoOperations.execute(new DbCallback<Object>() {
+
+			@Override
+			public Object doInDB(MongoDatabase db) throws MongoException, DataAccessException {
+
+				return db.runCommand(new Document("eval", String.format("%s(%s)", scriptName, convertAndJoinScriptArgs(args))))
+						.get("retval");
+			}
+		});
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ScriptOperations#exists(java.lang.String)
+	 */
+	@Override
+	public boolean exists(String scriptName) {
+
+		Assert.hasText(scriptName, "ScriptName must not be null or empty!");
+
+		return mongoOperations.exists(query(where("name").is(scriptName)), NamedMongoScript.class, SCRIPT_COLLECTION_NAME);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ScriptOperations#getScriptNames()
+	 */
+	@Override
+	public Set<String> getScriptNames() {
+
+		List<NamedMongoScript> scripts = mongoOperations.findAll(NamedMongoScript.class, SCRIPT_COLLECTION_NAME);
+
+		if (CollectionUtils.isEmpty(scripts)) {
+			return Collections.emptySet();
+		}
+
+		Set<String> scriptNames = new HashSet<String>();
+
+		for (NamedMongoScript script : scripts) {
+			scriptNames.add(script.getName());
+		}
+
+		return scriptNames;
+	}
+
+	private Object[] convertScriptArgs(boolean quote, Object... args) {
+
+		if (ObjectUtils.isEmpty(args)) {
+			return args;
+		}
+
+		List<Object> convertedValues = new ArrayList<Object>(args.length);
+
+		for (Object arg : args) {
+			convertedValues.add(arg instanceof String && quote ? String.format("'%s'", arg)
+					: this.mongoOperations.getConverter().convertToMongoType(arg));
+		}
+
+		return convertedValues.toArray();
+	}
+
+	private String convertAndJoinScriptArgs(Object... args) {
+		return ObjectUtils.isEmpty(args) ? "" : StringUtils.arrayToCommaDelimitedString(convertScriptArgs(true, args));
+	}
+
+	/**
+	 * Generate a valid name for the {@literal JavaScript}. MongoDB requires an id of type String for scripts. Calling
+	 * scripts having {@link ObjectId} as id fails. Therefore we create a random UUID without {@code -} (as this won't
+	 * work) an prefix the result with {@link #SCRIPT_NAME_PREFIX}.
+	 * 
+	 * @return
+	 */
+	private static String generateScriptName() {
+		return SCRIPT_NAME_PREFIX + randomUUID().toString().replaceAll("-", "");
+	}
+}

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

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import com.mongodb.WriteConcern;
+
+/**
+ * Default {@link WriteConcernResolver} resolving the {@link WriteConcern} from the given {@link MongoAction}.
+ *
+ * @author Oliver Gierke
+ */
+enum DefaultWriteConcernResolver implements WriteConcernResolver {
+
+	INSTANCE;
+
+	public WriteConcern resolve(MongoAction action) {
+		return action.getDefaultWriteConcern();
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-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.
@@ -15,24 +15,26 @@
  */
 package org.springframework.data.mongodb.core;
 
+import org.bson.Document;
 import org.springframework.dao.DataAccessException;
 
-import com.mongodb.DBObject;
 import com.mongodb.MongoException;
 
 /**
  * An interface used by {@link MongoTemplate} for processing documents returned from a MongoDB query on a per-document
  * basis. Implementations of this interface perform the actual work of prcoessing each document but don't need to worry
- * about exception handling. {@MongoException}s will be caught and translated by the calling
- * MongoTemplate
- * 
- * An DocumentCallbackHandler is typically stateful: It keeps the result state within the object, to be available later
- * for later inspection.
+ * about exception handling. {@MongoException}s will be caught and translated by the calling MongoTemplate An
+ * DocumentCallbackHandler is typically stateful: It keeps the result state within the object, to be available later for
+ * later inspection.
  * 
  * @author Mark Pollack
- * 
+ * @author Grame Rocher
+ * @author Oliver Gierke
+ * @author John Brisbin
+ * @author Christoph Strobl
+ * @since 1.0
  */
 public interface DocumentCallbackHandler {
 
-	void processDocument(DBObject dbObject) throws MongoException, DataAccessException;
+	void processDocument(Document document) throws MongoException, DataAccessException;
 }

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

@@ -0,0 +1,122 @@
+/*
+ * Copyright 2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import org.springframework.data.mongodb.core.aggregation.Aggregation;
+import org.springframework.data.mongodb.core.aggregation.AggregationResults;
+import org.springframework.data.util.CloseableIterator;
+
+/**
+ * {@link ExecutableAggregationOperation} allows creation and execution of MongoDB aggregation operations in a fluent
+ * API style. <br />
+ * The starting {@literal domainType} is used for mapping the {@link Aggregation} provided via {@code by} into the
+ * MongoDB specific representation, as well as mapping back the resulting {@link org.bson.Document}. An alternative
+ * input type for mapping the {@link Aggregation} can be provided by using
+ * {@link org.springframework.data.mongodb.core.aggregation.TypedAggregation}.
+ *
+ * <pre>
+ *     <code>
+ *         aggregateAndReturn(Jedi.class)
+ *             .by(newAggregation(Human.class, project("These are not the droids you are looking for")))
+ *             .all();
+ *     </code>
+ * </pre>
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @since 2.0
+ */
+public interface ExecutableAggregationOperation {
+
+	/**
+	 * Start creating an aggregation operation that returns results mapped to the given domain type. <br />
+	 * Use {@link org.springframework.data.mongodb.core.aggregation.TypedAggregation} to specify a potentially different
+	 * input type for he aggregation.
+	 *
+	 * @param domainType must not be {@literal null}.
+	 * @return new instance of {@link ExecutableAggregation}.
+	 * @throws IllegalArgumentException if domainType is {@literal null}.
+	 */
+	<T> ExecutableAggregation<T> aggregateAndReturn(Class<T> domainType);
+
+	/**
+	 * Collection override (Optional).
+	 *
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	interface AggregationWithCollection<T> {
+
+		/**
+		 * Explicitly set the name of the collection to perform the query on. <br />
+		 * Skip this step to use the default collection derived from the domain type.
+		 *
+		 * @param collection must not be {@literal null} nor {@literal empty}.
+		 * @return new instance of {@link AggregationWithAggregation}.
+		 * @throws IllegalArgumentException if collection is {@literal null}.
+		 */
+		AggregationWithAggregation<T> inCollection(String collection);
+	}
+
+	/**
+	 * Trigger execution by calling one of the terminating methods.
+	 *
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	interface TerminatingAggregation<T> {
+
+		/**
+		 * Apply pipeline operations as specified and get all matching elements.
+		 *
+		 * @return never {@literal null}.
+		 */
+		AggregationResults<T> all();
+
+		/**
+		 * Apply pipeline operations as specified and stream all matching elements. <br />
+		 * Returns a {@link CloseableIterator} that wraps the a Mongo DB {@link com.mongodb.Cursor}
+		 *
+		 * @return a {@link CloseableIterator} that wraps the a Mongo DB {@link com.mongodb.Cursor} that needs to be closed.
+		 *         Never {@literal null}.
+		 */
+		CloseableIterator<T> stream();
+	}
+
+	/**
+	 * Define the aggregation with pipeline stages.
+	 *
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	interface AggregationWithAggregation<T> {
+
+		/**
+		 * Set the aggregation to be used.
+		 *
+		 * @param aggregation must not be {@literal null}.
+		 * @return new instance of {@link TerminatingAggregation}.
+		 * @throws IllegalArgumentException if aggregation is {@literal null}.
+		 */
+		TerminatingAggregation<T> by(Aggregation aggregation);
+	}
+
+	/**
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	interface ExecutableAggregation<T> extends AggregationWithCollection<T>, AggregationWithAggregation<T> {}
+}

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

@@ -0,0 +1,141 @@
+/*
+ * Copyright 2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import lombok.AccessLevel;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
+
+import org.springframework.data.mongodb.core.aggregation.Aggregation;
+import org.springframework.data.mongodb.core.aggregation.AggregationResults;
+import org.springframework.data.mongodb.core.aggregation.TypedAggregation;
+import org.springframework.data.util.CloseableIterator;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+/**
+ * Implementation of {@link ExecutableAggregationOperation} operating directly on {@link MongoTemplate}.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @since 2.0
+ */
+class ExecutableAggregationOperationSupport implements ExecutableAggregationOperation {
+
+	private final MongoTemplate template;
+
+	/**
+	 * Create new instance of {@link ExecutableAggregationOperationSupport}.
+	 *
+	 * @param template must not be {@literal null}.
+	 * @throws IllegalArgumentException if template is {@literal null}.
+	 */
+	ExecutableAggregationOperationSupport(MongoTemplate template) {
+
+		Assert.notNull(template, "Template must not be null!");
+
+		this.template = template;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ExecutableAggregationOperation#aggregateAndReturn(java.lang.Class)
+	 */
+	@Override
+	public <T> ExecutableAggregation<T> aggregateAndReturn(Class<T> domainType) {
+
+		Assert.notNull(domainType, "DomainType must not be null!");
+
+		return new ExecutableAggregationSupport<>(template, domainType, null, null);
+	}
+
+	/**
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	@RequiredArgsConstructor
+	@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
+	static class ExecutableAggregationSupport<T>
+			implements AggregationWithAggregation<T>, ExecutableAggregation<T>, TerminatingAggregation<T> {
+
+		@NonNull MongoTemplate template;
+		@NonNull Class<T> domainType;
+		@Nullable Aggregation aggregation;
+		@Nullable String collection;
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableAggregationOperation.AggregationWithCollection#inCollection(java.lang.String)
+		 */
+		@Override
+		public AggregationWithAggregation<T> inCollection(String collection) {
+
+			Assert.hasText(collection, "Collection must not be null nor empty!");
+
+			return new ExecutableAggregationSupport<>(template, domainType, aggregation, collection);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableAggregationOperation.AggregationWithAggregation#by(org.springframework.data.mongodb.core.aggregation.Aggregation)
+		 */
+		@Override
+		public TerminatingAggregation<T> by(Aggregation aggregation) {
+
+			Assert.notNull(aggregation, "Aggregation must not be null!");
+
+			return new ExecutableAggregationSupport<>(template, domainType, aggregation, collection);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableAggregationOperation.TerminatingAggregation#all()
+		 */
+		@Override
+		public AggregationResults<T> all() {
+			return template.aggregate(aggregation, getCollectionName(aggregation), domainType);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableAggregationOperation.TerminatingAggregation#stream()
+		 */
+		@Override
+		public CloseableIterator<T> stream() {
+			return template.aggregateStream(aggregation, getCollectionName(aggregation), domainType);
+		}
+
+		private String getCollectionName(Aggregation aggregation) {
+
+			if (StringUtils.hasText(collection)) {
+				return collection;
+			}
+
+			if (aggregation instanceof TypedAggregation) {
+
+				TypedAggregation<?> typedAggregation = (TypedAggregation<?>) aggregation;
+
+				if (typedAggregation.getInputType() != null) {
+					return template.determineCollectionName(typedAggregation.getInputType());
+				}
+			}
+
+			return template.determineCollectionName(domainType);
+		}
+	}
+}

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

@@ -0,0 +1,226 @@
+/*
+ * Copyright 2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import org.springframework.data.geo.GeoResults;
+import org.springframework.data.mongodb.core.query.NearQuery;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.lang.Nullable;
+
+/**
+ * {@link ExecutableFindOperation} allows creation and execution of MongoDB find operations in a fluent API style.
+ * <br />
+ * The starting {@literal domainType} is used for mapping the {@link Query} provided via {@code matching} into the
+ * MongoDB specific representation. By default, the originating {@literal domainType} is also used for mapping back the
+ * result from the {@link org.bson.Document}. However, it is possible to define an different {@literal returnType} via
+ * {@code as} to mapping the result.<br />
+ * The collection to operate on is by default derived from the initial {@literal domainType} and can be defined there
+ * via {@link org.springframework.data.mongodb.core.mapping.Document}. Using {@code inCollection} allows to override the
+ * collection name for the execution.
+ *
+ * <pre>
+ *     <code>
+ *         query(Human.class)
+ *             .inCollection("star-wars")
+ *             .as(Jedi.class)
+ *             .matching(query(where("firstname").is("luke")))
+ *             .all();
+ *     </code>
+ * </pre>
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @since 2.0
+ */
+public interface ExecutableFindOperation {
+
+	/**
+	 * Start creating a find operation for the given {@literal domainType}.
+	 *
+	 * @param domainType must not be {@literal null}.
+	 * @return new instance of {@link ExecutableFind}.
+	 * @throws IllegalArgumentException if domainType is {@literal null}.
+	 */
+	<T> ExecutableFind<T> query(Class<T> domainType);
+
+	/**
+	 * Trigger find execution by calling one of the terminating methods.
+	 *
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	interface TerminatingFind<T> {
+
+		/**
+		 * Get exactly zero or one result.
+		 *
+		 * @return {@link Optional#empty()} if no match found.
+		 * @throws org.springframework.dao.IncorrectResultSizeDataAccessException if more than one match found.
+		 */
+		default Optional<T> one() {
+			return Optional.ofNullable(oneValue());
+		}
+
+		/**
+		 * Get exactly zero or one result.
+		 *
+		 * @return {@literal null} if no match found.
+		 * @throws org.springframework.dao.IncorrectResultSizeDataAccessException if more than one match found.
+		 */
+		@Nullable
+		T oneValue();
+
+		/**
+		 * Get the first or no result.
+		 *
+		 * @return {@link Optional#empty()} if no match found.
+		 */
+		default Optional<T> first() {
+			return Optional.ofNullable(firstValue());
+		}
+
+		/**
+		 * Get the first or no result.
+		 *
+		 * @return {@literal null} if no match found.
+		 */
+		@Nullable
+		T firstValue();
+
+		/**
+		 * Get all matching elements.
+		 *
+		 * @return never {@literal null}.
+		 */
+		List<T> all();
+
+		/**
+		 * Stream all matching elements.
+		 *
+		 * @return a {@link Stream} that wraps the a Mongo DB {@link com.mongodb.Cursor} that needs to be closed. Never
+		 *         {@literal null}.
+		 */
+		Stream<T> stream();
+
+		/**
+		 * Get the number of matching elements.
+		 *
+		 * @return total number of matching elements.
+		 */
+		long count();
+
+		/**
+		 * Check for the presence of matching elements.
+		 *
+		 * @return {@literal true} if at least one matching element exists.
+		 */
+		boolean exists();
+	}
+
+	/**
+	 * Trigger geonear execution by calling one of the terminating methods.
+	 *
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	interface TerminatingFindNear<T> {
+
+		/**
+		 * Find all matching elements and return them as {@link org.springframework.data.geo.GeoResult}.
+		 *
+		 * @return never {@literal null}.
+		 */
+		GeoResults<T> all();
+	}
+
+	/**
+	 * Terminating operations invoking the actual query execution.
+	 *
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	interface FindWithQuery<T> extends TerminatingFind<T> {
+
+		/**
+		 * Set the filter query to be used.
+		 *
+		 * @param query must not be {@literal null}.
+		 * @return new instance of {@link TerminatingFind}.
+		 * @throws IllegalArgumentException if query is {@literal null}.
+		 */
+		TerminatingFind<T> matching(Query query);
+
+		/**
+		 * Set the filter query for the geoNear execution.
+		 *
+		 * @param nearQuery must not be {@literal null}.
+		 * @return new instance of {@link TerminatingFindNear}.
+		 * @throws IllegalArgumentException if nearQuery is {@literal null}.
+		 */
+		TerminatingFindNear<T> near(NearQuery nearQuery);
+	}
+
+	/**
+	 * Collection override (Optional).
+	 *
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	interface FindWithCollection<T> extends FindWithQuery<T> {
+
+		/**
+		 * Explicitly set the name of the collection to perform the query on. <br />
+		 * Skip this step to use the default collection derived from the domain type.
+		 *
+		 * @param collection must not be {@literal null} nor {@literal empty}.
+		 * @return new instance of {@link FindWithProjection}.
+		 * @throws IllegalArgumentException if collection is {@literal null}.
+		 */
+		FindWithProjection<T> inCollection(String collection);
+	}
+
+	/**
+	 * Result type override (Optional).
+	 *
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	interface FindWithProjection<T> extends FindWithQuery<T> {
+
+		/**
+		 * Define the target type fields should be mapped to. <br />
+		 * Skip this step if you are anyway only interested in the original domain type.
+		 *
+		 * @param resultType must not be {@literal null}.
+		 * @param <R> result type.
+		 * @return new instance of {@link FindWithProjection}.
+		 * @throws IllegalArgumentException if resultType is {@literal null}.
+		 */
+		<R> FindWithQuery<R> as(Class<R> resultType);
+	}
+
+	/**
+	 * {@link ExecutableFind} provides methods for constructing lookup operations in a fluent way.
+	 *
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	interface ExecutableFind<T> extends FindWithCollection<T>, FindWithProjection<T> {}
+}

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

@@ -0,0 +1,264 @@
+/*
+ * Copyright 2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import lombok.AccessLevel;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import org.bson.Document;
+import org.springframework.dao.IncorrectResultSizeDataAccessException;
+import org.springframework.data.mongodb.core.query.NearQuery;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.SerializationUtils;
+import org.springframework.data.util.CloseableIterator;
+import org.springframework.data.util.StreamUtils;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+import com.mongodb.client.FindIterable;
+
+/**
+ * Implementation of {@link ExecutableFindOperation}.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @since 2.0
+ */
+class ExecutableFindOperationSupport implements ExecutableFindOperation {
+
+	private static final Query ALL_QUERY = new Query();
+
+	private final MongoTemplate template;
+
+	/**
+	 * Create new {@link ExecutableFindOperationSupport}.
+	 *
+	 * @param template must not be {@literal null}.
+	 * @throws IllegalArgumentException if template is {@literal null}.
+	 */
+	ExecutableFindOperationSupport(MongoTemplate template) {
+
+		Assert.notNull(template, "Template must not be null!");
+
+		this.template = template;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ExecutableFindOperation#query(java.lang.Class)
+	 */
+	@Override
+	public <T> ExecutableFind<T> query(Class<T> domainType) {
+
+		Assert.notNull(domainType, "DomainType must not be null!");
+
+		return new ExecutableFindSupport<>(template, domainType, domainType, null, ALL_QUERY);
+	}
+
+	/**
+	 * @param <T>
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	@RequiredArgsConstructor
+	@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
+	static class ExecutableFindSupport<T>
+			implements ExecutableFind<T>, FindWithCollection<T>, FindWithProjection<T>, FindWithQuery<T> {
+
+		@NonNull MongoTemplate template;
+		@NonNull Class<?> domainType;
+		Class<T> returnType;
+		@Nullable String collection;
+		Query query;
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.FindWithCollection#inCollection(java.lang.String)
+		 */
+		@Override
+		public FindWithProjection<T> inCollection(String collection) {
+
+			Assert.hasText(collection, "Collection name must not be null nor empty!");
+
+			return new ExecutableFindSupport<>(template, domainType, returnType, collection, query);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.FindWithProjection#as(Class)
+		 */
+		@Override
+		public <T1> FindWithQuery<T1> as(Class<T1> returnType) {
+
+			Assert.notNull(returnType, "ReturnType must not be null!");
+
+			return new ExecutableFindSupport<>(template, domainType, returnType, collection, query);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.FindWithQuery#matching(org.springframework.data.mongodb.core.query.Query)
+		 */
+		@Override
+		public TerminatingFind<T> matching(Query query) {
+
+			Assert.notNull(query, "Query must not be null!");
+
+			return new ExecutableFindSupport<>(template, domainType, returnType, collection, query);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingFind#oneValue()
+		 */
+		@Override
+		public T oneValue() {
+
+			List<T> result = doFind(new DelegatingQueryCursorPreparer(getCursorPreparer(query, null)).limit(2));
+
+			if (ObjectUtils.isEmpty(result)) {
+				return null;
+			}
+
+			if (result.size() > 1) {
+				throw new IncorrectResultSizeDataAccessException("Query " + asString() + " returned non unique result.", 1);
+			}
+
+			return result.iterator().next();
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingFind#firstValue()
+		 */
+		@Override
+		public T firstValue() {
+
+			List<T> result = doFind(new DelegatingQueryCursorPreparer(getCursorPreparer(query, null)).limit(1));
+
+			return ObjectUtils.isEmpty(result) ? null : result.iterator().next();
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingFind#all()
+		 */
+		@Override
+		public List<T> all() {
+			return doFind(null);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingFind#stream()
+		 */
+		@Override
+		public Stream<T> stream() {
+			return StreamUtils.createStreamFromIterator(doStream());
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.FindWithQuery#near(org.springframework.data.mongodb.core.query.NearQuery)
+		 */
+		@Override
+		public TerminatingFindNear<T> near(NearQuery nearQuery) {
+			return () -> template.geoNear(nearQuery, domainType, getCollectionName(), returnType);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingFind#count()
+		 */
+		@Override
+		public long count() {
+			return template.count(query, domainType, getCollectionName());
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingFind#exists()
+		 */
+		@Override
+		public boolean exists() {
+			return template.exists(query, domainType, getCollectionName());
+		}
+
+		private List<T> doFind(@Nullable CursorPreparer preparer) {
+
+			Document queryObject = query.getQueryObject();
+			Document fieldsObject = query.getFieldsObject();
+
+			return template.doFind(getCollectionName(), queryObject, fieldsObject, domainType, returnType,
+					getCursorPreparer(query, preparer));
+		}
+
+		private CloseableIterator<T> doStream() {
+			return template.doStream(query, domainType, getCollectionName(), returnType);
+		}
+
+		private CursorPreparer getCursorPreparer(Query query, @Nullable CursorPreparer preparer) {
+			return preparer != null ? preparer : template.new QueryCursorPreparer(query, domainType);
+		}
+
+		private String getCollectionName() {
+			return StringUtils.hasText(collection) ? collection : template.determineCollectionName(domainType);
+		}
+
+		private String asString() {
+			return SerializationUtils.serializeToJsonSafely(query);
+		}
+	}
+
+	/**
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	static class DelegatingQueryCursorPreparer implements CursorPreparer {
+
+		private final @Nullable CursorPreparer delegate;
+		private Optional<Integer> limit = Optional.empty();
+
+		DelegatingQueryCursorPreparer(@Nullable CursorPreparer delegate) {
+			this.delegate = delegate;
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.CursorPreparer#prepare(com.mongodb.clientFindIterable)
+		 */
+		@Override
+		public FindIterable<Document> prepare(FindIterable<Document> cursor) {
+
+			FindIterable<Document> target = delegate != null ? delegate.prepare(cursor) : cursor;
+			return limit.map(target::limit).orElse(target);
+		}
+
+		CursorPreparer limit(int limit) {
+
+			this.limit = Optional.of(limit);
+			return this;
+		}
+	}
+}

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

@@ -0,0 +1,137 @@
+/*
+ * Copyright 2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import java.util.Collection;
+
+import org.springframework.data.mongodb.core.BulkOperations.BulkMode;
+
+import com.mongodb.bulk.BulkWriteResult;
+
+/**
+ * {@link ExecutableInsertOperation} allows creation and execution of MongoDB insert and bulk insert operations in a
+ * fluent API style. <br />
+ * The collection to operate on is by default derived from the initial {@literal domainType} and can be defined there
+ * via {@link org.springframework.data.mongodb.core.mapping.Document}. Using {@code inCollection} allows to override the
+ * collection name for the execution.
+ *
+ * <pre>
+ *     <code>
+ *         insert(Jedi.class)
+ *             .inCollection("star-wars")
+ *             .one(luke);
+ *     </code>
+ * </pre>
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @since 2.0
+ */
+public interface ExecutableInsertOperation {
+
+	/**
+	 * Start creating an insert operation for given {@literal domainType}.
+	 *
+	 * @param domainType must not be {@literal null}.
+	 * @return new instance of {@link ExecutableInsert}.
+	 * @throws IllegalArgumentException if domainType is {@literal null}.
+	 */
+	<T> ExecutableInsert<T> insert(Class<T> domainType);
+
+	/**
+	 * Trigger insert execution by calling one of the terminating methods.
+	 *
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	interface TerminatingInsert<T> extends TerminatingBulkInsert<T> {
+
+		/**
+		 * Insert exactly one object.
+		 *
+		 * @param object must not be {@literal null}.
+		 * @throws IllegalArgumentException if object is {@literal null}.
+		 */
+		void one(T object);
+
+		/**
+		 * Insert a collection of objects.
+		 *
+		 * @param objects must not be {@literal null}.
+		 * @throws IllegalArgumentException if objects is {@literal null}.
+		 */
+		void all(Collection<? extends T> objects);
+	}
+
+	/**
+	 * Trigger bulk insert execution by calling one of the terminating methods.
+	 *
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	interface TerminatingBulkInsert<T> {
+
+		/**
+		 * Bulk write collection of objects.
+		 *
+		 * @param objects must not be {@literal null}.
+		 * @return resulting {@link BulkWriteResult}.
+		 * @throws IllegalArgumentException if objects is {@literal null}.
+		 */
+		BulkWriteResult bulk(Collection<? extends T> objects);
+	}
+
+	/**
+	 * Collection override (optional).
+	 *
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	interface InsertWithCollection<T> {
+
+		/**
+		 * Explicitly set the name of the collection. <br />
+		 * Skip this step to use the default collection derived from the domain type.
+		 *
+		 * @param collection must not be {@literal null} nor {@literal empty}.
+		 * @return new instance of {@link InsertWithBulkMode}.
+		 * @throws IllegalArgumentException if collection is {@literal null}.
+		 */
+		InsertWithBulkMode<T> inCollection(String collection);
+	}
+
+	/**
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	interface InsertWithBulkMode<T> extends TerminatingInsert<T> {
+
+		/**
+		 * Define the {@link BulkMode} to use for bulk insert operation.
+		 *
+		 * @param bulkMode must not be {@literal null}.
+		 * @return new instance of {@link TerminatingBulkInsert}.
+		 * @throws IllegalArgumentException if bulkMode is {@literal null}.
+		 */
+		TerminatingBulkInsert<T> withBulkMode(BulkMode bulkMode);
+	}
+
+	/**
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	interface ExecutableInsert<T> extends TerminatingInsert<T>, InsertWithCollection<T>, InsertWithBulkMode<T> {}
+}

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

@@ -0,0 +1,147 @@
+/*
+ * Copyright 2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import lombok.AccessLevel;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.springframework.data.mongodb.core.BulkOperations.BulkMode;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+import com.mongodb.bulk.BulkWriteResult;
+
+/**
+ * Implementation of {@link ExecutableInsertOperation}.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @since 2.0
+ */
+class ExecutableInsertOperationSupport implements ExecutableInsertOperation {
+
+	private final MongoTemplate template;
+
+	/**
+	 * Create new {@link ExecutableInsertOperationSupport}.
+	 *
+	 * @param template must not be {@literal null}.
+	 * @throws IllegalArgumentException if template is {@literal null}.
+	 */
+	ExecutableInsertOperationSupport(MongoTemplate template) {
+
+		Assert.notNull(template, "Template must not be null!");
+
+		this.template = template;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.coreExecutableInsertOperation#insert(java.lan.Class)
+	 */
+	@Override
+	public <T> ExecutableInsert<T> insert(Class<T> domainType) {
+
+		Assert.notNull(domainType, "DomainType must not be null!");
+
+		return new ExecutableInsertSupport<>(template, domainType, null, null);
+	}
+
+	/**
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	@RequiredArgsConstructor
+	@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
+	static class ExecutableInsertSupport<T> implements ExecutableInsert<T> {
+
+		@NonNull MongoTemplate template;
+		@NonNull Class<T> domainType;
+		@Nullable String collection;
+		@Nullable BulkMode bulkMode;
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation.TerminatingInsert#insert(java.lang.Class)
+		 */
+		@Override
+		public void one(T object) {
+
+			Assert.notNull(object, "Object must not be null!");
+
+			template.insert(object, getCollectionName());
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation.TerminatingInsert#all(java.util.Collection)
+		 */
+		@Override
+		public void all(Collection<? extends T> objects) {
+
+			Assert.notNull(objects, "Objects must not be null!");
+
+			template.insert(objects, getCollectionName());
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation.TerminatingBulkInsert#bulk(java.util.Collection)
+		 */
+		@Override
+		public BulkWriteResult bulk(Collection<? extends T> objects) {
+
+			Assert.notNull(objects, "Objects must not be null!");
+
+			return template.bulkOps(bulkMode != null ? bulkMode : BulkMode.ORDERED, domainType, getCollectionName())
+					.insert(new ArrayList<>(objects)).execute();
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation.InsertWithCollection#inCollection(java.lang.String)
+		 */
+		@Override
+		public InsertWithBulkMode<T> inCollection(String collection) {
+
+			Assert.hasText(collection, "Collection must not be null nor empty.");
+
+			return new ExecutableInsertSupport<>(template, domainType, collection, bulkMode);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation.InsertWithBulkMode#withBulkMode(org.springframework.data.mongodb.core.BulkMode)
+		 */
+		@Override
+		public TerminatingBulkInsert<T> withBulkMode(BulkMode bulkMode) {
+
+			Assert.notNull(bulkMode, "BulkMode must not be null!");
+
+			return new ExecutableInsertSupport<>(template, domainType, collection, bulkMode);
+		}
+
+		private String getCollectionName() {
+			return StringUtils.hasText(collection) ? collection : template.determineCollectionName(domainType);
+		}
+	}
+}

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

@@ -0,0 +1,121 @@
+/*
+ * Copyright 2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import java.util.List;
+
+import org.springframework.data.mongodb.core.query.Query;
+
+import com.mongodb.client.result.DeleteResult;
+
+/**
+ * {@link ExecutableRemoveOperation} allows creation and execution of MongoDB remove / findAndRemove operations in a
+ * fluent API style. <br />
+ * The starting {@literal domainType} is used for mapping the {@link Query} provided via {@code matching} into the
+ * MongoDB specific representation. The collection to operate on is by default derived from the initial
+ * {@literal domainType} and can be defined there via {@link org.springframework.data.mongodb.core.mapping.Document}.
+ * Using {@code inCollection} allows to override the collection name for the execution.
+ *
+ * <pre>
+ *     <code>
+ *         remove(Jedi.class)
+ *             .inCollection("star-wars")
+ *             .matching(query(where("firstname").is("luke")))
+ *             .all();
+ *     </code>
+ * </pre>
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @since 2.0
+ */
+public interface ExecutableRemoveOperation {
+
+	/**
+	 * Start creating a remove operation for the given {@literal domainType}.
+	 *
+	 * @param domainType must not be {@literal null}.
+	 * @return new instance of {@link ExecutableRemove}.
+	 * @throws IllegalArgumentException if domainType is {@literal null}.
+	 */
+	<T> ExecutableRemove<T> remove(Class<T> domainType);
+
+	/**
+	 * Collection override (optional).
+	 *
+	 * @param <T>
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	interface RemoveWithCollection<T> extends RemoveWithQuery<T> {
+
+		/**
+		 * Explicitly set the name of the collection to perform the query on. <br />
+		 * Skip this step to use the default collection derived from the domain type.
+		 *
+		 * @param collection must not be {@literal null} nor {@literal empty}.
+		 * @return new instance of {@link RemoveWithCollection}.
+		 * @throws IllegalArgumentException if collection is {@literal null}.
+		 */
+		RemoveWithQuery<T> inCollection(String collection);
+	}
+
+	/**
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	interface TerminatingRemove<T> {
+
+		/**
+		 * Remove all documents matching.
+		 *
+		 * @return the {@link DeleteResult}. Never {@literal null}.
+		 */
+		DeleteResult all();
+
+		/**
+		 * Remove and return all matching documents. <br/>
+		 * <strong>NOTE</strong> The entire list of documents will be fetched before sending the actual delete commands.
+		 * Also, {@link org.springframework.context.ApplicationEvent}s will be published for each and every delete
+		 * operation.
+		 *
+		 * @return empty {@link List} if no match found. Never {@literal null}.
+		 */
+		List<T> findAndRemove();
+	}
+
+	/**
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	interface RemoveWithQuery<T> extends TerminatingRemove<T> {
+
+		/**
+		 * Define the query filtering elements.
+		 *
+		 * @param query must not be {@literal null}.
+		 * @return new instance of {@link TerminatingRemove}.
+		 * @throws IllegalArgumentException if query is {@literal null}.
+		 */
+		TerminatingRemove<T> matching(Query query);
+	}
+
+	/**
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	interface ExecutableRemove<T> extends RemoveWithCollection<T> {}
+}

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

@@ -0,0 +1,135 @@
+/*
+ * Copyright 2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import lombok.AccessLevel;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
+
+import java.util.List;
+
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+import com.mongodb.client.result.DeleteResult;
+
+/**
+ * Implementation of {@link ExecutableRemoveOperation}.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @since 2.0
+ */
+class ExecutableRemoveOperationSupport implements ExecutableRemoveOperation {
+
+	private static final Query ALL_QUERY = new Query();
+
+	private final MongoTemplate tempate;
+
+	/**
+	 * Create new {@link ExecutableRemoveOperationSupport}.
+	 *
+	 * @param template must not be {@literal null}.
+	 * @throws IllegalArgumentException if template is {@literal null}.
+	 */
+	ExecutableRemoveOperationSupport(MongoTemplate template) {
+
+		Assert.notNull(template, "Template must not be null!");
+
+		this.tempate = template;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ExecutableRemoveOperation#remove(java.lang.Class)
+	 */
+	@Override
+	public <T> ExecutableRemove<T> remove(Class<T> domainType) {
+
+		Assert.notNull(domainType, "DomainType must not be null!");
+
+		return new ExecutableRemoveSupport<>(tempate, domainType, ALL_QUERY, null);
+	}
+
+	/**
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	@RequiredArgsConstructor
+	@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
+	static class ExecutableRemoveSupport<T> implements ExecutableRemove<T>, RemoveWithCollection<T> {
+
+		@NonNull MongoTemplate template;
+		@NonNull Class<T> domainType;
+		Query query;
+		@Nullable String collection;
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableRemoveOperation.RemoveWithCollection#inCollection(java.lang.String)
+		 */
+		@Override
+		public RemoveWithQuery<T> inCollection(String collection) {
+
+			Assert.hasText(collection, "Collection must not be null nor empty!");
+
+			return new ExecutableRemoveSupport<>(template, domainType, query, collection);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableRemoveOperation.RemoveWithQuery#matching(org.springframework.data.mongodb.core.query.Query)
+		 */
+		@Override
+		public TerminatingRemove<T> matching(Query query) {
+
+			Assert.notNull(query, "Query must not be null!");
+
+			return new ExecutableRemoveSupport<>(template, domainType, query, collection);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableRemoveOperation.TerminatingRemove#all()
+		 */
+		@Override
+		public DeleteResult all() {
+
+			String collectionName = getCollectionName();
+
+			return template.doRemove(collectionName, query, domainType);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableRemoveOperation.TerminatingRemove#findAndRemove()
+		 */
+		@Override
+		public List<T> findAndRemove() {
+
+			String collectionName = getCollectionName();
+
+			return template.doFindAndDelete(collectionName, query, domainType);
+		}
+
+		private String getCollectionName() {
+			return StringUtils.hasText(collection) ? collection : template.determineCollectionName(domainType);
+		}
+	}
+}

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

@@ -0,0 +1,191 @@
+/*
+ * Copyright 2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import java.util.Optional;
+
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
+
+import com.mongodb.client.result.UpdateResult;
+import org.springframework.lang.Nullable;
+
+/**
+ * {@link ExecutableUpdateOperation} allows creation and execution of MongoDB update / findAndModify operations in a
+ * fluent API style. <br />
+ * The starting {@literal domainType} is used for mapping the {@link Query} provided via {@code matching}, as well as
+ * the {@link Update} via {@code apply} into the MongoDB specific representations. The collection to operate on is by
+ * default derived from the initial {@literal domainType} and can be defined there via
+ * {@link org.springframework.data.mongodb.core.mapping.Document}. Using {@code inCollection} allows to override the
+ * collection name for the execution.
+ *
+ * <pre>
+ *     <code>
+ *         update(Jedi.class)
+ *             .inCollection("star-wars")
+ *             .matching(query(where("firstname").is("luke")))
+ *             .apply(new Update().set("lastname", "skywalker"))
+ *             .upsert();
+ *     </code>
+ * </pre>
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @since 2.0
+ */
+public interface ExecutableUpdateOperation {
+
+	/**
+	 * Start creating an update operation for the given {@literal domainType}.
+	 *
+	 * @param domainType must not be {@literal null}.
+	 * @return new instance of {@link ExecutableUpdate}.
+	 * @throws IllegalArgumentException if domainType is {@literal null}.
+	 */
+	<T> ExecutableUpdate<T> update(Class<T> domainType);
+
+	/**
+	 * Declare the {@link Update} to apply.
+	 *
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	interface UpdateWithUpdate<T> {
+
+		/**
+		 * Set the {@link Update} to be applied.
+		 *
+		 * @param update must not be {@literal null}.
+		 * @return new instance of {@link TerminatingUpdate}.
+		 * @throws IllegalArgumentException if update is {@literal null}.
+		 */
+		TerminatingUpdate<T> apply(Update update);
+	}
+
+	/**
+	 * Explicitly define the name of the collection to perform operation in.
+	 *
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	interface UpdateWithCollection<T> {
+
+		/**
+		 * Explicitly set the name of the collection to perform the query on. <br />
+		 * Skip this step to use the default collection derived from the domain type.
+		 *
+		 * @param collection must not be {@literal null} nor {@literal empty}.
+		 * @return new instance of {@link UpdateWithCollection}.
+		 * @throws IllegalArgumentException if collection is {@literal null}.
+		 */
+		UpdateWithQuery<T> inCollection(String collection);
+	}
+
+	/**
+	 * Define a filter query for the {@link Update}.
+	 *
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	interface UpdateWithQuery<T> extends UpdateWithUpdate<T> {
+
+		/**
+		 * Filter documents by given {@literal query}.
+		 *
+		 * @param query must not be {@literal null}.
+		 * @return new instance of {@link UpdateWithQuery}.
+		 * @throws IllegalArgumentException if query is {@literal null}.
+		 */
+		UpdateWithUpdate<T> matching(Query query);
+	}
+
+	/**
+	 * Define {@link FindAndModifyOptions}.
+	 *
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	interface FindAndModifyWithOptions<T> {
+
+		/**
+		 * Explicitly define {@link FindAndModifyOptions} for the {@link Update}.
+		 *
+		 * @param options must not be {@literal null}.
+		 * @return new instance of {@link FindAndModifyWithOptions}.
+		 * @throws IllegalArgumentException if options is {@literal null}.
+		 */
+		TerminatingFindAndModify<T> withOptions(FindAndModifyOptions options);
+	}
+
+	/**
+	 * Trigger findAndModify execution by calling one of the terminating methods.
+	 */
+	interface TerminatingFindAndModify<T> {
+
+		/**
+		 * Find, modify and return the first matching document.
+		 *
+		 * @return {@link Optional#empty()} if nothing found.
+		 */
+		default Optional<T> findAndModify() {
+			return Optional.ofNullable(findAndModifyValue());
+		}
+
+		/**
+		 * Find, modify and return the first matching document.
+		 *
+		 * @return {@literal null} if nothing found.
+		 */
+		@Nullable
+		T findAndModifyValue();
+	}
+
+	/**
+	 * Trigger update execution by calling one of the terminating methods.
+	 *
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	interface TerminatingUpdate<T> extends TerminatingFindAndModify<T>, FindAndModifyWithOptions<T> {
+
+		/**
+		 * Update all matching documents in the collection.
+		 *
+		 * @return never {@literal null}.
+		 */
+		UpdateResult all();
+
+		/**
+		 * Update the first document in the collection.
+		 *
+		 * @return never {@literal null}.
+		 */
+		UpdateResult first();
+
+		/**
+		 * Creates a new document if no documents match the filter query or updates the matching ones.
+		 *
+		 * @return never {@literal null}.
+		 */
+		UpdateResult upsert();
+	}
+
+	/**
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	interface ExecutableUpdate<T> extends UpdateWithCollection<T>, UpdateWithQuery<T>, UpdateWithUpdate<T> {}
+}

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

@@ -0,0 +1,176 @@
+/*
+ * Copyright 2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import lombok.AccessLevel;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
+
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+import com.mongodb.client.result.UpdateResult;
+
+/**
+ * Implementation of {@link ExecutableUpdateOperation}.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @since 2.0
+ */
+class ExecutableUpdateOperationSupport implements ExecutableUpdateOperation {
+
+	private static final Query ALL_QUERY = new Query();
+
+	private final MongoTemplate template;
+
+	/**
+	 * Creates new {@link ExecutableUpdateOperationSupport}.
+	 *
+	 * @param template must not be {@literal null}.
+	 */
+	ExecutableUpdateOperationSupport(MongoTemplate template) {
+
+		Assert.notNull(template, "Template must not be null!");
+
+		this.template = template;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation#update(java.lang.Class)
+	 */
+	@Override
+	public <T> ExecutableUpdate<T> update(Class<T> domainType) {
+
+		Assert.notNull(domainType, "DomainType must not be null!");
+
+		return new ExecutableUpdateSupport<>(template, domainType, ALL_QUERY, null, null, null);
+	}
+
+	/**
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	@RequiredArgsConstructor
+	@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
+	static class ExecutableUpdateSupport<T>
+			implements ExecutableUpdate<T>, UpdateWithCollection<T>, UpdateWithQuery<T>, TerminatingUpdate<T> {
+
+		@NonNull MongoTemplate template;
+		@NonNull Class<T> domainType;
+		Query query;
+		@Nullable Update update;
+		@Nullable String collection;
+		@Nullable FindAndModifyOptions options;
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.UpdateWithUpdate#apply(Update)
+		 */
+		@Override
+		public TerminatingUpdate<T> apply(Update update) {
+
+			Assert.notNull(update, "Update must not be null!");
+
+			return new ExecutableUpdateSupport<>(template, domainType, query, update, collection, options);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.UpdateWithCollection#inCollection(java.lang.String)
+		 */
+		@Override
+		public UpdateWithQuery<T> inCollection(String collection) {
+
+			Assert.hasText(collection, "Collection must not be null nor empty!");
+
+			return new ExecutableUpdateSupport<>(template, domainType, query, update, collection, options);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.FindAndModifyWithOptions#withOptions(org.springframework.data.mongodb.core.FindAndModifyOptions)
+		 */
+		@Override
+		public TerminatingFindAndModify<T> withOptions(FindAndModifyOptions options) {
+
+			Assert.notNull(options, "Options must not be null!");
+
+			return new ExecutableUpdateSupport<>(template, domainType, query, update, collection, options);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.UpdateWithQuery#matching(org.springframework.data.mongodb.core.query.Query)
+		 */
+		@Override
+		public UpdateWithUpdate<T> matching(Query query) {
+
+			Assert.notNull(query, "Query must not be null!");
+
+			return new ExecutableUpdateSupport<>(template, domainType, query, update, collection, options);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.TerminatingUpdate#all()
+		 */
+		@Override
+		public UpdateResult all() {
+			return doUpdate(true, false);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.TerminatingUpdate#first()
+		 */
+		@Override
+		public UpdateResult first() {
+			return doUpdate(false, false);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.TerminatingUpdate#upsert()
+		 */
+		@Override
+		public UpdateResult upsert() {
+			return doUpdate(true, true);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.TerminatingFindAndModify#findAndModifyValue()
+		 */
+		@Override
+		public @Nullable T findAndModifyValue() {
+			return template.findAndModify(query, update, options != null ? options : new FindAndModifyOptions(), domainType, getCollectionName());
+		}
+
+		private UpdateResult doUpdate(boolean multi, boolean upsert) {
+			return template.doUpdate(getCollectionName(), query, update, domainType, upsert, multi);
+		}
+
+		private String getCollectionName() {
+			return StringUtils.hasText(collection) ? collection : template.determineCollectionName(domainType);
+		}
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2017 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.
@@ -15,23 +15,53 @@
  */
 package org.springframework.data.mongodb.core;
 
+import java.util.Optional;
+
+import org.springframework.data.mongodb.core.query.Collation;
+import org.springframework.lang.Nullable;
+
+/**
+ * @author Mark Pollak
+ * @author Oliver Gierke
+ * @author Christoph Strobl
+ */
 public class FindAndModifyOptions {
 
-	boolean returnNew;
+	private boolean returnNew;
+	private boolean upsert;
+	private boolean remove;
 
-	boolean upsert;
-
-	boolean remove;
+	private @Nullable Collation collation;
 
 	/**
 	 * Static factory method to create a FindAndModifyOptions instance
-	 * 
+	 *
 	 * @return a new instance
 	 */
 	public static FindAndModifyOptions options() {
 		return new FindAndModifyOptions();
 	}
 
+	/**
+	 * @param options
+	 * @return
+	 * @since 2.0
+	 */
+	public static FindAndModifyOptions of(@Nullable FindAndModifyOptions source) {
+
+		FindAndModifyOptions options = new FindAndModifyOptions();
+		if (source == null) {
+			return options;
+		}
+
+		options.returnNew = source.returnNew;
+		options.upsert = source.upsert;
+		options.remove = source.remove;
+		options.collation = source.collation;
+
+		return options;
+	}
+
 	public FindAndModifyOptions returnNew(boolean returnNew) {
 		this.returnNew = returnNew;
 		return this;
@@ -47,6 +77,19 @@ public class FindAndModifyOptions {
 		return this;
 	}
 
+	/**
+	 * Define the {@link Collation} specifying language-specific rules for string comparison.
+	 *
+	 * @param collation
+	 * @return
+	 * @since 2.0
+	 */
+	public FindAndModifyOptions collation(@Nullable Collation collation) {
+
+		this.collation = collation;
+		return this;
+	}
+
 	public boolean isReturnNew() {
 		return returnNew;
 	}
@@ -59,4 +102,14 @@ public class FindAndModifyOptions {
 		return remove;
 	}
 
+	/**
+	 * Get the {@link Collation} specifying language-specific rules for string comparison.
+	 *
+	 * @return
+	 * @since 2.0
+	 */
+	public Optional<Collation> getCollation() {
+		return Optional.ofNullable(collation);
+	}
+
 }

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

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2016-2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import com.mongodb.reactivestreams.client.FindPublisher;
+
+/**
+ * Simple callback interface to allow customization of a {@link FindPublisher}.
+ *
+ * @author Mark Paluch
+ */
+interface FindPublisherPreparer {
+
+	/**
+	 * Prepare the given cursor (apply limits, skips and so on). Returns the prepared cursor.
+	 *
+	 * @param findPublisher must not be {@literal null}.
+	 */
+	<T> FindPublisher<T> prepare(FindPublisher<T> findPublisher);
+}

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

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+/**
+ * Stripped down interface providing access to a fluent API that specifies a basic set of MongoDB operations.
+ *
+ * @author Christoph Strobl
+ * @since 2.0
+ */
+public interface FluentMongoOperations extends ExecutableFindOperation, ExecutableInsertOperation,
+		ExecutableUpdateOperation, ExecutableRemoveOperation, ExecutableAggregationOperation {}

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

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2016-2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import org.bson.Document;
+import org.springframework.util.Assert;
+
+/**
+ * Value object to mitigate different representations of geo command execution results in MongoDB.
+ * 
+ * @author Oliver Gierke
+ * @author Christoph Strobl
+ * @soundtrack Fruitcake - Jeff Coffin (The Inside of the Outside)
+ * @since 1.9
+ */
+class GeoCommandStatistics {
+
+	private static final GeoCommandStatistics NONE = new GeoCommandStatistics(new Document());
+
+	private final Document source;
+
+	/**
+	 * Creates a new {@link GeoCommandStatistics} instance with the given source document.
+	 * 
+	 * @param source must not be {@literal null}.
+	 */
+	private GeoCommandStatistics(Document source) {
+
+		Assert.notNull(source, "Source document must not be null!");
+		this.source = source;
+	}
+
+	/**
+	 * Creates a new {@link GeoCommandStatistics} from the given command result extracting the statistics.
+	 * 
+	 * @param commandResult must not be {@literal null}.
+	 * @return
+	 */
+	public static GeoCommandStatistics from(Document commandResult) {
+
+		Assert.notNull(commandResult, "Command result must not be null!");
+
+		Object stats = commandResult.get("stats");
+		return stats == null ? NONE : new GeoCommandStatistics((Document) stats);
+	}
+
+	/**
+	 * Returns the average distance reported by the command result. Mitigating a removal of the field in case the command
+	 * didn't return any result introduced in MongoDB 3.2 RC1.
+	 * 
+	 * @return
+	 * @see <a href="https://jira.mongodb.org/browse/SERVER-21024">MongoDB Jira SERVER-21024</a>
+	 */
+	public double getAverageDistance() {
+
+		Object averageDistance = source.get("avgDistance");
+		return averageDistance == null ? Double.NaN : (Double) averageDistance;
+	}
+}

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

@@ -0,0 +1,136 @@
+/*
+ * Copyright 2016-2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import java.util.concurrent.TimeUnit;
+
+import org.bson.Document;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.data.mongodb.core.index.IndexDefinition;
+import org.springframework.data.mongodb.core.index.IndexInfo;
+import org.springframework.lang.Nullable;
+import org.springframework.util.ObjectUtils;
+
+import com.mongodb.client.model.Collation;
+import com.mongodb.client.model.IndexOptions;
+
+/**
+ * {@link Converter Converters} for index-related MongoDB documents/types.
+ *
+ * @author Mark Paluch
+ * @author Christoph Strobl
+ * @since 2.0
+ */
+abstract class IndexConverters {
+
+	private static final Converter<IndexDefinition, IndexOptions> DEFINITION_TO_MONGO_INDEX_OPTIONS;
+	private static final Converter<Document, IndexInfo> DOCUMENT_INDEX_INFO;
+
+	static {
+
+		DEFINITION_TO_MONGO_INDEX_OPTIONS = getIndexDefinitionIndexOptionsConverter();
+		DOCUMENT_INDEX_INFO = getDocumentIndexInfoConverter();
+	}
+
+	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 -> {
+
+			Document indexOptions = indexDefinition.getIndexOptions();
+			IndexOptions ops = new IndexOptions();
+
+			if (indexOptions.containsKey("name")) {
+				ops = ops.name(indexOptions.get("name").toString());
+			}
+			if (indexOptions.containsKey("unique")) {
+				ops = ops.unique((Boolean) indexOptions.get("unique"));
+			}
+			if (indexOptions.containsKey("sparse")) {
+				ops = ops.sparse((Boolean) indexOptions.get("sparse"));
+			}
+			if (indexOptions.containsKey("background")) {
+				ops = ops.background((Boolean) indexOptions.get("background"));
+			}
+			if (indexOptions.containsKey("expireAfterSeconds")) {
+				ops = ops.expireAfter((Long) indexOptions.get("expireAfterSeconds"), TimeUnit.SECONDS);
+			}
+			if (indexOptions.containsKey("min")) {
+				ops = ops.min(((Number) indexOptions.get("min")).doubleValue());
+			}
+			if (indexOptions.containsKey("max")) {
+				ops = ops.max(((Number) indexOptions.get("max")).doubleValue());
+			}
+			if (indexOptions.containsKey("bits")) {
+				ops = ops.bits((Integer) indexOptions.get("bits"));
+			}
+			if (indexOptions.containsKey("bucketSize")) {
+				ops = ops.bucketSize(((Number) indexOptions.get("bucketSize")).doubleValue());
+			}
+			if (indexOptions.containsKey("default_language")) {
+				ops = ops.defaultLanguage(indexOptions.get("default_language").toString());
+			}
+			if (indexOptions.containsKey("language_override")) {
+				ops = ops.languageOverride(indexOptions.get("language_override").toString());
+			}
+			if (indexOptions.containsKey("weights")) {
+				ops = ops.weights((org.bson.Document) indexOptions.get("weights"));
+			}
+
+			for (String key : indexOptions.keySet()) {
+				if (ObjectUtils.nullSafeEquals("2dsphere", indexOptions.get(key))) {
+					ops = ops.sphereVersion(2);
+				}
+			}
+
+			if (indexOptions.containsKey("partialFilterExpression")) {
+				ops = ops.partialFilterExpression((org.bson.Document) indexOptions.get("partialFilterExpression"));
+			}
+
+			if (indexOptions.containsKey("collation")) {
+				ops = ops.collation(fromDocument(indexOptions.get("collation", Document.class)));
+			}
+
+			return ops;
+		};
+	}
+
+	@Nullable
+	public static Collation fromDocument(@Nullable Document source) {
+
+		if (source == null) {
+			return null;
+		}
+
+		return org.springframework.data.mongodb.core.query.Collation.from(source).toMongoCollation();
+	}
+
+	private static Converter<Document, IndexInfo> getDocumentIndexInfoConverter() {
+		return IndexInfo::indexInfoOf;
+	}
+
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2017 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.
@@ -13,59 +13,57 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.mongodb.core;
 
-import com.mongodb.DBObject;
+import org.bson.Document;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+
 import com.mongodb.WriteConcern;
 
 /**
  * Represents an action taken against the collection. Used by {@link WriteConcernResolver} to determine a custom
- * WriteConcern based on this information.
- * 
- * Properties that will always be not-null are collectionName and defaultWriteConcern. The EntityClass is null only for
- * the MongoActionOperaton.INSERT_LIST.
- * 
+ * {@link WriteConcern} based on this information.
  * <ul>
  * <li>INSERT, SAVE have null query</li>
  * <li>REMOVE has null document</li>
- * <li>INSERT_LIST has null entityClass, document, and query</li>
+ * <li>INSERT_LIST has null entityType, document, and query</li>
  * </ul>
  * 
  * @author Mark Pollack
- * 
+ * @author Oliver Gierke
+ * @author Christoph Strobl
  */
 public class MongoAction {
 
-	private String collectionName;
+	private final String collectionName;
+	private final MongoActionOperation mongoActionOperation;
 
-	private WriteConcern defaultWriteConcern;
-
-	private Class<?> entityClass;
-
-	private MongoActionOperation mongoActionOperation;
-
-	private DBObject query;
-
-	private DBObject document;
+	private final @Nullable WriteConcern defaultWriteConcern;
+	private final @Nullable Class<?> entityType;
+	private final @Nullable Document query;
+	private final @Nullable Document document;
 
 	/**
-	 * Create an instance of a MongoAction
+	 * Create an instance of a {@link MongoAction}.
 	 * 
-	 * @param defaultWriteConcern the default write concern
-	 * @param mongoActionOperation action being taken against the collection
-	 * @param collectionName the collection name
-	 * @param entityClass the POJO that is being operated against
-	 * @param document the converted DBObject from the POJO or Spring Update object
-	 * @param query the converted DBOjbect from the Spring Query object
+	 * @param defaultWriteConcern the default write concern. Can be {@literal null}.
+	 * @param mongoActionOperation action being taken against the collection. Must not be {@literal null}.
+	 * @param collectionName the collection name, must not be {@literal null} or empty.
+	 * @param entityType the POJO that is being operated against. Can be {@literal null}.
+	 * @param document the converted Document from the POJO or Spring Update object. Can be {@literal null}.
+	 * @param query the converted Document from the Spring Query object. Can be {@literal null}.
 	 */
-	public MongoAction(WriteConcern defaultWriteConcern, MongoActionOperation mongoActionOperation,
-			String collectionName, Class<?> entityClass, DBObject document, DBObject query) {
-		super();
+	public MongoAction(@Nullable WriteConcern defaultWriteConcern, MongoActionOperation mongoActionOperation,
+			String collectionName, @Nullable Class<?> entityType, @Nullable Document document, @Nullable Document query) {
+
+		Assert.hasText(collectionName, "Collection name must not be null or empty!");
+		Assert.notNull(mongoActionOperation, "MongoActionOperation must not be null!");
+
 		this.defaultWriteConcern = defaultWriteConcern;
 		this.mongoActionOperation = mongoActionOperation;
 		this.collectionName = collectionName;
-		this.entityClass = entityClass;
+		this.entityType = entityType;
 		this.query = query;
 		this.document = document;
 	}
@@ -74,23 +72,28 @@ public class MongoAction {
 		return collectionName;
 	}
 
+	@Nullable
 	public WriteConcern getDefaultWriteConcern() {
 		return defaultWriteConcern;
 	}
 
-	public Class<?> getEntityClass() {
-		return entityClass;
+	@Nullable
+	public Class<?> getEntityType() {
+		return entityType;
 	}
 
+	@Nullable
 	public MongoActionOperation getMongoActionOperation() {
 		return mongoActionOperation;
 	}
 
-	public DBObject getQuery() {
+	@Nullable
+	public Document getQuery() {
 		return query;
 	}
 
-	public DBObject getDocument() {
+	@Nullable
+	public Document getDocument() {
 		return document;
 	}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2015 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.
@@ -20,10 +20,10 @@ package org.springframework.data.mongodb.core;
  * for a given mutating operation
  * 
  * @author Mark Pollack
+ * @author Oliver Gierke
  * @see MongoAction
- * 
  */
 public enum MongoActionOperation {
 
-	REMOVE, UPDATE, INSERT, INSERT_LIST, SAVE
+	REMOVE, UPDATE, INSERT, INSERT_LIST, SAVE, BULK;
 }

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

@@ -1,88 +1,78 @@
-/*
- * Copyright 2011-2012 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import org.springframework.data.authentication.UserCredentials;
-import org.springframework.jmx.export.annotation.ManagedOperation;
-import org.springframework.jmx.export.annotation.ManagedResource;
-import org.springframework.util.Assert;
-
-import com.mongodb.DB;
-import com.mongodb.Mongo;
-
-/**
- * Mongo server administration exposed via JMX annotations
- * 
- * @author Mark Pollack
- */
-@ManagedResource(description = "Mongo Admin Operations")
-public class MongoAdmin implements MongoAdminOperations {
-
-	private final Mongo mongo;
-	private String username;
-	private String password;
-
-	public MongoAdmin(Mongo mongo) {
-		Assert.notNull(mongo);
-		this.mongo = mongo;
-	}
-
-	/* (non-Javadoc)
-	  * @see org.springframework.data.mongodb.core.core.MongoAdminOperations#dropDatabase(java.lang.String)
-	  */
-	@ManagedOperation
-	public void dropDatabase(String databaseName) {
-		getDB(databaseName).dropDatabase();
-	}
-
-	/* (non-Javadoc)
-	  * @see org.springframework.data.mongodb.core.core.MongoAdminOperations#createDatabase(java.lang.String)
-	  */
-	@ManagedOperation
-	public void createDatabase(String databaseName) {
-		getDB(databaseName);
-	}
-
-	/* (non-Javadoc)
-	  * @see org.springframework.data.mongodb.core.core.MongoAdminOperations#getDatabaseStats(java.lang.String)
-	  */
-	@ManagedOperation
-	public String getDatabaseStats(String databaseName) {
-		return getDB(databaseName).getStats().toString();
-	}
-
-	/**
-	 * Sets the username to use to connect to the Mongo database
-	 * 
-	 * @param username The username to use
-	 */
-	public void setUsername(String username) {
-		this.username = username;
-	}
-
-	/**
-	 * Sets the password to use to authenticate with the Mongo database.
-	 * 
-	 * @param password The password to use
-	 */
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-	DB getDB(String databaseName) {
-		return MongoDbUtils.getDB(mongo, databaseName, new UserCredentials(username, password));
-	}
-}
+/*
+ * Copyright 2011-2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import org.bson.Document;
+import org.springframework.jmx.export.annotation.ManagedOperation;
+import org.springframework.jmx.export.annotation.ManagedResource;
+import org.springframework.util.Assert;
+
+import com.mongodb.MongoClient;
+import com.mongodb.client.MongoDatabase;
+
+/**
+ * Mongo server administration exposed via JMX annotations
+ * 
+ * @author Mark Pollack
+ * @author Thomas Darimont
+ * @author Mark Paluch
+ * @author Christoph Strobl
+ */
+@ManagedResource(description = "Mongo Admin Operations")
+public class MongoAdmin implements MongoAdminOperations {
+
+	private final MongoClient mongoClient;
+
+	public MongoAdmin(MongoClient mongoClient) {
+
+		Assert.notNull(mongoClient, "MongoClient must not be null!");
+		this.mongoClient = mongoClient;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.core.MongoAdminOperations#dropDatabase(java.lang.String)
+	 */
+	@ManagedOperation
+	public void dropDatabase(String databaseName) {
+		getDB(databaseName).drop();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.core.MongoAdminOperations#createDatabase(java.lang.String)
+	 */
+	@ManagedOperation
+	public void createDatabase(String databaseName) {
+		getDB(databaseName);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.core.MongoAdminOperations#getDatabaseStats(java.lang.String)
+	 */
+	@ManagedOperation
+	public String getDatabaseStats(String databaseName) {
+		return getDB(databaseName).runCommand(new Document("dbStats", 1).append("scale", 1024)).toJson();
+	}
+
+	@ManagedOperation
+	public String getServerStatus() {
+		return getDB("admin").runCommand(new Document("serverStatus", 1).append("rangeDeleter", 1).append("repl", 1))
+				.toJson();
+	}
+
+	MongoDatabase getDB(String databaseName) {
+		return mongoClient.getDatabase(databaseName);
+	}
+}

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

@@ -1,16 +1,34 @@
-package org.springframework.data.mongodb.core;
-
-import org.springframework.jmx.export.annotation.ManagedOperation;
-
-public interface MongoAdminOperations {
-
-	@ManagedOperation
-	public abstract void dropDatabase(String databaseName);
-
-	@ManagedOperation
-	public abstract void createDatabase(String databaseName);
-
-	@ManagedOperation
-	public abstract String getDatabaseStats(String databaseName);
-
-}
+/*
+ * Copyright 2011-2014 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import org.springframework.jmx.export.annotation.ManagedOperation;
+
+/**
+ * @author Mark Pollack
+ * @author Oliver Gierke
+ */
+public interface MongoAdminOperations {
+
+	@ManagedOperation
+	void dropDatabase(String databaseName);
+
+	@ManagedOperation
+	void createDatabase(String databaseName);
+
+	@ManagedOperation
+	String getDatabaseStats(String databaseName);
+}

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

@@ -0,0 +1,190 @@
+/*
+ * Copyright 2015-2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.springframework.beans.factory.config.AbstractFactoryBean;
+import org.springframework.dao.DataAccessException;
+import org.springframework.dao.support.PersistenceExceptionTranslator;
+import org.springframework.lang.Nullable;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+import com.mongodb.MongoClient;
+import com.mongodb.MongoClientOptions;
+import com.mongodb.MongoCredential;
+import com.mongodb.ServerAddress;
+
+/**
+ * Convenient factory for configuring MongoDB.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @since 1.7
+ */
+public class MongoClientFactoryBean extends AbstractFactoryBean<MongoClient> implements PersistenceExceptionTranslator {
+
+	private static final PersistenceExceptionTranslator DEFAULT_EXCEPTION_TRANSLATOR = new MongoExceptionTranslator();
+
+	private @Nullable MongoClientOptions mongoClientOptions;
+	private @Nullable String host;
+	private @Nullable Integer port;
+	private List<ServerAddress> replicaSetSeeds = Collections.emptyList();
+	private List<MongoCredential> credentials = Collections.emptyList();
+
+	private PersistenceExceptionTranslator exceptionTranslator = DEFAULT_EXCEPTION_TRANSLATOR;
+
+	/**
+	 * Set the {@link MongoClientOptions} to be used when creating {@link MongoClient}.
+	 *
+	 * @param mongoClientOptions
+	 */
+	public void setMongoClientOptions(@Nullable MongoClientOptions mongoClientOptions) {
+		this.mongoClientOptions = mongoClientOptions;
+	}
+
+	/**
+	 * Set the list of credentials to be used when creating {@link MongoClient}.
+	 *
+	 * @param credentials can be {@literal null}.
+	 */
+	public void setCredentials(@Nullable MongoCredential[] credentials) {
+		this.credentials = filterNonNullElementsAsList(credentials);
+	}
+
+	/**
+	 * Set the list of {@link ServerAddress} to build up a replica set for.
+	 *
+	 * @param replicaSetSeeds can be {@literal null}.
+	 */
+	public void setReplicaSetSeeds(@Nullable ServerAddress[] replicaSetSeeds) {
+		this.replicaSetSeeds = filterNonNullElementsAsList(replicaSetSeeds);
+	}
+
+	/**
+	 * Configures the host to connect to.
+	 *
+	 * @param host
+	 */
+	public void setHost(@Nullable String host) {
+		this.host = host;
+	}
+
+	/**
+	 * Configures the port to connect to.
+	 *
+	 * @param port
+	 */
+	public void setPort(int port) {
+		this.port = port;
+	}
+
+	/**
+	 * Configures the {@link PersistenceExceptionTranslator} to use.
+	 *
+	 * @param exceptionTranslator
+	 */
+	public void setExceptionTranslator(@Nullable PersistenceExceptionTranslator exceptionTranslator) {
+		this.exceptionTranslator = exceptionTranslator == null ? DEFAULT_EXCEPTION_TRANSLATOR : exceptionTranslator;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.FactoryBean#getObjectType()
+	 */
+	public Class<? extends MongoClient> getObjectType() {
+		return MongoClient.class;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.dao.support.PersistenceExceptionTranslator#translateExceptionIfPossible(java.lang.RuntimeException)
+	 */
+	@Nullable
+	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
+		return exceptionTranslator.translateExceptionIfPossible(ex);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.config.AbstractFactoryBean#createInstance()
+	 */
+	@Override
+	protected MongoClient createInstance() throws Exception {
+
+		if (mongoClientOptions == null) {
+			mongoClientOptions = MongoClientOptions.builder().build();
+		}
+
+		return createMongoClient();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.config.AbstractFactoryBean#destroyInstance(java.lang.Object)
+	 */
+	@Override
+	protected void destroyInstance(@Nullable MongoClient instance) throws Exception {
+
+		if (instance != null) {
+			instance.close();
+		}
+	}
+
+	private MongoClient createMongoClient() throws UnknownHostException {
+
+		if (!CollectionUtils.isEmpty(replicaSetSeeds)) {
+			return new MongoClient(replicaSetSeeds, credentials, mongoClientOptions);
+		}
+
+		return new MongoClient(createConfiguredOrDefaultServerAddress(), credentials, mongoClientOptions);
+	}
+
+	private ServerAddress createConfiguredOrDefaultServerAddress() throws UnknownHostException {
+
+		ServerAddress defaultAddress = new ServerAddress();
+
+		return new ServerAddress(StringUtils.hasText(host) ? host : defaultAddress.getHost(),
+				port != null ? port.intValue() : defaultAddress.getPort());
+	}
+
+	/**
+	 * Returns the given array as {@link List} with all {@literal null} elements removed.
+	 *
+	 * @param elements the elements to filter <T>, can be {@literal null}.
+	 * @return a new unmodifiable {@link List#} from the given elements without {@literal null}s.
+	 */
+	private static <T> List<T> filterNonNullElementsAsList(@Nullable T[] elements) {
+
+		if (elements == null) {
+			return Collections.emptyList();
+		}
+
+		List<T> candidateElements = new ArrayList<T>();
+
+		for (T element : elements) {
+			if (element != null) {
+				candidateElements.add(element);
+			}
+		}
+
+		return Collections.unmodifiableList(candidateElements);
+	}
+}

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

@@ -0,0 +1,314 @@
+/*
+ * Copyright 2015-2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import javax.net.SocketFactory;
+import javax.net.ssl.SSLSocketFactory;
+
+import org.springframework.beans.factory.config.AbstractFactoryBean;
+import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.lang.Nullable;
+
+import com.mongodb.DBDecoderFactory;
+import com.mongodb.DBEncoderFactory;
+import com.mongodb.MongoClient;
+import com.mongodb.MongoClientOptions;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
+
+/**
+ * A factory bean for construction of a {@link MongoClientOptions} instance.
+ *
+ * @author Christoph Strobl
+ * @author Oliver Gierke
+ * @author Mark Paluch
+ * @since 1.7
+ */
+public class MongoClientOptionsFactoryBean extends AbstractFactoryBean<MongoClientOptions> {
+
+	private static final MongoClientOptions DEFAULT_MONGO_OPTIONS = MongoClientOptions.builder().build();
+
+	private @Nullable String description = DEFAULT_MONGO_OPTIONS.getDescription();
+	private int minConnectionsPerHost = DEFAULT_MONGO_OPTIONS.getMinConnectionsPerHost();
+	private int connectionsPerHost = DEFAULT_MONGO_OPTIONS.getConnectionsPerHost();
+	private int threadsAllowedToBlockForConnectionMultiplier = DEFAULT_MONGO_OPTIONS
+			.getThreadsAllowedToBlockForConnectionMultiplier();
+	private int maxWaitTime = DEFAULT_MONGO_OPTIONS.getMaxWaitTime();
+	private int maxConnectionIdleTime = DEFAULT_MONGO_OPTIONS.getMaxConnectionIdleTime();
+	private int maxConnectionLifeTime = DEFAULT_MONGO_OPTIONS.getMaxConnectionLifeTime();
+	private int connectTimeout = DEFAULT_MONGO_OPTIONS.getConnectTimeout();
+	private int socketTimeout = DEFAULT_MONGO_OPTIONS.getSocketTimeout();
+	private boolean socketKeepAlive = DEFAULT_MONGO_OPTIONS.isSocketKeepAlive();
+	private @Nullable ReadPreference readPreference = DEFAULT_MONGO_OPTIONS.getReadPreference();
+	private DBDecoderFactory dbDecoderFactory = DEFAULT_MONGO_OPTIONS.getDbDecoderFactory();
+	private DBEncoderFactory dbEncoderFactory = DEFAULT_MONGO_OPTIONS.getDbEncoderFactory();
+	private @Nullable WriteConcern writeConcern = DEFAULT_MONGO_OPTIONS.getWriteConcern();
+	private @Nullable SocketFactory socketFactory = DEFAULT_MONGO_OPTIONS.getSocketFactory();
+	private boolean cursorFinalizerEnabled = DEFAULT_MONGO_OPTIONS.isCursorFinalizerEnabled();
+	private boolean alwaysUseMBeans = DEFAULT_MONGO_OPTIONS.isAlwaysUseMBeans();
+	private int heartbeatFrequency = DEFAULT_MONGO_OPTIONS.getHeartbeatFrequency();
+	private int minHeartbeatFrequency = DEFAULT_MONGO_OPTIONS.getMinHeartbeatFrequency();
+	private int heartbeatConnectTimeout = DEFAULT_MONGO_OPTIONS.getHeartbeatConnectTimeout();
+	private int heartbeatSocketTimeout = DEFAULT_MONGO_OPTIONS.getHeartbeatSocketTimeout();
+	private String requiredReplicaSetName = DEFAULT_MONGO_OPTIONS.getRequiredReplicaSetName();
+	private int serverSelectionTimeout = DEFAULT_MONGO_OPTIONS.getServerSelectionTimeout();
+
+	private boolean ssl;
+	private @Nullable SSLSocketFactory sslSocketFactory;
+
+	/**
+	 * Set the {@link MongoClient} description.
+	 *
+	 * @param description
+	 */
+	public void setDescription(@Nullable String description) {
+		this.description = description;
+	}
+
+	/**
+	 * Set the minimum number of connections per host.
+	 *
+	 * @param minConnectionsPerHost
+	 */
+	public void setMinConnectionsPerHost(int minConnectionsPerHost) {
+		this.minConnectionsPerHost = minConnectionsPerHost;
+	}
+
+	/**
+	 * Set the number of connections allowed per host. Will block if run out. Default is 10. System property
+	 * {@code MONGO.POOLSIZE} can override
+	 *
+	 * @param connectionsPerHost
+	 */
+	public void setConnectionsPerHost(int connectionsPerHost) {
+		this.connectionsPerHost = connectionsPerHost;
+	}
+
+	/**
+	 * Set the multiplier for connectionsPerHost for # of threads that can block. Default is 5. If connectionsPerHost is
+	 * 10, and threadsAllowedToBlockForConnectionMultiplier is 5, then 50 threads can block more than that and an
+	 * exception will be thrown.
+	 *
+	 * @param threadsAllowedToBlockForConnectionMultiplier
+	 */
+	public void setThreadsAllowedToBlockForConnectionMultiplier(int threadsAllowedToBlockForConnectionMultiplier) {
+		this.threadsAllowedToBlockForConnectionMultiplier = threadsAllowedToBlockForConnectionMultiplier;
+	}
+
+	/**
+	 * Set the max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)
+	 *
+	 * @param maxWaitTime
+	 */
+	public void setMaxWaitTime(int maxWaitTime) {
+		this.maxWaitTime = maxWaitTime;
+	}
+
+	/**
+	 * The maximum idle time for a pooled connection.
+	 *
+	 * @param maxConnectionIdleTime
+	 */
+	public void setMaxConnectionIdleTime(int maxConnectionIdleTime) {
+		this.maxConnectionIdleTime = maxConnectionIdleTime;
+	}
+
+	/**
+	 * Set the maximum life time for a pooled connection.
+	 *
+	 * @param maxConnectionLifeTime
+	 */
+	public void setMaxConnectionLifeTime(int maxConnectionLifeTime) {
+		this.maxConnectionLifeTime = maxConnectionLifeTime;
+	}
+
+	/**
+	 * Set the connect timeout in milliseconds. 0 is default and infinite.
+	 *
+	 * @param connectTimeout
+	 */
+	public void setConnectTimeout(int connectTimeout) {
+		this.connectTimeout = connectTimeout;
+	}
+
+	/**
+	 * Set the socket timeout. 0 is default and infinite.
+	 *
+	 * @param socketTimeout
+	 */
+	public void setSocketTimeout(int socketTimeout) {
+		this.socketTimeout = socketTimeout;
+	}
+
+	/**
+	 * Set the keep alive flag, controls whether or not to have socket keep alive timeout. Defaults to false.
+	 *
+	 * @param socketKeepAlive
+	 */
+	public void setSocketKeepAlive(boolean socketKeepAlive) {
+		this.socketKeepAlive = socketKeepAlive;
+	}
+
+	/**
+	 * Set the {@link ReadPreference}.
+	 *
+	 * @param readPreference
+	 */
+	public void setReadPreference(@Nullable ReadPreference readPreference) {
+		this.readPreference = readPreference;
+	}
+
+	/**
+	 * Set the {@link WriteConcern} that will be the default value used when asking the {@link MongoDbFactory} for a DB
+	 * object.
+	 *
+	 * @param writeConcern
+	 */
+	public void setWriteConcern(@Nullable WriteConcern writeConcern) {
+		this.writeConcern = writeConcern;
+	}
+
+	/**
+	 * @param socketFactory
+	 */
+	public void setSocketFactory(@Nullable SocketFactory socketFactory) {
+		this.socketFactory = socketFactory;
+	}
+
+	/**
+	 * Set the frequency that the driver will attempt to determine the current state of each server in the cluster.
+	 *
+	 * @param heartbeatFrequency
+	 */
+	public void setHeartbeatFrequency(int heartbeatFrequency) {
+		this.heartbeatFrequency = heartbeatFrequency;
+	}
+
+	/**
+	 * In the event that the driver has to frequently re-check a server's availability, it will wait at least this long
+	 * since the previous check to avoid wasted effort.
+	 *
+	 * @param minHeartbeatFrequency
+	 */
+	public void setMinHeartbeatFrequency(int minHeartbeatFrequency) {
+		this.minHeartbeatFrequency = minHeartbeatFrequency;
+	}
+
+	/**
+	 * Set the connect timeout for connections used for the cluster heartbeat.
+	 *
+	 * @param heartbeatConnectTimeout
+	 */
+	public void setHeartbeatConnectTimeout(int heartbeatConnectTimeout) {
+		this.heartbeatConnectTimeout = heartbeatConnectTimeout;
+	}
+
+	/**
+	 * Set the socket timeout for connections used for the cluster heartbeat.
+	 *
+	 * @param heartbeatSocketTimeout
+	 */
+	public void setHeartbeatSocketTimeout(int heartbeatSocketTimeout) {
+		this.heartbeatSocketTimeout = heartbeatSocketTimeout;
+	}
+
+	/**
+	 * Configures the name of the replica set.
+	 *
+	 * @param requiredReplicaSetName
+	 */
+	public void setRequiredReplicaSetName(String requiredReplicaSetName) {
+		this.requiredReplicaSetName = requiredReplicaSetName;
+	}
+
+	/**
+	 * This controls if the driver should us an SSL connection. Defaults to |@literal false}.
+	 *
+	 * @param ssl
+	 */
+	public void setSsl(boolean ssl) {
+		this.ssl = ssl;
+	}
+
+	/**
+	 * Set the {@link SSLSocketFactory} to use for the {@literal SSL} connection. If none is configured here,
+	 * {@link SSLSocketFactory#getDefault()} will be used.
+	 *
+	 * @param sslSocketFactory
+	 */
+	public void setSslSocketFactory(@Nullable SSLSocketFactory sslSocketFactory) {
+
+		this.sslSocketFactory = sslSocketFactory;
+		this.ssl = sslSocketFactory != null;
+	}
+
+	/**
+	 * Set the {@literal server selection timeout} in msec for a 3.x MongoDB Java driver. If not set the default value of
+	 * 30 sec will be used. A value of 0 means that it will timeout immediately if no server is available. A negative
+	 * value means to wait indefinitely.
+	 *
+	 * @param serverSelectionTimeout in msec.
+	 */
+	public void setServerSelectionTimeout(int serverSelectionTimeout) {
+		this.serverSelectionTimeout = serverSelectionTimeout;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.config.AbstractFactoryBean#createInstance()
+	 */
+	@SuppressWarnings("ConstantConditions")
+	@Override
+	protected MongoClientOptions createInstance() throws Exception {
+
+		SocketFactory socketFactoryToUse = ssl
+				? (sslSocketFactory != null ? sslSocketFactory : SSLSocketFactory.getDefault())
+				: this.socketFactory;
+
+		return MongoClientOptions.builder() //
+				.alwaysUseMBeans(this.alwaysUseMBeans) //
+				.connectionsPerHost(this.connectionsPerHost) //
+				.connectTimeout(connectTimeout) //
+				.cursorFinalizerEnabled(cursorFinalizerEnabled) //
+				.dbDecoderFactory(dbDecoderFactory) //
+				.dbEncoderFactory(dbEncoderFactory) //
+				.description(description) //
+				.heartbeatConnectTimeout(heartbeatConnectTimeout) //
+				.heartbeatFrequency(heartbeatFrequency) //
+				.heartbeatSocketTimeout(heartbeatSocketTimeout) //
+				.maxConnectionIdleTime(maxConnectionIdleTime) //
+				.maxConnectionLifeTime(maxConnectionLifeTime) //
+				.maxWaitTime(maxWaitTime) //
+				.minConnectionsPerHost(minConnectionsPerHost) //
+				.minHeartbeatFrequency(minHeartbeatFrequency) //
+				.readPreference(readPreference) //
+				.requiredReplicaSetName(requiredReplicaSetName) //
+				.serverSelectionTimeout(serverSelectionTimeout) //
+				.socketFactory(socketFactoryToUse) //
+				.socketKeepAlive(socketKeepAlive) //
+				.socketTimeout(socketTimeout) //
+				.threadsAllowedToBlockForConnectionMultiplier(threadsAllowedToBlockForConnectionMultiplier) //
+				.writeConcern(writeConcern).build();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.FactoryBean#getObjectType()
+	 */
+	public Class<?> getObjectType() {
+		return MongoClientOptions.class;
+	}
+}