DATAMONGO-1246 - After release cleanups.

We now quote the original criteria before actually wrapping it inside of an regular expression for case insensitive search. This happens not only to case insensitive is, startsWith, endsWith criteria but also to those using like. In that case we quote the part between leading and trailing wildcard if required.

Original pull request: #301.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,12 +0,0 @@
-<!--
-
-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).

.travis.yml

@@ -1,34 +0,0 @@
-language: java
-
-jdk:
-  - oraclejdk8
-
-before_script:
-  - mongod --version
-
-env:
-  matrix:
-    - PROFILE=ci
-    - PROFILE=mongo34-next
-    - PROFILE=mongo35-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

@@ -1,27 +0,0 @@
-= 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.MD

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

CONTRIBUTING.adoc

@@ -1,3 +0,0 @@
-= 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,6 +1,3 @@
-[![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)
-
 # Spring Data MongoDB
 
 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.
@@ -29,7 +26,7 @@ Add the Maven dependency:
 <dependency>
   <groupId>org.springframework.data</groupId>
   <artifactId>spring-data-mongodb</artifactId>
-  <version>${version}.RELEASE</version>
+  <version>1.5.0.RELEASE</version>
 </dependency>
 ```
 
@@ -39,7 +36,7 @@ If you'd rather like the latest snapshots of the upcoming major version, use our
 <dependency>
   <groupId>org.springframework.data</groupId>
   <artifactId>spring-data-mongodb</artifactId>
-  <version>${version}.BUILD-SNAPSHOT</version>
+  <version>1.6.0.BUILD-SNAPSHOT</version>
 </dependency>
 
 <repository>
@@ -143,8 +140,8 @@ public class MyService {
 Here are some ways for you to get involved in the community:
 
 * 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.  
+* 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.  
 * 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://spring.io/blog) to spring.io.
 
-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.
+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.

etc/formatting.xml

@@ -0,0 +1,291 @@
+<?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="do not 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="do not 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="true"/>
+<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="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+<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="do not 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="true"/>
+<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="do not 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="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="do not 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="16"/>
+<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="do not 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>

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-mongodb-parent</artifactId>
-	<version>2.0.0.M2</version>
+	<version>1.5.7.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data MongoDB</name>
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>2.0.0.M2</version>
+		<version>1.4.7.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<modules>
@@ -28,9 +28,9 @@
 	<properties>
 		<project.type>multi</project.type>
 		<dist.id>spring-data-mongodb</dist.id>
-		<springdata.commons>2.0.0.M2</springdata.commons>
-		<mongo>3.4.2</mongo>
-		<mongo.reactivestreams>1.3.0</mongo.reactivestreams>
+		<springdata.commons>1.8.7.BUILD-SNAPSHOT</springdata.commons>
+		<mongo>2.12.5</mongo>
+		<mongo.osgi>2.12.5</mongo.osgi>
 	</properties>
 
 	<developers>
@@ -100,26 +100,23 @@
 			</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>
 
 	<profiles>
+		<profile>
+
+			<id>mongo-next</id>
+			<properties>
+				<mongo>2.13.0</mongo>
+			</properties>
+
+		</profile>
 
 		<profile>
 
-			<id>mongo34-next</id>
+			<id>mongo-3-next</id>
 			<properties>
-				<mongo>3.4.3-SNAPSHOT</mongo>
+				<mongo>3.0.0-SNAPSHOT</mongo>
 			</properties>
 
 			<repositories>
@@ -130,36 +127,6 @@
 			</repositories>
 
 		</profile>
-
-		<profile>
-
-			<id>mongo35-next</id>
-			<properties>
-				<mongo>3.5.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>
-
 	</profiles>
 
 	<dependencies>
@@ -173,15 +140,15 @@
 
 	<repositories>
 		<repository>
-			<id>spring-libs-milestone</id>
-			<url>https://repo.spring.io/libs-milestone</url>
+			<id>spring-libs-snapshot</id>
+			<url>https://repo.spring.io/libs-snapshot</url>
 		</repository>
 	</repositories>
 
 	<pluginRepositories>
 		<pluginRepository>
 			<id>spring-plugins-release</id>
-			<url>https://repo.spring.io/plugins-release</url>
+			<url>http://repo.spring.io/plugins-release</url>
 		</pluginRepository>
 	</pluginRepositories>
 

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

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>2.0.0.M2</version>
+		<version>1.5.7.BUILD-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -14,8 +14,8 @@
 	<name>Spring Data MongoDB - Cross-Store Support</name>
 
 	<properties>
-		<jpa>2.1.1</jpa>
-		<hibernate>5.2.1.Final</hibernate>
+		<jpa>1.0.0.Final</jpa>
+		<hibernate>3.6.10.Final</hibernate>
 	</properties>
 
 	<dependencies>
@@ -48,15 +48,7 @@
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-mongodb</artifactId>
-			<version>2.0.0.M2</version>
-		</dependency>
-
-		<!-- reactive -->
-		<dependency>
-		 	<groupId>io.projectreactor</groupId>
-			<artifactId>reactor-core</artifactId>
-			<version>${reactor}</version>
-			<optional>true</optional>
+			<version>1.5.7.BUILD-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
@@ -67,8 +59,8 @@
 
 		<!-- JPA -->
 		<dependency>
-			<groupId>org.eclipse.persistence</groupId>
-			<artifactId>javax.persistence</artifactId>
+			<groupId>org.hibernate.javax.persistence</groupId>
+			<artifactId>hibernate-jpa-2.0-api</artifactId>
 			<version>${jpa}</version>
 			<optional>true</optional>
 		</dependency>
@@ -89,13 +81,13 @@
 		<dependency>
 			<groupId>javax.validation</groupId>
 			<artifactId>validation-api</artifactId>
-			<version>${validation}</version>
+			<version>1.0.0.GA</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-validator</artifactId>
-			<version>5.2.4.Final</version>
+			<version>4.0.2.GA</version>
 			<scope>test</scope>
 		</dependency>
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * 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.
@@ -17,7 +17,6 @@ package org.springframework.data.mongodb.crossstore;
 
 import javax.persistence.EntityManagerFactory;
 
-import org.bson.Document;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataAccessException;
@@ -30,16 +29,14 @@ 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
  */
 public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 
@@ -48,7 +45,7 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 	private static final String ENTITY_FIELD_NAME = "_entity_field_name";
 	private static final String ENTITY_FIELD_CLASS = "_entity_field_class";
 
-	private final Logger log = LoggerFactory.getLogger(getClass());
+	protected final Logger log = LoggerFactory.getLogger(getClass());
 
 	private MongoTemplate mongoTemplate;
 	private EntityManagerFactory entityManagerFactory;
@@ -75,29 +72,29 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 
 		String collName = getCollectionNameForEntity(entityClass);
 
-		final Document dbk = new Document();
+		final DBObject dbk = new BasicDBObject();
 		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(MongoCollection<Document> collection) throws MongoException, DataAccessException {
-				for (Document dbo : collection.find(dbk)) {
+			public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+				for (DBObject 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);
 					}
@@ -112,9 +109,9 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 	 * @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 {
-		if (log.isDebugEnabled()) {
-			log.debug("getPersistentId called on {}", entity);
-		}
+
+		log.debug("getPersistentId called on " + entity);
+
 		if (entityManagerFactory == null) {
 			throw new DataAccessResourceFailureException("EntityManagerFactory cannot be null");
 		}
@@ -133,7 +130,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());
@@ -144,34 +141,30 @@ 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 Document dbQuery = new Document();
+				final DBObject dbQuery = new BasicDBObject();
 				dbQuery.put(ENTITY_ID, getPersistentId(entity, cs));
 				dbQuery.put(ENTITY_CLASS, entity.getClass().getName());
 				dbQuery.put(ENTITY_FIELD_NAME, key);
-				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;
+				DBObject dbId = mongoTemplate.execute(collName, new CollectionCallback<DBObject>() {
+					public DBObject doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+						return collection.findOne(dbQuery);
 					}
 				});
-
 				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(MongoCollection<Document> collection)
-								throws MongoException, DataAccessException {
-							DeleteResult dr = collection.deleteMany(dbQuery);
+						public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+							collection.remove(dbQuery);
 							return null;
 						}
 					});
 				} else {
-					final Document dbDoc = new Document();
+					final DBObject dbDoc = new BasicDBObject();
 					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());
@@ -179,18 +172,8 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 						dbDoc.put("_id", dbId.get("_id"));
 					}
 					mongoTemplate.execute(collName, new CollectionCallback<Object>() {
-						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);
-							}
+						public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+							collection.save(dbDoc);
 							return null;
 						}
 					});

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

@@ -18,7 +18,6 @@ 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;
@@ -37,6 +36,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionCallback;
 import org.springframework.transaction.support.TransactionTemplate;
 
+import com.mongodb.DBObject;
+
 /**
  * Integration tests for MongoDB cross-store persistence (mainly {@link MongoChangeSetPersister}).
  * 
@@ -47,11 +48,14 @@ import org.springframework.transaction.support.TransactionTemplate;
 @ContextConfiguration("classpath:/META-INF/spring/applicationContext.xml")
 public class CrossStoreMongoTests {
 
-	@Autowired MongoTemplate mongoTemplate;
+	@Autowired
+	MongoTemplate mongoTemplate;
 
-	@PersistenceContext EntityManager entityManager;
+	@PersistenceContext
+	EntityManager entityManager;
 
-	@Autowired PlatformTransactionManager transactionManager;
+	@Autowired
+	PlatformTransactionManager transactionManager;
 	TransactionTemplate txTemplate;
 
 	@Before
@@ -183,7 +187,7 @@ public class CrossStoreMongoTests {
 
 		boolean weFound3 = false;
 
-		for (Document dbo : this.mongoTemplate.getCollection(mongoTemplate.getCollectionName(Person.class)).find()) {
+		for (DBObject 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="mongoClient" class="org.springframework.data.mongodb.core.MongoClientFactoryBean">
+  <bean id="mongo" class="org.springframework.data.mongodb.core.MongoFactoryBean">
     <property name="host" value="localhost"/>
     <property name="port" value="27017"/>
   </bean>
 
   <bean id="mongoDbFactory" class="org.springframework.data.mongodb.core.SimpleMongoDbFactory">
-  	<constructor-arg name="mongoClient" ref="mongoClient"/>
+  	<constructor-arg name="mongo" ref="mongo"/>
   	<constructor-arg name="databaseName" value="database"/>
   </bean>
 

spring-data-mongodb-cross-store/template.mf

@@ -0,0 +1,18 @@
+Bundle-SymbolicName: org.springframework.data.mongodb.crossstore
+Bundle-Name: Spring Data MongoDB Cross Store Support
+Bundle-Vendor: Pivotal Software, Inc.
+Bundle-ManifestVersion: 2
+Import-Package:
+ sun.reflect;version="0";resolution:=optional
+Export-Template:
+ org.springframework.data.mongodb.crossstore.*;version="${project.version}"
+Import-Template:
+ com.mongodb.*;version="${mongo.osgi:[=.=.=,+1.0.0)}",
+ javax.persistence.*;version="${jpa:[=.=.=,+1.0.0)}",
+ org.aspectj.*;version="${aspectj:[1.0.0, 2.0.0)}",
+ org.bson.*;version="0",
+ org.slf4j.*;version="${slf4j:[=.=.=,+1.0.0)}",
+ org.springframework.*;version="${spring:[=.=.=.=,+1.0.0)}",
+ org.springframework.data.*;version="${springdata.commons:[=.=.=.=,+1.0.0)}",
+ org.springframework.data.mongodb.*;version="${project.version:[=.=.=.=,+1.0.0)}",
+ org.w3c.dom.*;version="0"

spring-data-mongodb-distribution/pom.xml

@@ -2,7 +2,7 @@
 <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>
@@ -13,10 +13,10 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>2.0.0.M2</version>
+		<version>1.5.7.BUILD-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
-
+	
 	<properties>
 		<project.root>${basedir}/..</project.root>
 		<dist.key>SDMONGO</dist.key>
@@ -32,10 +32,6 @@
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>wagon-maven-plugin</artifactId>
 			</plugin>
-			<plugin>
-				<groupId>org.asciidoctor</groupId>
-				<artifactId>asciidoctor-maven-plugin</artifactId>
-			</plugin>
 		</plugins>
 	</build>
 

spring-data-mongodb-log4j/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>2.0.0.M2</version>
+		<version>1.5.7.BUILD-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 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,8 +18,6 @@ package org.springframework.data.mongodb.log4j;
 import java.net.UnknownHostException;
 import java.util.Arrays;
 import java.util.Calendar;
-import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 
 import org.apache.log4j.AppenderSkeleton;
@@ -32,18 +30,13 @@ import com.mongodb.BasicDBList;
 import com.mongodb.BasicDBObject;
 import com.mongodb.DB;
 import com.mongodb.Mongo;
-import com.mongodb.MongoClient;
-import com.mongodb.MongoCredential;
-import com.mongodb.ServerAddress;
 import com.mongodb.WriteConcern;
 
 /**
  * Log4j appender writing log entries into a MongoDB instance.
- *
+ * 
  * @author Jon Brisbin
  * @author Oliver Gierke
- * @author Christoph Strobl
- * @author Ricardo Espirito Santo
  */
 public class MongoLog4jAppender extends AppenderSkeleton {
 
@@ -61,19 +54,17 @@ public class MongoLog4jAppender extends AppenderSkeleton {
 
 	protected String host = "localhost";
 	protected int port = 27017;
-	protected String username;
-	protected String password;
-	protected String authenticationDatabase;
 	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.ACKNOWLEDGED;
-	protected WriteConcern infoOrLowerWriteConcern = WriteConcern.UNACKNOWLEDGED;
+	protected WriteConcern warnOrHigherWriteConcern = WriteConcern.SAFE;
+	protected WriteConcern infoOrLowerWriteConcern = WriteConcern.NORMAL;
 	protected Mongo mongo;
 	protected DB db;
 
-	public MongoLog4jAppender() {}
+	public MongoLog4jAppender() {
+	}
 
 	public MongoLog4jAppender(boolean isActive) {
 		super(isActive);
@@ -95,53 +86,6 @@ public class MongoLog4jAppender extends AppenderSkeleton {
 		this.port = port;
 	}
 
-	/**
-	 * @return
-	 * @since 1.10
-	 */
-	public String getUsername() {
-		return username;
-	}
-
-	/**
-	 * @param username may be {@literal null} for unauthenticated access.
-	 * @since 1.10
-	 */
-	public void setUsername(String username) {
-		this.username = username;
-	}
-
-	/**
-	 * @return
-	 * @since 1.10
-	 */
-	public String getPassword() {
-		return password;
-	}
-
-	/**
-	 * @param password may be {@literal null} for unauthenticated access.
-	 * @since 1.10
-	 */
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-	/**
-	 * @return
-	 */
-	public String getAuthenticationDatabase() {
-		return authenticationDatabase;
-	}
-
-	/**
-	 * @param authenticationDatabase may be {@literal null} to use {@link #getDatabase()} as authentication database.
-	 * @since 1.10
-	 */
-	public void setAuthenticationDatabase(String authenticationDatabase) {
-		this.authenticationDatabase = authenticationDatabase;
-	}
-
 	public String getDatabase() {
 		return database;
 	}
@@ -167,14 +111,14 @@ public class MongoLog4jAppender extends AppenderSkeleton {
 		this.applicationId = applicationId;
 	}
 
-	public String getWarnOrHigherWriteConcern() {
-		return warnOrHigherWriteConcern.toString();
-	}
-
 	public void setWarnOrHigherWriteConcern(String wc) {
 		this.warnOrHigherWriteConcern = WriteConcern.valueOf(wc);
 	}
 
+	public String getWarnOrHigherWriteConcern() {
+		return warnOrHigherWriteConcern.toString();
+	}
+
 	public String getInfoOrLowerWriteConcern() {
 		return infoOrLowerWriteConcern.toString();
 	}
@@ -184,26 +128,10 @@ public class MongoLog4jAppender extends AppenderSkeleton {
 	}
 
 	protected void connectToMongo() throws UnknownHostException {
-
-		this.mongo = createMongoClient();
+		this.mongo = new Mongo(host, port);
 		this.db = mongo.getDB(database);
 	}
 
-	private MongoClient createMongoClient() throws UnknownHostException {
-
-		ServerAddress serverAddress = new ServerAddress(host, port);
-
-		if (null == password || null == username) {
-			return new MongoClient(serverAddress);
-		}
-
-		String authenticationDatabaseToUse = authenticationDatabase == null ? this.database : authenticationDatabase;
-		MongoCredential mongoCredential = MongoCredential.createCredential(username,
-				authenticationDatabaseToUse, password.toCharArray());
-		List<MongoCredential> credentials = Collections.singletonList(mongoCredential);
-		return new MongoClient(serverAddress, credentials);
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.apache.log4j.AppenderSkeleton#append(org.apache.log4j.spi.LoggingEvent)
@@ -232,7 +160,7 @@ public class MongoLog4jAppender extends AppenderSkeleton {
 
 		// Copy properties into document
 		Map<Object, Object> props = event.getProperties();
-		if (null != props && !props.isEmpty()) {
+		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());

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

@@ -1,114 +0,0 @@
-/*
- * 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.log4j;
-
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
-
-import java.util.Calendar;
-import java.util.Collections;
-
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
-import org.apache.log4j.MDC;
-import org.apache.log4j.PropertyConfigurator;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mongodb.BasicDBList;
-import com.mongodb.BasicDBObject;
-import com.mongodb.BasicDBObjectBuilder;
-import com.mongodb.DB;
-import com.mongodb.DBCursor;
-import com.mongodb.MongoClient;
-import com.mongodb.MongoCredential;
-import com.mongodb.ServerAddress;
-
-/**
- * Integration tests for {@link MongoLog4jAppender} using authentication.
- *
- * @author Mark Paluch
- */
-public class MongoLog4jAppenderAuthenticationIntegrationTests {
-
-	private final static String username = "admin";
-	private final static String password = "test";
-	private final static String authenticationDatabase = "logs";
-
-	MongoClient mongo;
-	DB db;
-	String collection;
-	ServerAddress serverLocation;
-
-	Logger log;
-
-	@Before
-	public void setUp() throws Exception {
-
-		serverLocation = new ServerAddress("localhost", 27017);
-
-		mongo = new MongoClient(serverLocation);
-		db = mongo.getDB("logs");
-
-		BasicDBList roles = new BasicDBList();
-		roles.add("dbOwner");
-		db.command(new BasicDBObjectBuilder().add("createUser", username).add("pwd", password).add("roles", roles).get());
-		mongo.close();
-
-		mongo = new MongoClient(serverLocation, Collections
-				.singletonList(MongoCredential.createCredential(username, authenticationDatabase, password.toCharArray())));
-		db = mongo.getDB("logs");
-
-		Calendar now = Calendar.getInstance();
-		collection = String.valueOf(now.get(Calendar.YEAR)) + String.format("%1$02d", now.get(Calendar.MONTH) + 1);
-
-		LogManager.resetConfiguration();
-		PropertyConfigurator.configure(getClass().getResource("/log4j-with-authentication.properties"));
-
-		log = Logger.getLogger(MongoLog4jAppenderIntegrationTests.class.getName());
-	}
-
-	@After
-	public void tearDown() {
-
-		if (db != null) {
-			db.getCollection(collection).remove(new BasicDBObject());
-			db.command(new BasicDBObject("dropUser", username));
-		}
-
-		LogManager.resetConfiguration();
-		PropertyConfigurator.configure(getClass().getResource("/log4j.properties"));
-	}
-
-	@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/java/org/springframework/data/mongodb/log4j/MongoLog4jAppenderIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 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.
@@ -20,51 +20,39 @@ import static org.junit.Assert.*;
 
 import java.util.Calendar;
 
-import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.apache.log4j.MDC;
-import org.apache.log4j.PropertyConfigurator;
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.mongodb.BasicDBObject;
 import com.mongodb.DB;
 import com.mongodb.DBCursor;
-import com.mongodb.MongoClient;
-import com.mongodb.ServerAddress;
+import com.mongodb.Mongo;
 
 /**
  * Integration tests for {@link MongoLog4jAppender}.
- *
+ * 
  * @author Jon Brisbin
  * @author Oliver Gierke
- * @author Christoph Strobl
  */
 public class MongoLog4jAppenderIntegrationTests {
 
-	MongoClient mongo;
+	static final String NAME = MongoLog4jAppenderIntegrationTests.class.getName();
+
+	Logger log = Logger.getLogger(NAME);
+	Mongo mongo;
 	DB db;
 	String collection;
-	ServerAddress serverLocation;
-	Logger log;
 
 	@Before
 	public void setUp() throws Exception {
-		serverLocation = new ServerAddress("localhost", 27017);
 
-		mongo = new MongoClient(serverLocation);
+		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);
-
-		log = Logger.getLogger(MongoLog4jAppenderIntegrationTests.class.getName());
-	}
-
-	@After
-	public void tearDown() {
-		db.getCollection(collection).remove(new BasicDBObject());
+		db.getCollection(collection).drop();
 	}
 
 	@Test
@@ -76,11 +64,13 @@ public class MongoLog4jAppenderIntegrationTests {
 		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/java/org/springframework/data/mongodb/log4j/MongoLog4jAppenderUnitTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * 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.
@@ -24,7 +24,10 @@ import org.junit.Test;
  */
 public class MongoLog4jAppenderUnitTests {
 
-	@Test // DATAMONGO-641
+	/**
+	 * @see DATAMONGO-641
+	 */
+	@Test
 	public void closesWithoutMongoInstancePresent() {
 		new MongoLog4jAppender().close();
 	}

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

@@ -1,16 +0,0 @@
-log4j.rootCategory=INFO, mongo
-
-log4j.appender.mongo=org.springframework.data.mongodb.log4j.MongoLog4jAppender
-log4j.appender.mongo.layout=org.apache.log4j.PatternLayout
-log4j.appender.mongo.layout.ConversionPattern=%d %p [%c] - <%m>%n
-log4j.appender.mongo.host = localhost
-log4j.appender.mongo.port = 27017
-log4j.appender.mongo.database = logs
-log4j.appender.mongo.username = admin
-log4j.appender.mongo.password = test
-log4j.appender.mongo.authenticationDatabase = logs
-log4j.appender.mongo.collectionPattern = %X{year}%X{month}
-log4j.appender.mongo.applicationId = my.application
-log4j.appender.mongo.warnOrHigherWriteConcern = FSYNC_SAFE
-
-log4j.category.org.springframework.data.mongodb=DEBUG

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

@@ -1,13 +1,13 @@
-log4j.rootCategory=INFO, mongo
+log4j.rootCategory=INFO, stdout
 
-log4j.appender.mongo=org.springframework.data.mongodb.log4j.MongoLog4jAppender
-log4j.appender.mongo.layout=org.apache.log4j.PatternLayout
-log4j.appender.mongo.layout.ConversionPattern=%d %p [%c] - <%m>%n
-log4j.appender.mongo.host = localhost
-log4j.appender.mongo.port = 27017
-log4j.appender.mongo.database = logs
-log4j.appender.mongo.collectionPattern = %X{year}%X{month}
-log4j.appender.mongo.applicationId = my.application
-log4j.appender.mongo.warnOrHigherWriteConcern = FSYNC_SAFE
+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.springframework.data.mongodb=DEBUG

spring-data-mongodb-log4j/template.mf

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

spring-data-mongodb/Spring Data MongoDB.sonargraph

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<context version="7.2.2.230">
+<context version="7.1.9.205">
     <scope type="Project" name="spring-data-mongodb">
         <element type="TypeFilterReferenceOverridden" name="Filter">
             <element type="IncludeTypePattern" name="org.springframework.data.mongodb.**"/>
@@ -32,15 +32,8 @@
                         <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>
@@ -82,11 +75,6 @@
                     </element>
                     <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Geospatial" type="AllowedDependency"/>
                 </element>
-                <element type="Subsystem" name="Script">
-                    <element type="TypeFilter" name="Assignment">
-                        <element type="IncludeTypePattern" name="**.script.**"/>
-                    </element>
-                </element>
                 <element type="Subsystem" name="Conversion">
                     <element type="TypeFilter" name="Assignment">
                         <element type="IncludeTypePattern" name="**.core.convert.**"/>
@@ -94,7 +82,6 @@
                     <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">
@@ -117,11 +104,6 @@
                     <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.**"/>
@@ -130,10 +112,8 @@
                     <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">
@@ -188,32 +168,7 @@
             </element>
             <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 type="IncludeTypePattern" name="com.mysema.query.**"/>
                 </element>
             </element>
         </architecture>

spring-data-mongodb/pom.xml

@@ -11,18 +11,18 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>2.0.0.M2</version>
+		<version>1.5.7.BUILD-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<properties>
+		<validation>1.0.0.GA</validation>
 		<objenesis>1.3</objenesis>
-		<equalsverifier>1.5</equalsverifier>
 	</properties>
 
 	<dependencies>
 
-		<!-- Spring -->
+		<!--  Spring -->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-tx</artifactId>
@@ -50,7 +50,7 @@
 			<artifactId>spring-expression</artifactId>
 		</dependency>
 
-		<!-- Spring Data -->
+		<!--  Spring Data -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>spring-data-commons</artifactId>
@@ -58,14 +58,14 @@
 		</dependency>
 
 		<dependency>
-			<groupId>com.querydsl</groupId>
+			<groupId>com.mysema.querydsl</groupId>
 			<artifactId>querydsl-mongodb</artifactId>
 			<version>${querydsl}</version>
 			<optional>true</optional>
 		</dependency>
 
 		<dependency>
-			<groupId>com.querydsl</groupId>
+			<groupId>com.mysema.querydsl</groupId>
 			<artifactId>querydsl-apt</artifactId>
 			<version>${querydsl}</version>
 			<scope>provided</scope>
@@ -78,66 +78,6 @@
 			<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>
-			<version>${reactor}</version>
-			<optional>true</optional>
-		</dependency>
-
-		<dependency>
-		 	<groupId>io.projectreactor.addons</groupId>
-			<artifactId>reactor-test</artifactId>
-			<version>${reactor}</version>
-			<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>
@@ -186,7 +126,7 @@
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-validator</artifactId>
-			<version>5.2.4.Final</version>
+			<version>4.2.0.Final</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -197,20 +137,6 @@
 			<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>
@@ -218,19 +144,6 @@
 			<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>
-
 	</dependencies>
 
 	<build>
@@ -242,7 +155,7 @@
 				<version>${apt}</version>
 				<dependencies>
 					<dependency>
-						<groupId>com.querydsl</groupId>
+						<groupId>com.mysema.querydsl</groupId>
 						<artifactId>querydsl-apt</artifactId>
 						<version>${querydsl}</version>
 					</dependency>
@@ -272,11 +185,9 @@
 					</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>

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

@@ -1,61 +0,0 @@
-/*
- * 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/MongoDbFactory.java

@@ -20,7 +20,6 @@ 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.
@@ -36,7 +35,7 @@ public interface MongoDbFactory {
 	 * @return
 	 * @throws DataAccessException
 	 */
-	MongoDatabase getDb() throws DataAccessException;
+	DB getDb() throws DataAccessException;
 
 	/**
 	 * Creates a {@link DB} instance to access the database with the given name.
@@ -45,7 +44,7 @@ public interface MongoDbFactory {
 	 * @return
 	 * @throws DataAccessException
 	 */
-	MongoDatabase getDb(String dbName) throws DataAccessException;
+	DB getDb(String dbName) throws DataAccessException;
 
 	/**
 	 * Exposes a shared {@link MongoExceptionTranslator}.
@@ -53,6 +52,4 @@ public interface MongoDbFactory {
 	 * @return will never be {@literal null}.
 	 */
 	PersistenceExceptionTranslator getExceptionTranslator();
-
-	DB getLegacyDb();
 }

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

@@ -1,56 +0,0 @@
-/*
- * 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,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * 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.
@@ -15,45 +15,80 @@
  */
 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.mapping.context.MappingContextIsNewStrategyFactory;
 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.CustomConversions;
 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.CamelCaseAbbreviatingFieldNamingStrategy;
 import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.data.mongodb.core.mapping.FieldNamingStrategy;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.PropertyNameFieldNamingStrategy;
+import org.springframework.data.support.CachingIsNewStrategyFactory;
+import org.springframework.data.support.IsNewStrategyFactory;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.StringUtils;
 
-import com.mongodb.MongoClient;
+import com.mongodb.Mongo;
 
 /**
  * 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 {
+public abstract class AbstractMongoConfiguration {
 
 	/**
-	 * 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 the name of the database to connect to.
+	 * 
+	 * @return must not be {@literal null}.
+	 */
+	protected abstract String getDatabaseName();
+
+	/**
+	 * Return the name of the authentication database to use. Defaults to {@literal null} and will turn into the value
+	 * returned by {@link #getDatabaseName()} later on effectively.
+	 * 
 	 * @return
 	 */
-	public abstract MongoClient mongoClient();
+	protected String getAuthenticationDatabaseName() {
+		return null;
+	}
+
+	/**
+	 * Return the {@link Mongo} instance to connect to. Annotate with {@link Bean} in case you want to expose a
+	 * {@link Mongo} instance to the {@link org.springframework.context.ApplicationContext}.
+	 * 
+	 * @return
+	 * @throws Exception
+	 */
+	public abstract Mongo mongo() throws Exception;
 
 	/**
 	 * Creates a {@link MongoTemplate}.
-	 *
+	 * 
 	 * @return
+	 * @throws Exception
 	 */
 	@Bean
 	public MongoTemplate mongoTemplate() throws Exception {
@@ -61,39 +96,89 @@ AbstractMongoConfiguration extends MongoConfigurationSupport {
 	}
 
 	/**
-	 * Creates a {@link SimpleMongoDbFactory} to be used by the {@link MongoTemplate}. Will use the {@link MongoClient}
-	 * instance configured in {@link #mongo()}.
-	 *
-	 * @see #mongoClient()
+	 * 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 MongoDbFactory mongoDbFactory() {
-		return new SimpleMongoDbFactory(mongoClient(), getDatabaseName());
+	public MongoDbFactory mongoDbFactory() throws Exception {
+		return new SimpleMongoDbFactory(mongo(), getDatabaseName(), getUserCredentials(), getAuthenticationDatabaseName());
 	}
 
 	/**
 	 * 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.
-	 *
+	 * overriden to implement alternate behaviour.
+	 * 
 	 * @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
 	protected String getMappingBasePackage() {
 
 		Package mappingBasePackage = getClass().getPackage();
 		return mappingBasePackage == null ? null : mappingBasePackage.getName();
 	}
 
+	/**
+	 * 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.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(mongoMappingContext()));
+	}
+
+	/**
+	 * Register custom {@link Converter}s in a {@link CustomConversions} object if required. These
+	 * {@link CustomConversions} will be registered with the {@link #mappingMongoConverter()} and
+	 * {@link #mongoMappingContext()}. Returns an empty {@link CustomConversions} instance by default.
+	 * 
+	 * @return must not be {@literal null}.
+	 */
+	@Bean
+	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()
@@ -109,4 +194,53 @@ AbstractMongoConfiguration extends MongoConfigurationSupport {
 
 		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;
+	}
+
+	/**
+	 * 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/AbstractReactiveMongoConfiguration.java

@@ -1,92 +0,0 @@
-/*
- * 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.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.MongoTemplate;
-import org.springframework.data.mongodb.core.ReactiveMongoOperations;
-import org.springframework.data.mongodb.core.SimpleReactiveMongoDatabaseFactory;
-import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
-import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
-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
- * @since 2.0
- * @see MongoConfigurationSupport
- */
-@Configuration
-public abstract class AbstractReactiveMongoConfiguration 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 ReactiveMongoTemplate}.
-	 *
-	 * @return
-	 */
-	@Bean
-	public ReactiveMongoOperations reactiveMongoTemplate() throws Exception {
-		return new ReactiveMongoTemplate(mongoDbFactory(), mappingMongoConverter());
-	}
-
-	/**
-	 * Creates a {@link SimpleMongoDbFactory} to be used by the {@link MongoTemplate}. Will use the {@link Mongo} instance
-	 * configured in {@link #mongoClient()}.
-	 *
-	 * @see #mongoClient()
-	 * @see #reactiveMongoTemplate()
-	 * @return
-	 * @throws Exception
-	 */
-	@Bean
-	public ReactiveMongoDatabaseFactory mongoDbFactory() {
-		return new SimpleReactiveMongoDatabaseFactory(mongoClient(), getDatabaseName());
-	}
-
-	/**
-	 * Creates a {@link MappingMongoConverter} using the configured {@link #mongoDbFactory()} and
-	 * {@link #mongoMappingContext()}. Will get {@link #customConversions()} applied.
-	 *
-	 * @see #customConversions()
-	 * @see #mongoMappingContext()
-	 * @see #mongoDbFactory()
-	 * @return
-	 * @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,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * 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.
@@ -21,14 +21,13 @@ package org.springframework.data.mongodb.config;
  * @author Jon Brisbin
  * @author Oliver Gierke
  * @author Martin Baumgartner
- * @author Christoph Strobl
  */
 public abstract class BeanNames {
 
 	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 MONGO_BEAN_NAME = "mongo";
 	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";

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * 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.
@@ -52,11 +52,10 @@ import org.springframework.core.type.filter.TypeFilter;
 import org.springframework.data.annotation.Persistent;
 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.CustomConversions;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
-import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.index.MongoPersistentEntityIndexCreator;
+import org.springframework.data.mongodb.core.mapping.CamelCaseAbbreviatingFieldNamingStrategy;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.event.ValidatingMongoEventListener;
@@ -68,13 +67,12 @@ 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 implements BeanDefinitionParser {
 
@@ -122,22 +120,16 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 			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_BEAN_NAME);
 		} catch (NoSuchBeanDefinitionException ignored) {
-
+			if (!StringUtils.hasText(dbFactoryRef)) {
+				dbFactoryRef = DB_FACTORY_BEAN_NAME;
+			}
 			BeanDefinitionBuilder indexHelperBuilder = BeanDefinitionBuilder
 					.genericBeanDefinition(MongoPersistentEntityIndexCreator.class);
 			indexHelperBuilder.addConstructorArgReference(ctxRef);
-			indexHelperBuilder.addConstructorArgReference("indexOperationsProvider");
+			indexHelperBuilder.addConstructorArgReference(dbFactoryRef);
 			indexHelperBuilder.addDependsOn(ctxRef);
 
 			parserContext.registerBeanComponent(new BeanComponentDefinition(indexHelperBuilder.getBeanDefinition(),
@@ -356,7 +348,7 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 
 	/**
 	 * {@link TypeFilter} that returns {@literal false} in case any of the given delegates matches.
-	 *
+	 * 
 	 * @author Oliver Gierke
 	 */
 	private static class NegatingFilter implements TypeFilter {
@@ -365,13 +357,11 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 
 		/**
 		 * Creates a new {@link NegatingFilter} with the given delegates.
-		 *
+		 * 
 		 * @param filters
 		 */
 		public NegatingFilter(TypeFilter... filters) {
-
-			Assert.notNull(filters, "TypeFilters must not be null");
-
+			Assert.notNull(filters);
 			this.delegates = new HashSet<TypeFilter>(Arrays.asList(filters));
 		}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * 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.
@@ -15,24 +15,24 @@
  */
 package org.springframework.data.mongodb.config;
 
+import static org.springframework.beans.factory.config.BeanDefinition.*;
+import static org.springframework.data.mongodb.config.BeanNames.*;
+
 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.beans.factory.support.RootBeanDefinition;
 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.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.event.AuditingEventListener;
+import org.springframework.data.support.IsNewStrategyFactory;
 import org.springframework.util.Assert;
 
 /**
@@ -71,6 +71,7 @@ class MongoAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
 		Assert.notNull(annotationMetadata, "AnnotationMetadata must not be null!");
 		Assert.notNull(registry, "BeanDefinitionRegistry must not be null!");
 
+		defaultDependenciesIfNecessary(registry, annotationMetadata);
 		super.registerBeanDefinitions(annotationMetadata, registry);
 	}
 
@@ -84,11 +85,7 @@ class MongoAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
 		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());
+		builder.addConstructorArgReference(MAPPING_CONTEXT_BEAN_NAME);
 		return configureDefaultAuditHandlerAttributes(configuration, builder);
 	}
 
@@ -105,58 +102,29 @@ class MongoAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
 
 		BeanDefinitionBuilder listenerBeanDefinitionBuilder = BeanDefinitionBuilder
 				.rootBeanDefinition(AuditingEventListener.class);
-		listenerBeanDefinitionBuilder
-				.addConstructorArgValue(ParsingUtils.getObjectFactoryBeanDefinition(getAuditingHandlerBeanName(), registry));
+		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
+	 * Register default bean definitions for a {@link MongoMappingContext} and an {@link IsNewStrategyFactory} in case we
+	 * don't find beans with the assumed names in the registry.
+	 * 
+	 * @param registry the {@link BeanDefinitionRegistry} to use to register the components into.
+	 * @param source the source which the registered components shall be registered with
 	 */
-	static class MongoMappingContextLookup
-			implements FactoryBean<MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty>> {
+	private void defaultDependenciesIfNecessary(BeanDefinitionRegistry registry, Object source) {
 
-		private final MappingMongoConverter converter;
+		if (!registry.containsBeanDefinition(MAPPING_CONTEXT_BEAN_NAME)) {
 
-		/**
-		 * Creates a new {@link MongoMappingContextLookup} for the given {@link MappingMongoConverter}.
-		 * 
-		 * @param converter must not be {@literal null}.
-		 */
-		public MongoMappingContextLookup(MappingMongoConverter converter) {
-			this.converter = converter;
-		}
+			RootBeanDefinition definition = new RootBeanDefinition(MongoMappingContext.class);
+			definition.setRole(ROLE_INFRASTRUCTURE);
+			definition.setSource(source);
 
-		/* 
-		 * (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;
+			registry.registerBeanDefinition(MAPPING_CONTEXT_BEAN_NAME, definition);
 		}
 	}
 }

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

@@ -1,203 +0,0 @@
-/*
- * 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.authentication.UserCredentials;
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.mapping.context.MappingContextIsNewStrategyFactory;
-import org.springframework.data.mapping.context.PersistentEntities;
-import org.springframework.data.mapping.model.CamelCaseAbbreviatingFieldNamingStrategy;
-import org.springframework.data.mapping.model.FieldNamingStrategy;
-import org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy;
-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.CustomConversions;
-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.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;
-
-import com.mongodb.Mongo;
-import com.mongodb.MongoClient;
-
-/**
- * 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 CustomConversions} instance by default.
-	 *
-	 * @return must not be {@literal null}.
-	 */
-	@Bean
-	public CustomConversions customConversions() {
-		return new CustomConversions(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

@@ -1,198 +0,0 @@
-/*
- * 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.config;
-
-import java.beans.PropertyEditorSupport;
-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.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_DELIMINATOR = ":";
-	private static final String DATABASE_DELIMINATOR = "@";
-	private static final String OPTIONS_DELIMINATOR = "?";
-	private static final String OPTION_VALUE_DELIMINATOR = "&";
-
-	/*
-	 * (non-Javadoc)
-	 * @see java.beans.PropertyEditorSupport#setAsText(java.lang.String)
-	 */
-	@Override
-	public void setAsText(String text) throws IllegalArgumentException {
-
-		if (!StringUtils.hasText(text)) {
-			return;
-		}
-
-		List<MongoCredential> credentials = new ArrayList<MongoCredential>();
-
-		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<String>();
-
-		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_DELIMINATOR);
-
-		index = index != -1 ? index : text.lastIndexOf(OPTIONS_DELIMINATOR);
-
-		return index == -1 ? new String[] {} : text.substring(0, index).split(USERNAME_PASSWORD_DELIMINATOR);
-	}
-
-	private static String extractDB(String text) {
-
-		int dbSeperationIndex = text.lastIndexOf(DATABASE_DELIMINATOR);
-
-		if (dbSeperationIndex == -1) {
-			return "";
-		}
-
-		String tmp = text.substring(dbSeperationIndex + 1);
-		int optionsSeperationIndex = tmp.lastIndexOf(OPTIONS_DELIMINATOR);
-
-		return optionsSeperationIndex > -1 ? tmp.substring(0, optionsSeperationIndex) : tmp;
-	}
-
-	private static Properties extractOptions(String text) {
-
-		int optionsSeperationIndex = text.lastIndexOf(OPTIONS_DELIMINATOR);
-		int dbSeperationIndex = text.lastIndexOf(OPTIONS_DELIMINATOR);
-
-		if (optionsSeperationIndex == -1 || dbSeperationIndex > optionsSeperationIndex) {
-			return new Properties();
-		}
-
-		Properties properties = new Properties();
-
-		for (String option : text.substring(optionsSeperationIndex + 1).split(OPTION_VALUE_DELIMINATOR)) {
-			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!");
-		}
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 by the original author(s).
+ * Copyright 2011-2014 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.
@@ -18,10 +18,6 @@ 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;
@@ -30,14 +26,14 @@ 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.MongoClientFactoryBean;
+import org.springframework.data.mongodb.core.MongoFactoryBean;
 import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
 import org.springframework.util.StringUtils;
 import org.w3c.dom.Element;
 
 import com.mongodb.Mongo;
-import com.mongodb.MongoClientURI;
 import com.mongodb.MongoURI;
 
 /**
@@ -46,22 +42,9 @@ import com.mongodb.MongoURI;
  * @author Jon Brisbin
  * @author Oliver Gierke
  * @author Thomas Darimont
- * @author Christoph Strobl
- * @author Viktor Khoroshko
  */
 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)
@@ -81,23 +64,29 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 	@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");
 
-		BeanDefinition mongoUri = getMongoUri(element, parserContext);
+		if (StringUtils.hasText(uri)) {
+			if (StringUtils.hasText(mongoRef) || StringUtils.hasText(dbname) || userCredentials != null) {
+				parserContext.getReaderContext().error("Configure either Mongo URI or details individually!", source);
+			}
 
-		if (mongoUri != null) {
-
-			dbFactoryBuilder.addConstructorArgValue(mongoUri);
+			dbFactoryBuilder.addConstructorArgValue(getMongoUri(uri));
 			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);
@@ -106,6 +95,8 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 		}
 
 		dbFactoryBuilder.addConstructorArgValue(StringUtils.hasText(dbname) ? dbname : "db");
+		dbFactoryBuilder.addConstructorArgValue(userCredentials);
+		dbFactoryBuilder.addConstructorArgValue(element.getAttribute("authentication-dbname"));
 
 		BeanDefinitionBuilder writeConcernPropertyEditorBuilder = getWriteConcernPropertyEditorBuilder();
 
@@ -126,7 +117,7 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 	 */
 	private BeanDefinition registerMongoBeanDefinition(Element element, ParserContext parserContext) {
 
-		BeanDefinitionBuilder mongoBuilder = BeanDefinitionBuilder.genericBeanDefinition(MongoClientFactoryBean.class);
+		BeanDefinitionBuilder mongoBuilder = BeanDefinitionBuilder.genericBeanDefinition(MongoFactoryBean.class);
 		setPropertyValue(mongoBuilder, element, "host");
 		setPropertyValue(mongoBuilder, element, "port");
 
@@ -134,42 +125,36 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 	}
 
 	/**
-	 * 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}.
+	 * Returns a {@link BeanDefinition} for a {@link UserCredentials} object.
 	 * 
-	 * @param element must not be {@literal null}.
-	 * @param parserContext
-	 * @return {@literal null} in case no client-/uri defined.
+	 * @param element
+	 * @return the {@link BeanDefinition} or {@literal null} if neither username nor password given.
 	 */
-	private BeanDefinition getMongoUri(Element element, ParserContext parserContext) {
+	private BeanDefinition getUserCredentialsBeanDefinition(Element element, ParserContext context) {
 
-		boolean hasClientUri = element.hasAttribute("client-uri");
+		String username = element.getAttribute("username");
+		String password = element.getAttribute("password");
 
-		if (!hasClientUri && !element.hasAttribute("uri")) {
+		if (!StringUtils.hasText(username) && !StringUtils.hasText(password)) {
 			return null;
 		}
 
-		int allowedAttributesCount = 1;
-		for (String attribute : MONGO_URI_ALLOWED_ADDITIONAL_ATTRIBUTES) {
+		BeanDefinitionBuilder userCredentialsBuilder = BeanDefinitionBuilder.genericBeanDefinition(UserCredentials.class);
+		userCredentialsBuilder.addConstructorArgValue(StringUtils.hasText(username) ? username : null);
+		userCredentialsBuilder.addConstructorArgValue(StringUtils.hasText(password) ? password : null);
 
-			if (element.hasAttribute(attribute)) {
-				allowedAttributesCount++;
-			}
-		}
+		return getSourceBeanDefinition(userCredentialsBuilder, context, element);
+	}
 
-		if (element.getAttributes().getLength() > allowedAttributesCount) {
+	/**
+	 * Creates a {@link BeanDefinition} for a {@link MongoURI}.
+	 * 
+	 * @param uri
+	 * @return
+	 */
+	private BeanDefinition getMongoUri(String uri) {
 
-			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);
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MongoURI.class);
 		builder.addConstructorArgValue(uri);
 
 		return builder.getBeanDefinition();

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * 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.
@@ -26,19 +26,12 @@ 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;
+			name = "mongo";
 		}
 		registerJmxComponents(name, element, parserContext);
 		return null;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * 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.
@@ -22,7 +22,6 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
  * 
  * @author Oliver Gierke
  * @author Martin Baumgartner
- * @author Christoph Strobl
  */
 public class MongoNamespaceHandler extends NamespaceHandlerSupport {
 
@@ -33,7 +32,7 @@ public class MongoNamespaceHandler extends NamespaceHandlerSupport {
 	public void init() {
 
 		registerBeanDefinitionParser("mapping-converter", new MappingMongoConverterParser());
-		registerBeanDefinitionParser("mongo-client", new MongoClientParser());
+		registerBeanDefinitionParser("mongo", new MongoParser());
 		registerBeanDefinitionParser("db-factory", new MongoDbFactoryParser());
 		registerBeanDefinitionParser("jmx", new MongoJmxParser());
 		registerBeanDefinitionParser("auditing", new MongoAuditingBeanDefinitionParser());

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 the original author or authors.
+ * 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.
@@ -15,25 +15,29 @@
  */
 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.MongoClientFactoryBean;
+import org.springframework.data.mongodb.core.MongoFactoryBean;
 import org.springframework.util.StringUtils;
 import org.w3c.dom.Element;
 
 /**
- * Parser for {@code mongo-client} definitions.
+ * Parser for <mongo;gt; definitions.
  * 
- * @author Christoph Strobl
- * @since 1.7
+ * @author Mark Pollack
+ * @author Oliver Gierke
  */
-public class MongoClientParser implements BeanDefinitionParser {
+public class MongoParser implements BeanDefinitionParser {
 
 	/* 
 	 * (non-Javadoc)
@@ -46,13 +50,12 @@ public class MongoClientParser implements BeanDefinitionParser {
 
 		BeanComponentDefinitionBuilder helper = new BeanComponentDefinitionBuilder(element, parserContext);
 
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MongoClientFactoryBean.class);
-
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MongoFactoryBean.class);
 		ParsingUtils.setPropertyValue(builder, element, "port", "port");
 		ParsingUtils.setPropertyValue(builder, element, "host", "host");
-		ParsingUtils.setPropertyValue(builder, element, "credentials", "credentials");
+		ParsingUtils.setPropertyValue(builder, element, "write-concern", "writeConcern");
 
-		MongoParsingUtils.parseMongoClientOptions(element, builder);
+		MongoParsingUtils.parseMongoOptions(element, builder);
 		MongoParsingUtils.parseReplicaSet(element, builder);
 
 		String defaultedId = StringUtils.hasText(id) ? id : BeanNames.MONGO_BEAN_NAME;
@@ -61,25 +64,30 @@ public class MongoClientParser implements BeanDefinitionParser {
 
 		BeanComponentDefinition mongoComponent = helper.getComponent(builder, defaultedId);
 		parserContext.registerBeanComponent(mongoComponent);
-
-		BeanComponentDefinition serverAddressPropertyEditor = helper.getComponent(MongoParsingUtils
-				.getServerAddressPropertyEditorBuilder());
+		BeanComponentDefinition serverAddressPropertyEditor = helper.getComponent(registerServerAddressPropertyEditor());
 		parserContext.registerBeanComponent(serverAddressPropertyEditor);
-
-		BeanComponentDefinition writeConcernEditor = helper.getComponent(MongoParsingUtils
+		BeanComponentDefinition writeConcernPropertyEditor = helper.getComponent(MongoParsingUtils
 				.getWriteConcernPropertyEditorBuilder());
-		parserContext.registerBeanComponent(writeConcernEditor);
-
-		BeanComponentDefinition readPreferenceEditor = helper.getComponent(MongoParsingUtils
-				.getReadPreferencePropertyEditorBuilder());
-		parserContext.registerBeanComponent(readPreferenceEditor);
-
-		BeanComponentDefinition credentialsEditor = helper.getComponent(MongoParsingUtils
-				.getMongoCredentialPropertyEditor());
-		parserContext.registerBeanComponent(credentialsEditor);
+		parserContext.registerBeanComponent(writeConcernPropertyEditor);
 
 		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/MongoParsingUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 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.
@@ -24,7 +24,7 @@ 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.data.mongodb.core.MongoOptionsFactoryBean;
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;
 
@@ -33,13 +33,13 @@ import org.w3c.dom.Element;
  * 
  * @author Mark Pollack
  * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Christoph Strobl
+ * @author Thomas Darimont
  */
-@SuppressWarnings("deprecation")
 abstract class MongoParsingUtils {
 
-	private MongoParsingUtils() {}
+	private MongoParsingUtils() {
+
+	}
 
 	/**
 	 * Parses the mongo replica-set element.
@@ -54,48 +54,36 @@ abstract class MongoParsingUtils {
 	}
 
 	/**
-	 * Parses the {@code mongo:client-options} sub-element. Populates the given attribute factory with the proper
-	 * attributes.
+	 * Parses the mongo: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
+	 * @return true if parsing actually occured, false otherwise
 	 */
-	public static boolean parseMongoClientOptions(Element element, BeanDefinitionBuilder mongoClientBuilder) {
-
-		Element optionsElement = DomUtils.getChildElementByTagName(element, "client-options");
-
+	static boolean parseMongoOptions(Element element, BeanDefinitionBuilder mongoBuilder) {
+		Element optionsElement = DomUtils.getChildElementByTagName(element, "options");
 		if (optionsElement == null) {
 			return false;
 		}
 
-		BeanDefinitionBuilder clientOptionsDefBuilder = BeanDefinitionBuilder
-				.genericBeanDefinition(MongoClientOptionsFactoryBean.class);
+		BeanDefinitionBuilder optionsDefBuilder = BeanDefinitionBuilder
+				.genericBeanDefinition(MongoOptionsFactoryBean.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",
+		setPropertyValue(optionsDefBuilder, optionsElement, "connections-per-host", "connectionsPerHost");
+		setPropertyValue(optionsDefBuilder, 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());
+		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");
+		setPropertyValue(optionsDefBuilder, optionsElement, "ssl", "ssl");
+		setPropertyReference(optionsDefBuilder, optionsElement, "ssl-socket-factory-ref", "sslSocketFactory");
 
+		mongoBuilder.addPropertyValue("mongoOptions", optionsDefBuilder.getBeanDefinition());
 		return true;
 	}
 
@@ -115,56 +103,4 @@ abstract class MongoParsingUtils {
 
 		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/ReadPreferencePropertyEditor.java

@@ -1,66 +0,0 @@
-/*
- * 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.config;
-
-import java.beans.PropertyEditorSupport;
-
-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(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/core/BulkOperations.java

@@ -1,145 +0,0 @@
-/*
- * Copyright 2015-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.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 {@link BulkOperationException} if an error occurred during bulk processing.
-	 */
-	BulkWriteResult execute();
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2016 the original author or authors.
+ * 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.
@@ -15,30 +15,12 @@
  */
 package org.springframework.data.mongodb.core;
 
-import org.bson.Document;
+import com.mongodb.DBCollection;
+import com.mongodb.MongoException;
 import org.springframework.dao.DataAccessException;
 
-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
-	 * @throws MongoException
-	 * @throws DataAccessException
-	 */
-	T doInCollection(MongoCollection<Document> collection) throws MongoException, DataAccessException;
+	T doInCollection(DBCollection collection) throws MongoException, DataAccessException;
 
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2010 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,15 +15,12 @@
  */
 package org.springframework.data.mongodb.core;
 
-import org.bson.Document;
-
-import com.mongodb.client.FindIterable;
+import com.mongodb.DBCursor;
 
 /**
- * Simple callback interface to allow customization of a {@link FindIterable}.
+ * Simple callback interface to allow customization of a {@link DBCursor}.
  * 
  * @author Oliver Gierke
- * @author Christoph Strobl
  */
 interface CursorPreparer {
 
@@ -32,5 +29,5 @@ interface CursorPreparer {
 	 * 
 	 * @param cursor
 	 */
-	FindIterable<Document> prepare(FindIterable<Document> cursor);
+	DBCursor prepare(DBCursor cursor);
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2016 the original author or authors.
+ * 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.
@@ -15,16 +15,11 @@
  */
 package org.springframework.data.mongodb.core;
 
+import com.mongodb.DB;
+import com.mongodb.MongoException;
 import org.springframework.dao.DataAccessException;
 
-import com.mongodb.MongoException;
-import com.mongodb.client.MongoDatabase;
-
-/**
- *
- * @param <T>
- */
 public interface DbCallback<T> {
 
-	T doInDB(MongoDatabase db) throws MongoException, DataAccessException;
+	T doInDB(DB db) throws MongoException, DataAccessException;
 }

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

@@ -1,329 +0,0 @@
-/*
- * Copyright 2015-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.core;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.bson.Document;
-import org.springframework.dao.DataAccessException;
-import org.springframework.dao.support.PersistenceExceptionTranslator;
-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.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.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
- * @since 1.9
- */
-class DefaultBulkOperations implements BulkOperations {
-
-	private final MongoOperations mongoOperations;
-	private final BulkMode bulkMode;
-	private final String collectionName;
-
-	private PersistenceExceptionTranslator exceptionTranslator;
-	private WriteConcernResolver writeConcernResolver;
-	private WriteConcern defaultWriteConcern;
-
-	private BulkWriteOptions bulkOptions;
-
-	List<WriteModel<Document>> models = new ArrayList<WriteModel<Document>>();
-
-	/**
-	 * Creates a new {@link DefaultBulkOperations} for the given {@link MongoOperations}, {@link BulkMode}, collection
-	 * name and {@link WriteConcern}.
-	 * 
-	 * @param mongoOperations The underlying {@link MongoOperations}, must not be {@literal null}.
-	 * @param bulkMode must not be {@literal null}.
-	 * @param collectionName Name of the collection to work on, must not be {@literal null} or empty.
-	 * @param entityType the entity type, can be {@literal null}.
-	 */
-	DefaultBulkOperations(MongoOperations mongoOperations, BulkMode bulkMode, String collectionName,
-			Class<?> entityType) {
-
-		Assert.notNull(mongoOperations, "MongoOperations must not be null!");
-		Assert.notNull(bulkMode, "BulkMode must not be null!");
-		Assert.hasText(collectionName, "Collection name must not be null or empty!");
-
-		this.mongoOperations = mongoOperations;
-		this.bulkMode = bulkMode;
-		this.collectionName = collectionName;
-
-		this.exceptionTranslator = new MongoExceptionTranslator();
-		this.writeConcernResolver = DefaultWriteConcernResolver.INSTANCE;
-
-		this.bulkOptions = initBulkOperation();
-	}
-
-	/**
-	 * Configures the {@link PersistenceExceptionTranslator} to be used. Defaults to {@link MongoExceptionTranslator}.
-	 * 
-	 * @param exceptionTranslator can be {@literal null}.
-	 */
-	public void setExceptionTranslator(PersistenceExceptionTranslator exceptionTranslator) {
-		this.exceptionTranslator = exceptionTranslator == null ? new MongoExceptionTranslator() : exceptionTranslator;
-	}
-
-	/**
-	 * Configures the {@link WriteConcernResolver} to be used. Defaults to {@link DefaultWriteConcernResolver}.
-	 * 
-	 * @param writeConcernResolver can be {@literal null}.
-	 */
-	public void setWriteConcernResolver(WriteConcernResolver writeConcernResolver) {
-		this.writeConcernResolver = writeConcernResolver == null ? DefaultWriteConcernResolver.INSTANCE
-				: writeConcernResolver;
-	}
-
-	/**
-	 * Configures the default {@link WriteConcern} to be used. Defaults to {@literal null}.
-	 * 
-	 * @param defaultWriteConcern can be {@literal null}.
-	 */
-	public void setDefaultWriteConcern(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!");
-
-		for (Object document : documents) {
-			insert(document);
-		}
-
-		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(Arrays.asList(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(Arrays.asList(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!");
-
-		models.add(new DeleteManyModel<Document>(query.getQueryObject()));
-		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, bulkOptions);
-
-		} catch (BulkWriteException o_O) {
-
-			DataAccessException toThrow = exceptionTranslator.translateExceptionIfPossible(o_O);
-			throw toThrow == null ? o_O : toThrow;
-
-		} finally {
-			this.bulkOptions = initBulkOperation();
-		}
-	}
-
-	/**
-	 * 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);
-
-		if (multi) {
-			models.add(new UpdateManyModel<Document>(query.getQueryObject(), update.getUpdateObject(), options));
-		} else {
-			models.add(new UpdateOneModel<Document>(query.getQueryObject(), update.getUpdateObject(), options));
-		}
-		return this;
-	}
-
-	private final BulkWriteOptions initBulkOperation() {
-
-		BulkWriteOptions options = new BulkWriteOptions();
-		switch (bulkMode) {
-			case ORDERED:
-				return options.ordered(true);
-			case UNORDERED:
-				return options.ordered(false);
-		}
-		throw new IllegalStateException("BulkMode was null!");
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 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.
@@ -15,25 +15,22 @@
  */
 package org.springframework.data.mongodb.core;
 
-import static org.springframework.data.mongodb.core.MongoTemplate.*;
+import static org.springframework.data.domain.Sort.Direction.*;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
-import org.bson.Document;
 import org.springframework.dao.DataAccessException;
-import org.springframework.data.mongodb.core.convert.QueryMapper;
-import org.springframework.data.mongodb.MongoDbFactory;
 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.mapping.MongoPersistentEntity;
 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}.
@@ -41,97 +38,47 @@ import com.mongodb.client.model.IndexOptions;
  * @author Mark Pollack
  * @author Oliver Gierke
  * @author Komi Innocent
- * @author Christoph Strobl
- * @author Mark Paluch
  */
 public class DefaultIndexOperations implements IndexOperations {
 
-	private static final String PARTIAL_FILTER_EXPRESSION_KEY = "partialFilterExpression";
+	private static final Double ONE = Double.valueOf(1);
+	private static final Double MINUS_ONE = Double.valueOf(-1);
+	private static final Collection<String> TWO_D_IDENTIFIERS = Arrays.asList("2d", "2dsphere");
 
-	private final MongoDbFactory mongoDbFactory;
+	private final MongoOperations mongoOperations;
 	private final String collectionName;
-	private final QueryMapper mapper;
-	private final Class<?> type;
 
 	/**
 	 * Creates a new {@link DefaultIndexOperations}.
 	 * 
-	 * @param mongoDbFactory must not be {@literal null}.
+	 * @param mongoOperations must not be {@literal null}.
 	 * @param collectionName must not be {@literal null}.
-	 * @param queryMapper must not be {@literal null}.
 	 */
-	public DefaultIndexOperations(MongoDbFactory mongoDbFactory, String collectionName, QueryMapper queryMapper) {
+	public DefaultIndexOperations(MongoOperations mongoOperations, String collectionName) {
 
-		this(mongoDbFactory, collectionName, queryMapper, 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,
-			Class<?> type) {
-
-		Assert.notNull(mongoDbFactory, "MongoDbFactory must not be null!");
+		Assert.notNull(mongoOperations, "MongoOperations must not be null!");
 		Assert.notNull(collectionName, "Collection name can not be null!");
-		Assert.notNull(queryMapper, "QueryMapper must not be null!");
 
-		this.mongoDbFactory = mongoDbFactory;
+		this.mongoOperations = mongoOperations;
 		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)
 	 */
-	public String ensureIndex(final IndexDefinition indexDefinition) {
-
-		return execute(collection -> {
-
-			Document indexOptions = indexDefinition.getIndexOptions();
-
-			if (indexOptions != null) {
-
-				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)));
+	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 collection.createIndex(indexDefinition.getIndexKeys(), ops);
+				return null;
 			}
-			return collection.createIndex(indexDefinition.getIndexKeys());
-		}
-
-		);
-	}
-
-	private MongoPersistentEntity<?> lookupPersistentEntity(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;
+		});
 	}
 
 	/*
@@ -139,10 +86,11 @@ public class DefaultIndexOperations implements IndexOperations {
 	 * @see org.springframework.data.mongodb.core.IndexOperations#dropIndex(java.lang.String)
 	 */
 	public void dropIndex(final String name) {
-
-		execute(collection -> {
-			collection.dropIndex(name);
-			return null;
+		mongoOperations.execute(collectionName, new CollectionCallback<Void>() {
+			public Void doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+				collection.dropIndex(name);
+				return null;
+			}
 		});
 
 	}
@@ -155,46 +103,71 @@ public class DefaultIndexOperations implements IndexOperations {
 		dropIndex("*");
 	}
 
+	/*
+	 * (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()
 	 */
 	public List<IndexInfo> getIndexInfo() {
 
-		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);
+		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);
 			}
 
-			private List<IndexInfo> getIndexData(MongoCursor<Document> cursor) {
+			private List<IndexInfo> getIndexData(List<DBObject> dbObjectList) {
 
 				List<IndexInfo> indexInfoList = new ArrayList<IndexInfo>();
 
-				while (cursor.hasNext()) {
+				for (DBObject ix : dbObjectList) {
 
-					Document ix = cursor.next();
-					IndexInfo indexInfo = IndexConverters.documentToIndexInfoConverter().convert(ix);
-					indexInfoList.add(indexInfo);
+					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 (TWO_D_IDENTIFIERS.contains(value)) {
+							indexFields.add(IndexField.geo(key));
+						} else {
+
+							Double keyValue = new Double(value.toString());
+
+							if (ONE.equals(keyValue)) {
+								indexFields.add(IndexField.create(key, ASC));
+							} else if (MINUS_ONE.equals(keyValue)) {
+								indexFields.add(IndexField.create(key, DESC));
+							}
+						}
+					}
+
+					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));
 				}
 
 				return indexInfoList;
 			}
 		});
 	}
-
-	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

@@ -1,47 +0,0 @@
-/*
- * 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.core;
-
-import org.springframework.data.mongodb.MongoDbFactory;
-import org.springframework.data.mongodb.core.convert.QueryMapper;
-
-/**
- * {@link IndexOperationsProvider} to obtain {@link IndexOperations} from a given {@link MongoDbFactory}. TODO: Review
- * me
- *
- * @author Mark Paluch
- * @since 2.0
- */
-class DefaultIndexOperationsProvider implements IndexOperationsProvider {
-
-	private final MongoDbFactory mongoDbFactory;
-	private final QueryMapper mapper;
-
-	/**
-	 * @param mongoDbFactory must not be {@literal null}.
-	 */
-	DefaultIndexOperationsProvider(MongoDbFactory mongoDbFactory, QueryMapper mapper) {
-		this.mongoDbFactory = mongoDbFactory; this.mapper = mapper;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.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

@@ -1,102 +0,0 @@
-/*
- * 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.core;
-
-import org.bson.Document;
-import org.springframework.data.mongodb.core.index.IndexDefinition;
-import org.springframework.data.mongodb.core.index.IndexInfo;
-import org.springframework.util.Assert;
-
-import com.mongodb.reactivestreams.client.ListIndexesPublisher;
-
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-/**
- * Default implementation of {@link IndexOperations}.
- *
- * @author Mark Paluch
- * @since 1.11
- */
-public class DefaultReactiveIndexOperations implements ReactiveIndexOperations {
-
-	private final ReactiveMongoOperations mongoOperations;
-	private final String collectionName;
-
-	/**
-	 * Creates a new {@link DefaultReactiveIndexOperations}.
-	 *
-	 * @param mongoOperations must not be {@literal null}.
-	 * @param collectionName must not be {@literal null}.
-	 */
-	public DefaultReactiveIndexOperations(ReactiveMongoOperations mongoOperations, String collectionName) {
-
-		Assert.notNull(mongoOperations, "ReactiveMongoOperations must not be null!");
-		Assert.notNull(collectionName, "Collection must not be null!");
-
-		this.mongoOperations = mongoOperations;
-		this.collectionName = collectionName;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveIndexOperations#ensureIndex(org.springframework.data.mongodb.core.index.IndexDefinition)
-	 */
-	public Mono<String> ensureIndex(final IndexDefinition indexDefinition) {
-
-		return mongoOperations.execute(collectionName, (ReactiveCollectionCallback<String>) collection -> {
-
-			Document indexOptions = indexDefinition.getIndexOptions();
-
-			if (indexOptions != null) {
-				return collection.createIndex(indexDefinition.getIndexKeys(),
-						IndexConverters.indexDefinitionToIndexOptionsConverter().convert(indexDefinition));
-			}
-
-			return collection.createIndex(indexDefinition.getIndexKeys());
-		}).next();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveIndexOperations#dropIndex(java.lang.String)
-	 */
-	public Mono<Void> dropIndex(final String name) {
-
-		return mongoOperations.execute(collectionName, collection -> {
-
-			return Mono.from(collection.dropIndex(name));
-		}).flatMap(success -> Mono.<Void>empty()).next();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveIndexOperations#dropAllIndexes()
-	 */
-	public Mono<Void> dropAllIndexes() {
-		return dropIndex("*");
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveIndexOperations#getIndexInfo()
-	 */
-	public Flux<IndexInfo> getIndexInfo() {
-
-		return mongoOperations.execute(collectionName, collection -> {
-
-			ListIndexesPublisher<Document> indexesPublisher = collection.listIndexes(Document.class);
-
-			return Flux.from(indexesPublisher).map(IndexConverters.documentToIndexInfoConverter()::convert);
-		});
-	}
-}

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

@@ -1,198 +0,0 @@
-/*
- * Copyright 2014-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.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.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/DocumentCallbackHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2016 the original author or authors.
+ * 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.
@@ -15,26 +15,24 @@
  */
 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(Document document) throws MongoException, DataAccessException;
+	void processDocument(DBObject dbObject) throws MongoException, DataAccessException;
 }

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

@@ -1,34 +0,0 @@
-/*
- * 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.core;
-
-import com.mongodb.DBCursor;
-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 cursor
-	 */
-	<T> FindPublisher<T> prepare(FindPublisher<T> findPublisher);
-}

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

@@ -1,72 +0,0 @@
-/*
- * 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

@@ -1,134 +0,0 @@
-/*
- * 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.core;
-
-import static org.springframework.data.domain.Sort.Direction.*;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-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.IndexField;
-import org.springframework.data.mongodb.core.index.IndexInfo;
-import org.springframework.util.ObjectUtils;
-
-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;
-
-	private static final Double ONE = Double.valueOf(1);
-	private static final Double MINUS_ONE = Double.valueOf(-1);
-	private static final Collection<String> TWO_D_IDENTIFIERS = Arrays.asList("2d", "2dsphere");
-
-	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"));
-			}
-
-			return ops;
-		};
-	}
-
-	private static Converter<Document, IndexInfo> getDocumentIndexInfoConverter() {
-
-		return ix -> {
-			return IndexInfo.indexInfoOf(ix);
-		};
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * 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.
@@ -20,12 +20,12 @@ import java.util.List;
 import org.springframework.data.mongodb.core.index.IndexDefinition;
 import org.springframework.data.mongodb.core.index.IndexInfo;
 
+
 /**
  * Index operations on a collection.
  * 
  * @author Mark Pollack
  * @author Oliver Gierke
- * @author Christoph Strobl
  */
 public interface IndexOperations {
 
@@ -35,7 +35,7 @@ public interface IndexOperations {
 	 * 
 	 * @param indexDefinition must not be {@literal null}.
 	 */
-	String ensureIndex(IndexDefinition indexDefinition);
+	void ensureIndex(IndexDefinition indexDefinition);
 
 	/**
 	 * Drops an index from this collection.
@@ -49,6 +49,11 @@ public interface IndexOperations {
 	 */
 	void dropAllIndexes();
 
+	/**
+	 * Clears all indices that have not yet been applied to this collection.
+	 */
+	void resetIndexCache();
+
 	/**
 	 * Returns the index information on the collection.
 	 * 

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

@@ -1,66 +0,0 @@
-/*
- * 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.core;
-
-import java.util.List;
-
-import org.springframework.data.mongodb.core.index.IndexDefinition;
-import org.springframework.data.mongodb.core.index.IndexInfo;
-import org.springframework.util.Assert;
-
-/**
- * Adapter for creating synchronous {@link IndexOperations}.
- *
- * @author Christoph Strobl
- * @since 2.0
- */
-public interface IndexOperationsAdapter extends IndexOperations {
-
-	/**
-	 * Obtain a blocking variant of {@link IndexOperations} wrapping {@link ReactiveIndexOperations}.
-	 *
-	 * @param reactiveIndexOperations must not be {@literal null}.
-	 * @return never {@literal null}
-	 */
-	static IndexOperationsAdapter blocking(ReactiveIndexOperations reactiveIndexOperations) {
-
-		Assert.notNull(reactiveIndexOperations, "ReactiveIndexOperations must not be null!");
-
-		return new IndexOperationsAdapter() {
-
-			@Override
-			public String ensureIndex(IndexDefinition indexDefinition) {
-				return reactiveIndexOperations.ensureIndex(indexDefinition).block();
-			}
-
-			@Override
-			public void dropIndex(String name) {
-				reactiveIndexOperations.dropIndex(name).block();
-			}
-
-			@Override
-			public void dropAllIndexes() {
-				reactiveIndexOperations.dropAllIndexes().block();
-			}
-
-			@Override
-			public List<IndexInfo> getIndexInfo() {
-				return reactiveIndexOperations.getIndexInfo().collectList().block();
-			}
-		};
-	}
-}

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

@@ -1,34 +0,0 @@
-/*
- * 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.core;
-
-import org.springframework.data.mongodb.core.convert.QueryMapper;
-
-/**
- * TODO: Revisit for a better pattern.
- * @author Mark Paluch
- * @since 2.0
- */
-public interface IndexOperationsProvider {
-
-	/**
-	 * Returns the operations that can be performed on indexes
-	 *
-	 * @return index operations on the named collection
-	 */
-	IndexOperations indexOps(String collectionName);
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * 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.
@@ -15,9 +15,9 @@
  */
 package org.springframework.data.mongodb.core;
 
-import org.bson.Document;
 import org.springframework.util.Assert;
 
+import com.mongodb.DBObject;
 import com.mongodb.WriteConcern;
 
 /**
@@ -31,7 +31,6 @@ import com.mongodb.WriteConcern;
  * 
  * @author Mark Pollack
  * @author Oliver Gierke
- * @author Christoph Strobl
  */
 public class MongoAction {
 
@@ -39,8 +38,8 @@ public class MongoAction {
 	private final WriteConcern defaultWriteConcern;
 	private final Class<?> entityType;
 	private final MongoActionOperation mongoActionOperation;
-	private final Document query;
-	private final Document document;
+	private final DBObject query;
+	private final DBObject document;
 
 	/**
 	 * Create an instance of a {@link MongoAction}.
@@ -49,11 +48,11 @@ public class MongoAction {
 	 * @param mongoActionOperation action being taken against the collection
 	 * @param collectionName the collection name, must not be {@literal null} or empty.
 	 * @param entityType the POJO that is being operated against
-	 * @param document the converted Document from the POJO or Spring Update object
-	 * @param query the converted Document from the Spring Query object
+	 * @param document the converted DBObject from the POJO or Spring Update object
+	 * @param query the converted DBObject from the Spring Query object
 	 */
-	public MongoAction(WriteConcern defaultWriteConcern, MongoActionOperation mongoActionOperation, String collectionName,
-			Class<?> entityType, Document document, Document query) {
+	public MongoAction(WriteConcern defaultWriteConcern, MongoActionOperation mongoActionOperation,
+			String collectionName, Class<?> entityType, DBObject document, DBObject query) {
 
 		Assert.hasText(collectionName, "Collection name must not be null or empty!");
 
@@ -73,6 +72,14 @@ public class MongoAction {
 		return defaultWriteConcern;
 	}
 
+	/**
+	 * @deprecated use {@link #getEntityType()} instead.
+	 */
+	@Deprecated
+	public Class<?> getEntityClass() {
+		return entityType;
+	}
+
 	public Class<?> getEntityType() {
 		return entityType;
 	}
@@ -81,11 +88,11 @@ public class MongoAction {
 		return mongoActionOperation;
 	}
 
-	public Document getQuery() {
+	public DBObject getQuery() {
 		return query;
 	}
 
-	public Document getDocument() {
+	public DBObject getDocument() {
 		return document;
 	}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2015 the original author or authors.
+ * 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.
@@ -25,5 +25,5 @@ package org.springframework.data.mongodb.core;
  */
 public enum MongoActionOperation {
 
-	REMOVE, UPDATE, INSERT, INSERT_LIST, SAVE, BULK;
+	REMOVE, UPDATE, INSERT, INSERT_LIST, SAVE
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 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.
@@ -15,30 +15,31 @@
  */
 package org.springframework.data.mongodb.core;
 
-import com.mongodb.MongoClient;
-import com.mongodb.client.MongoDatabase;
-import org.bson.Document;
+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
- * @author Thomas Darimont
- * @author Mark Paluch
- * @author Christoph Strobl
+ * @author Thomas Darimont
  */
 @ManagedResource(description = "Mongo Admin Operations")
 public class MongoAdmin implements MongoAdminOperations {
 
-	private final MongoClient mongoClient;
+	private final Mongo mongo;
+	private String username;
+	private String password;
+	private String authenticationDatabaseName;
 
-	public MongoAdmin(MongoClient mongoClient) {
-
-		Assert.notNull(mongoClient, "MongoClient must not be null!");
-		this.mongoClient = mongoClient;
+	public MongoAdmin(Mongo mongo) {
+		Assert.notNull(mongo);
+		this.mongo = mongo;
 	}
 
 	/* (non-Javadoc)
@@ -46,7 +47,7 @@ public class MongoAdmin implements MongoAdminOperations {
 	  */
 	@ManagedOperation
 	public void dropDatabase(String databaseName) {
-		getDB(databaseName).drop();
+		getDB(databaseName).dropDatabase();
 	}
 
 	/* (non-Javadoc)
@@ -62,16 +63,37 @@ public class MongoAdmin implements MongoAdminOperations {
 	  */
 	@ManagedOperation
 	public String getDatabaseStats(String databaseName) {
-		return getDB(databaseName).runCommand(new Document("dbStats", 1).append("scale" , 1024)).toJson();
+		return getDB(databaseName).getStats().toString();
 	}
 
-	@ManagedOperation
-	public String getServerStatus() {
-		return getDB("admin").runCommand(new Document("serverStatus", 1).append("rangeDeleter", 1).append("repl", 1)).toJson();
+	/**
+	 * 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;
+	}
 
-	MongoDatabase getDB(String databaseName) {
-		return mongoClient.getDatabase(databaseName);
+	/**
+	 * Sets the authenticationDatabaseName to use to authenticate with the Mongo database.
+	 * 
+	 * @param authenticationDatabaseName The authenticationDatabaseName to use.
+	 */
+	public void setAuthenticationDatabaseName(String authenticationDatabaseName) {
+		this.authenticationDatabaseName = authenticationDatabaseName;
+	}
+
+	DB getDB(String databaseName) {
+		return MongoDbUtils.getDB(mongo, databaseName, new UserCredentials(username, password), authenticationDatabaseName);
 	}
 }

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

@@ -1,188 +0,0 @@
-/*
- * 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.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
- * @since 1.7
- */
-public class MongoClientFactoryBean extends AbstractFactoryBean<MongoClient> implements PersistenceExceptionTranslator {
-
-	private static final PersistenceExceptionTranslator DEFAULT_EXCEPTION_TRANSLATOR = new MongoExceptionTranslator();
-
-	private MongoClientOptions mongoClientOptions;
-	private String host;
-	private Integer port;
-	private List<ServerAddress> replicaSetSeeds;
-	private List<MongoCredential> credentials;
-
-	private PersistenceExceptionTranslator exceptionTranslator = DEFAULT_EXCEPTION_TRANSLATOR;
-
-	/**
-	 * Set the {@link MongoClientOptions} to be used when creating {@link MongoClient}.
-	 * 
-	 * @param mongoClientOptions
-	 */
-	public void setMongoClientOptions(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(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(ServerAddress[] replicaSetSeeds) {
-		this.replicaSetSeeds = filterNonNullElementsAsList(replicaSetSeeds);
-	}
-
-	/**
-	 * Configures the host to connect to.
-	 * 
-	 * @param host
-	 */
-	public void setHost(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(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)
-	 */
-	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();
-		}
-
-		if (credentials == null) {
-			credentials = Collections.emptyList();
-		}
-
-		return createMongoClient();
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.config.AbstractFactoryBean#destroyInstance(java.lang.Object)
-	 */
-	@Override
-	protected void destroyInstance(MongoClient instance) throws Exception {
-		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(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

@@ -1,311 +0,0 @@
-/*
- * 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 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 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 ReadPreference readPreference = DEFAULT_MONGO_OPTIONS.getReadPreference();
-	private DBDecoderFactory dbDecoderFactory = DEFAULT_MONGO_OPTIONS.getDbDecoderFactory();
-	private DBEncoderFactory dbEncoderFactory = DEFAULT_MONGO_OPTIONS.getDbEncoderFactory();
-	private WriteConcern writeConcern = DEFAULT_MONGO_OPTIONS.getWriteConcern();
-	private 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 SSLSocketFactory sslSocketFactory;
-
-	/**
-	 * Set the {@link MongoClient} description.
-	 *
-	 * @param description
-	 */
-	public void setDescription(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(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(WriteConcern writeConcern) {
-		this.writeConcern = writeConcern;
-	}
-
-	/**
-	 * @param socketFactory
-	 */
-	public void setSocketFactory(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(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()
-	 */
-	@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;
-	}
-}

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

@@ -0,0 +1,196 @@
+/*
+ * Copyright 2010-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.core;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.data.authentication.UserCredentials;
+import org.springframework.data.mongodb.CannotGetMongoDbConnectionException;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
+import org.springframework.util.Assert;
+
+import com.mongodb.DB;
+import com.mongodb.Mongo;
+
+/**
+ * Helper class featuring helper methods for internal MongoDb classes. Mainly intended for internal use within the
+ * framework.
+ * 
+ * @author Thomas Risberg
+ * @author Graeme Rocher
+ * @author Oliver Gierke
+ * @author Randy Watler
+ * @author Thomas Darimont
+ * @since 1.0
+ */
+public abstract class MongoDbUtils {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(MongoDbUtils.class);
+
+	/**
+	 * Private constructor to prevent instantiation.
+	 */
+	private MongoDbUtils() {
+
+	}
+
+	/**
+	 * Obtains a {@link DB} connection for the given {@link Mongo} instance and database name
+	 * 
+	 * @param mongo the {@link Mongo} instance, must not be {@literal null}.
+	 * @param databaseName the database name, must not be {@literal null} or empty.
+	 * @return the {@link DB} connection
+	 */
+	public static DB getDB(Mongo mongo, String databaseName) {
+		return doGetDB(mongo, databaseName, UserCredentials.NO_CREDENTIALS, true, databaseName);
+	}
+
+	/**
+	 * Obtains a {@link DB} connection for the given {@link Mongo} instance and database name
+	 * 
+	 * @param mongo the {@link Mongo} instance, must not be {@literal null}.
+	 * @param databaseName the database name, must not be {@literal null} or empty.
+	 * @param credentials the credentials to use, must not be {@literal null}.
+	 * @return the {@link DB} connection
+	 */
+	public static DB getDB(Mongo mongo, String databaseName, UserCredentials credentials) {
+		return getDB(mongo, databaseName, credentials, databaseName);
+	}
+
+	public static DB getDB(Mongo mongo, String databaseName, UserCredentials credentials,
+			String authenticationDatabaseName) {
+
+		Assert.notNull(mongo, "No Mongo instance specified!");
+		Assert.hasText(databaseName, "Database name must be given!");
+		Assert.notNull(credentials, "Credentials must not be null, use UserCredentials.NO_CREDENTIALS!");
+		Assert.hasText(authenticationDatabaseName, "Authentication database name must not be null or empty!");
+
+		return doGetDB(mongo, databaseName, credentials, true, authenticationDatabaseName);
+	}
+
+	private static DB doGetDB(Mongo mongo, String databaseName, UserCredentials credentials, boolean allowCreate,
+			String authenticationDatabaseName) {
+
+		DbHolder dbHolder = (DbHolder) TransactionSynchronizationManager.getResource(mongo);
+
+		// Do we have a populated holder and TX sync active?
+		if (dbHolder != null && !dbHolder.isEmpty() && TransactionSynchronizationManager.isSynchronizationActive()) {
+
+			DB db = dbHolder.getDB(databaseName);
+
+			// DB found but not yet synchronized
+			if (db != null && !dbHolder.isSynchronizedWithTransaction()) {
+
+				LOGGER.debug("Registering Spring transaction synchronization for existing MongoDB {}.", databaseName);
+
+				TransactionSynchronizationManager.registerSynchronization(new MongoSynchronization(dbHolder, mongo));
+				dbHolder.setSynchronizedWithTransaction(true);
+			}
+
+			if (db != null) {
+				return db;
+			}
+		}
+
+		// Lookup fresh database instance
+		LOGGER.debug("Getting Mongo Database name=[{}]", databaseName);
+
+		DB db = mongo.getDB(databaseName);
+		boolean credentialsGiven = credentials.hasUsername() && credentials.hasPassword();
+
+		DB authDb = databaseName.equals(authenticationDatabaseName) ? db : mongo.getDB(authenticationDatabaseName);
+
+		synchronized (authDb) {
+
+			if (credentialsGiven && !authDb.isAuthenticated()) {
+
+				String username = credentials.getUsername();
+				String password = credentials.hasPassword() ? credentials.getPassword() : null;
+
+				if (!authDb.authenticate(username, password == null ? null : password.toCharArray())) {
+					throw new CannotGetMongoDbConnectionException("Failed to authenticate to database [" + databaseName + "], "
+							+ credentials.toString(), databaseName, credentials);
+				}
+			}
+		}
+
+		// TX sync active, bind new database to thread
+		if (TransactionSynchronizationManager.isSynchronizationActive()) {
+
+			LOGGER.debug("Registering Spring transaction synchronization for MongoDB instance {}.", databaseName);
+
+			DbHolder holderToUse = dbHolder;
+
+			if (holderToUse == null) {
+				holderToUse = new DbHolder(databaseName, db);
+			} else {
+				holderToUse.addDB(databaseName, db);
+			}
+
+			// synchronize holder only if not yet synchronized
+			if (!holderToUse.isSynchronizedWithTransaction()) {
+				TransactionSynchronizationManager.registerSynchronization(new MongoSynchronization(holderToUse, mongo));
+				holderToUse.setSynchronizedWithTransaction(true);
+			}
+
+			if (holderToUse != dbHolder) {
+				TransactionSynchronizationManager.bindResource(mongo, holderToUse);
+			}
+		}
+
+		// Check whether we are allowed to return the DB.
+		if (!allowCreate && !isDBTransactional(db, mongo)) {
+			throw new IllegalStateException("No Mongo DB bound to thread, "
+					+ "and configuration does not allow creation of non-transactional one here");
+		}
+
+		return db;
+	}
+
+	/**
+	 * Return whether the given DB instance is transactional, that is, bound to the current thread by Spring's transaction
+	 * facilities.
+	 * 
+	 * @param db the DB to check
+	 * @param mongo the Mongo instance that the DB was created with (may be <code>null</code>)
+	 * @return whether the DB is transactional
+	 */
+	public static boolean isDBTransactional(DB db, Mongo mongo) {
+
+		if (mongo == null) {
+			return false;
+		}
+		DbHolder dbHolder = (DbHolder) TransactionSynchronizationManager.getResource(mongo);
+		return dbHolder != null && dbHolder.containsDB(db);
+	}
+
+	/**
+	 * Perform actual closing of the Mongo DB object, catching and logging any cleanup exceptions thrown.
+	 * 
+	 * @param db the DB to close (may be <code>null</code>)
+	 */
+	public static void closeDB(DB db) {
+
+		if (db != null) {
+			LOGGER.debug("Closing Mongo DB object");
+			try {
+				db.requestDone();
+			} catch (Throwable ex) {
+				LOGGER.debug("Unexpected exception on closing Mongo DB object", ex);
+			}
+		}
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2016 the original author or authors.
+ * Copyright 2010-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.
@@ -15,29 +15,23 @@
  */
 package org.springframework.data.mongodb.core;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.bson.BsonInvalidOperationException;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataAccessResourceFailureException;
-import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.dao.InvalidDataAccessResourceUsageException;
-import org.springframework.dao.PermissionDeniedDataAccessException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
-import org.springframework.data.mongodb.BulkOperationException;
 import org.springframework.data.mongodb.UncategorizedMongoDbException;
-import org.springframework.data.mongodb.util.MongoDbErrorCodes;
-import org.springframework.util.ClassUtils;
 
-import com.mongodb.BulkWriteException;
-import com.mongodb.MongoBulkWriteException;
+import com.mongodb.MongoCursorNotFoundException;
 import com.mongodb.MongoException;
-import com.mongodb.MongoServerException;
-import com.mongodb.bulk.BulkWriteError;
+import com.mongodb.MongoException.CursorNotFound;
+import com.mongodb.MongoException.DuplicateKey;
+import com.mongodb.MongoException.Network;
+import com.mongodb.MongoInternalException;
+import com.mongodb.MongoServerSelectionException;
+import com.mongodb.MongoSocketException;
+import com.mongodb.MongoTimeoutException;
 
 /**
  * Simple {@link PersistenceExceptionTranslator} for Mongo. Convert the given runtime exception to an appropriate
@@ -46,23 +40,9 @@ import com.mongodb.bulk.BulkWriteError;
  * 
  * @author Oliver Gierke
  * @author Michal Vich
- * @author Christoph Strobl
  */
 public class MongoExceptionTranslator implements PersistenceExceptionTranslator {
 
-	private static final Set<String> DULICATE_KEY_EXCEPTIONS = new HashSet<String>(
-			Arrays.asList("MongoException.DuplicateKey", "DuplicateKeyException"));
-
-	private static final Set<String> RESOURCE_FAILURE_EXCEPTIONS = new HashSet<String>(
-			Arrays.asList("MongoException.Network", "MongoSocketException", "MongoException.CursorNotFound",
-					"MongoCursorNotFoundException", "MongoServerSelectionException", "MongoTimeoutException"));
-
-	private static final Set<String> RESOURCE_USAGE_EXCEPTIONS = new HashSet<String>(
-			Arrays.asList("MongoInternalException"));
-
-	private static final Set<String> DATA_INTEGRETY_EXCEPTIONS = new HashSet<String>(
-			Arrays.asList("WriteConcernException", "MongoWriteException", "MongoBulkWriteException"));
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.dao.support.PersistenceExceptionTranslator#translateExceptionIfPossible(java.lang.RuntimeException)
@@ -71,60 +51,41 @@ public class MongoExceptionTranslator implements PersistenceExceptionTranslator
 
 		// Check for well-known MongoException subclasses.
 
-		if (ex instanceof BsonInvalidOperationException) {
-			throw new InvalidDataAccessApiUsageException(ex.getMessage(), ex);
-		}
-
-		String exception = ClassUtils.getShortName(ClassUtils.getUserClass(ex.getClass()));
-
-		if (DULICATE_KEY_EXCEPTIONS.contains(exception)) {
+		if (ex instanceof DuplicateKey || ex instanceof DuplicateKeyException) {
 			return new DuplicateKeyException(ex.getMessage(), ex);
 		}
 
-		if (RESOURCE_FAILURE_EXCEPTIONS.contains(exception)) {
+		if (ex instanceof Network || ex instanceof MongoSocketException) {
 			return new DataAccessResourceFailureException(ex.getMessage(), ex);
 		}
 
-		if (RESOURCE_USAGE_EXCEPTIONS.contains(exception)) {
+		if (ex instanceof CursorNotFound || ex instanceof MongoCursorNotFoundException) {
+			return new DataAccessResourceFailureException(ex.getMessage(), ex);
+		}
+
+		if (ex instanceof MongoServerSelectionException) {
+			return new DataAccessResourceFailureException(ex.getMessage(), ex);
+		}
+
+		if (ex instanceof MongoTimeoutException) {
+			return new DataAccessResourceFailureException(ex.getMessage(), ex);
+		}
+
+		if (ex instanceof MongoInternalException) {
 			return new InvalidDataAccessResourceUsageException(ex.getMessage(), ex);
 		}
 
-		if (DATA_INTEGRETY_EXCEPTIONS.contains(exception)) {
-
-			if (ex instanceof MongoServerException) {
-				if (((MongoServerException) ex).getCode() == 11000) {
-					return new DuplicateKeyException(ex.getMessage(), ex);
-				}
-				if (ex instanceof MongoBulkWriteException) {
-					for (BulkWriteError x : ((MongoBulkWriteException) ex).getWriteErrors()) {
-						if (x.getCode() == 11000) {
-							return new DuplicateKeyException(ex.getMessage(), ex);
-						}
-					}
-				}
-			}
-
-			return new DataIntegrityViolationException(ex.getMessage(), ex);
-		}
-
-		if (ex instanceof BulkWriteException) {
-			return new BulkOperationException(ex.getMessage(), (BulkWriteException) ex);
-		}
-
 		// All other MongoExceptions
 		if (ex instanceof MongoException) {
 
 			int code = ((MongoException) ex).getCode();
 
-			if (MongoDbErrorCodes.isDuplicateKeyCode(code)) {
+			if (code == 11000 || code == 11001) {
 				throw new DuplicateKeyException(ex.getMessage(), ex);
-			} else if (MongoDbErrorCodes.isDataAccessResourceFailureCode(code)) {
+			} else if (code == 12000 || code == 13440) {
 				throw new DataAccessResourceFailureException(ex.getMessage(), ex);
-			} else if (MongoDbErrorCodes.isInvalidDataAccessApiUsageCode(code) || code == 10003 || code == 12001
-					|| code == 12010 || code == 12011 || code == 12012) {
+			} else if (code == 10003 || code == 12001 || code == 12010 || code == 12011 || code == 12012) {
 				throw new InvalidDataAccessApiUsageException(ex.getMessage(), ex);
-			} else if (MongoDbErrorCodes.isPermissionDeniedCode(code)) {
-				throw new PermissionDeniedDataAccessException(ex.getMessage(), ex);
 			}
 			return new UncategorizedMongoDbException(ex.getMessage(), ex);
 		}

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

@@ -0,0 +1,192 @@
+/*
+ * Copyright 2010-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.core;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.dao.DataAccessException;
+import org.springframework.dao.support.PersistenceExceptionTranslator;
+import org.springframework.data.mongodb.CannotGetMongoDbConnectionException;
+import org.springframework.util.StringUtils;
+
+import com.mongodb.Mongo;
+import com.mongodb.MongoOptions;
+import com.mongodb.ServerAddress;
+import com.mongodb.WriteConcern;
+
+/**
+ * Convenient factory for configuring MongoDB.
+ * 
+ * @author Thomas Risberg
+ * @author Graeme Rocher
+ * @author Oliver Gierke
+ * @author Thomas Darimont
+ * @since 1.0
+ */
+public class MongoFactoryBean implements FactoryBean<Mongo>, InitializingBean, DisposableBean,
+		PersistenceExceptionTranslator {
+
+	private Mongo mongo;
+
+	private MongoOptions mongoOptions;
+	private String host;
+	private Integer port;
+	private WriteConcern writeConcern;
+	private List<ServerAddress> replicaSetSeeds;
+	private List<ServerAddress> replicaPair;
+
+	private PersistenceExceptionTranslator exceptionTranslator = new MongoExceptionTranslator();
+
+	public void setMongoOptions(MongoOptions mongoOptions) {
+		this.mongoOptions = mongoOptions;
+	}
+
+	public void setReplicaSetSeeds(ServerAddress[] replicaSetSeeds) {
+		this.replicaSetSeeds = filterNonNullElementsAsList(replicaSetSeeds);
+	}
+
+	/**
+	 * @deprecated use {@link #setReplicaSetSeeds(ServerAddress[])} instead
+	 * 
+	 * @param replicaPair
+	 */
+	@Deprecated
+	public void setReplicaPair(ServerAddress[] replicaPair) {
+		this.replicaPair = filterNonNullElementsAsList(replicaPair);
+	}
+
+	/**
+	 * @param elements the elements to filter <T>
+	 * @return a new unmodifiable {@link List#} from the given elements without nulls
+	 */
+	private <T> List<T> filterNonNullElementsAsList(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);
+	}
+
+	public void setHost(String host) {
+		this.host = host;
+	}
+
+	public void setPort(int port) {
+		this.port = port;
+	}
+
+	/**
+	 * Sets the {@link WriteConcern} to be configured for the {@link Mongo} instance to be created.
+	 * 
+	 * @param writeConcern
+	 */
+	public void setWriteConcern(WriteConcern writeConcern) {
+		this.writeConcern = writeConcern;
+	}
+
+	public void setExceptionTranslator(PersistenceExceptionTranslator exceptionTranslator) {
+		this.exceptionTranslator = exceptionTranslator;
+	}
+
+	public Mongo getObject() throws Exception {
+		return mongo;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.FactoryBean#getObjectType()
+	 */
+	public Class<? extends Mongo> getObjectType() {
+		return Mongo.class;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.FactoryBean#isSingleton()
+	 */
+	public boolean isSingleton() {
+		return true;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.dao.support.PersistenceExceptionTranslator#translateExceptionIfPossible(java.lang.RuntimeException)
+	 */
+	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
+		return exceptionTranslator.translateExceptionIfPossible(ex);
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
+	 */
+	@SuppressWarnings("deprecation")
+	public void afterPropertiesSet() throws Exception {
+
+		Mongo mongo;
+		ServerAddress defaultOptions = new ServerAddress();
+
+		if (mongoOptions == null) {
+			mongoOptions = new MongoOptions();
+		}
+
+		if (!isNullOrEmpty(replicaPair)) {
+			if (replicaPair.size() < 2) {
+				throw new CannotGetMongoDbConnectionException("A replica pair must have two server entries");
+			}
+			mongo = new Mongo(replicaPair.get(0), replicaPair.get(1), mongoOptions);
+		} else if (!isNullOrEmpty(replicaSetSeeds)) {
+			mongo = new Mongo(replicaSetSeeds, mongoOptions);
+		} else {
+			String mongoHost = StringUtils.hasText(host) ? host : defaultOptions.getHost();
+			mongo = port != null ? new Mongo(new ServerAddress(mongoHost, port), mongoOptions) : new Mongo(mongoHost,
+					mongoOptions);
+		}
+
+		if (writeConcern != null) {
+			mongo.setWriteConcern(writeConcern);
+		}
+
+		this.mongo = mongo;
+	}
+
+	private boolean isNullOrEmpty(Collection<?> elements) {
+		return elements == null || elements.isEmpty();
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.DisposableBean#destroy()
+	 */
+	public void destroy() throws Exception {
+		this.mongo.close();
+	}
+}

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

@@ -1,6 +1,6 @@
 /*
- * Copyright 2011-2017 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.
  * You may obtain a copy of the License at
@@ -19,14 +19,11 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 
-import org.bson.Document;
-import org.springframework.data.geo.GeoResults;
-import org.springframework.data.mongodb.core.BulkOperations.BulkMode;
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
-import org.springframework.data.mongodb.core.aggregation.AggregationOptions;
 import org.springframework.data.mongodb.core.aggregation.AggregationResults;
 import org.springframework.data.mongodb.core.aggregation.TypedAggregation;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.data.mongodb.core.geo.GeoResults;
 import org.springframework.data.mongodb.core.mapreduce.GroupBy;
 import org.springframework.data.mongodb.core.mapreduce.GroupByResults;
 import org.springframework.data.mongodb.core.mapreduce.MapReduceOptions;
@@ -36,19 +33,17 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
-import org.springframework.data.util.CloseableIterator;
 
-import com.mongodb.Cursor;
-import com.mongodb.ReadPreference;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.result.DeleteResult;
-import com.mongodb.client.result.UpdateResult;
+import com.mongodb.CommandResult;
+import com.mongodb.DBCollection;
+import com.mongodb.DBObject;
+import com.mongodb.WriteResult;
 
 /**
  * Interface that specifies a basic set of MongoDB operations. Implemented by {@link MongoTemplate}. Not often used but
  * a useful option for extensibility and testability (as it can be easily mocked, stubbed, or be the target of a JDK
  * proxy).
- *
+ * 
  * @author Thomas Risberg
  * @author Mark Pollack
  * @author Oliver Gierke
@@ -56,13 +51,13 @@ import com.mongodb.client.result.UpdateResult;
  * @author Chuong Ngo
  * @author Christoph Strobl
  * @author Thomas Darimont
- * @author Maninder Singh
  */
+@SuppressWarnings("deprecation")
 public interface MongoOperations {
 
 	/**
 	 * The collection name used for the specified class by this template.
-	 *
+	 * 
 	 * @param entityClass must not be {@literal null}.
 	 * @return
 	 */
@@ -70,35 +65,33 @@ public interface MongoOperations {
 
 	/**
 	 * Execute the a MongoDB command expressed as a JSON string. This will call the method JSON.parse that is part of the
-	 * MongoDB driver to convert the JSON string to a Document. Any errors that result from executing this command will be
+	 * MongoDB driver to convert the JSON string to a DBObject. Any errors that result from executing this command will be
 	 * converted into Spring's DAO exception hierarchy.
-	 *
+	 * 
 	 * @param jsonCommand a MongoDB command expressed as a JSON string.
 	 */
-	Document executeCommand(String jsonCommand);
+	CommandResult executeCommand(String jsonCommand);
 
 	/**
 	 * Execute a MongoDB command. Any errors that result from executing this command will be converted into Spring's DAO
 	 * exception hierarchy.
-	 *
+	 * 
 	 * @param command a MongoDB command
 	 */
-	Document executeCommand(Document command);
+	CommandResult executeCommand(DBObject command);
 
 	/**
-	 * Execute a MongoDB command. Any errors that result from executing this command will be converted into Spring's data
-	 * access exception hierarchy.
-	 *
-	 * @param command a MongoDB command, must not be {@literal null}.
-	 * @param readPreference read preferences to use, can be {@literal null}.
-	 * @return
-	 * @since 1.7
+	 * Execute a MongoDB command. Any errors that result from executing this command will be converted into Spring's DAO
+	 * exception hierarchy.
+	 * 
+	 * @param command a MongoDB command
+	 * @param options query options to use
 	 */
-	Document executeCommand(Document command, ReadPreference readPreference);
+	CommandResult executeCommand(DBObject command, int options);
 
 	/**
 	 * Execute a MongoDB query and iterate over the query results on a per-document basis with a DocumentCallbackHandler.
-	 *
+	 * 
 	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
 	 *          specification
 	 * @param collectionName name of the collection to retrieve the objects from
@@ -110,7 +103,7 @@ public interface MongoOperations {
 	 * Executes a {@link DbCallback} translating any exceptions as necessary.
 	 * <p/>
 	 * Allows for returning a result object, that is a domain object or a collection of domain objects.
-	 *
+	 * 
 	 * @param <T> return type
 	 * @param action callback object that specifies the MongoDB actions to perform on the passed in DB instance.
 	 * @return a result object returned by the action or <tt>null</tt>
@@ -121,7 +114,7 @@ public interface MongoOperations {
 	 * Executes the given {@link CollectionCallback} on the entity collection of the specified class.
 	 * <p/>
 	 * Allows for returning a result object, that is a domain object or a collection of domain objects.
-	 *
+	 * 
 	 * @param entityClass class that determines the collection to use
 	 * @param <T> return type
 	 * @param action callback object that specifies the MongoDB action
@@ -133,7 +126,7 @@ public interface MongoOperations {
 	 * Executes the given {@link CollectionCallback} on the collection of the given name.
 	 * <p/>
 	 * Allows for returning a result object, that is a domain object or a collection of domain objects.
-	 *
+	 * 
 	 * @param <T> return type
 	 * @param collectionName the name of the collection that specifies which DBCollection instance will be passed into
 	 * @param action callback object that specifies the MongoDB action the callback action.
@@ -142,71 +135,55 @@ public interface MongoOperations {
 	<T> T execute(String collectionName, CollectionCallback<T> action);
 
 	/**
-	 * Executes the given {@link Query} on the entity collection of the specified {@code entityType} backed by a Mongo DB
-	 * {@link Cursor}.
-	 * <p>
-	 * Returns a {@link CloseableIterator} that wraps the a Mongo DB {@link Cursor} that needs to be closed.
-	 *
-	 * @param <T> element return type
-	 * @param query must not be {@literal null}.
-	 * @param entityType must not be {@literal null}.
-	 * @return will never be {@literal null}.
-	 * @since 1.7
+	 * Executes the given {@link DbCallback} within the same connection to the database so as to ensure consistency in a
+	 * write heavy environment where you may read the data that you wrote. See the comments on {@see <a
+	 * href=http://www.mongodb.org/display/DOCS/Java+Driver+Concurrency>Java Driver Concurrency</a>}
+	 * <p/>
+	 * Allows for returning a result object, that is a domain object or a collection of domain objects.
+	 * 
+	 * @param <T> return type
+	 * @param action callback that specified the MongoDB actions to perform on the DB instance
+	 * @return a result object returned by the action or <tt>null</tt>
 	 */
-	<T> CloseableIterator<T> stream(Query query, Class<T> entityType);
-
-	/**
-	 * Executes the given {@link Query} on the entity collection of the specified {@code entityType} and collection backed
-	 * by a Mongo DB {@link Cursor}.
-	 * <p>
-	 * Returns a {@link CloseableIterator} that wraps the a Mongo DB {@link Cursor} that needs to be closed.
-	 *
-	 * @param <T> element return type
-	 * @param query must not be {@literal null}.
-	 * @param entityType must not be {@literal null}.
-	 * @param collectionName must not be {@literal null} or empty.
-	 * @return will never be {@literal null}.
-	 * @since 1.10
-	 */
-	<T> CloseableIterator<T> stream(Query query, Class<T> entityType, String collectionName);
+	<T> T executeInSession(DbCallback<T> action);
 
 	/**
 	 * Create an uncapped collection with a name based on the provided entity class.
-	 *
+	 * 
 	 * @param entityClass class that determines the collection to create
 	 * @return the created collection
 	 */
-	<T> MongoCollection<Document> createCollection(Class<T> entityClass);
+	<T> DBCollection createCollection(Class<T> entityClass);
 
 	/**
-	 * Create a collection with a name based on the provided entity class using the options.
-	 *
+	 * Create a collect with a name based on the provided entity class using the options.
+	 * 
 	 * @param entityClass class that determines the collection to create
 	 * @param collectionOptions options to use when creating the collection.
 	 * @return the created collection
 	 */
-	<T> MongoCollection<Document> createCollection(Class<T> entityClass, CollectionOptions collectionOptions);
+	<T> DBCollection createCollection(Class<T> entityClass, CollectionOptions collectionOptions);
 
 	/**
 	 * Create an uncapped collection with the provided name.
-	 *
+	 * 
 	 * @param collectionName name of the collection
 	 * @return the created collection
 	 */
-	MongoCollection<Document> createCollection(String collectionName);
+	DBCollection createCollection(String collectionName);
 
 	/**
-	 * Create a collection with the provided name and options.
-	 *
+	 * Create a collect with the provided name and options.
+	 * 
 	 * @param collectionName name of the collection
 	 * @param collectionOptions options to use when creating the collection.
 	 * @return the created collection
 	 */
-	MongoCollection<Document> createCollection(String collectionName, CollectionOptions collectionOptions);
+	DBCollection createCollection(String collectionName, CollectionOptions collectionOptions);
 
 	/**
 	 * A set of collection names.
-	 *
+	 * 
 	 * @return list of collection names
 	 */
 	Set<String> getCollectionNames();
@@ -215,17 +192,17 @@ public interface MongoOperations {
 	 * Get a collection by name, creating it if it doesn't exist.
 	 * <p/>
 	 * Translate any exceptions as necessary.
-	 *
+	 * 
 	 * @param collectionName name of the collection
 	 * @return an existing collection or a newly created one.
 	 */
-	MongoCollection<Document> getCollection(String collectionName);
+	DBCollection getCollection(String collectionName);
 
 	/**
 	 * Check to see if a collection with a name indicated by the entity class exists.
 	 * <p/>
 	 * Translate any exceptions as necessary.
-	 *
+	 * 
 	 * @param entityClass class that determines the name of the collection
 	 * @return true if a collection with the given name is found, false otherwise.
 	 */
@@ -235,7 +212,7 @@ public interface MongoOperations {
 	 * Check to see if a collection with a given name exists.
 	 * <p/>
 	 * Translate any exceptions as necessary.
-	 *
+	 * 
 	 * @param collectionName name of the collection
 	 * @return true if a collection with the given name is found, false otherwise.
 	 */
@@ -245,7 +222,7 @@ public interface MongoOperations {
 	 * Drop the collection with the name indicated by the entity class.
 	 * <p/>
 	 * Translate any exceptions as necessary.
-	 *
+	 * 
 	 * @param entityClass class that determines the collection to drop/delete.
 	 */
 	<T> void dropCollection(Class<T> entityClass);
@@ -254,61 +231,25 @@ public interface MongoOperations {
 	 * Drop the collection with the given name.
 	 * <p/>
 	 * Translate any exceptions as necessary.
-	 *
+	 * 
 	 * @param collectionName name of the collection to drop/delete.
 	 */
 	void dropCollection(String collectionName);
 
 	/**
 	 * Returns the operations that can be performed on indexes
-	 *
+	 * 
 	 * @return index operations on the named collection
 	 */
 	IndexOperations indexOps(String collectionName);
 
 	/**
 	 * Returns the operations that can be performed on indexes
-	 *
+	 * 
 	 * @return index operations on the named collection associated with the given entity class
 	 */
 	IndexOperations indexOps(Class<?> entityClass);
 
-	/**
-	 * Returns the {@link ScriptOperations} that can be performed on {@link com.mongodb.DB} level.
-	 *
-	 * @return
-	 * @since 1.7
-	 */
-	ScriptOperations scriptOps();
-
-	/**
-	 * Returns a new {@link BulkOperations} for the given collection.
-	 *
-	 * @param mode the {@link BulkMode} to use for bulk operations, must not be {@literal null}.
-	 * @param collectionName the name of the collection to work on, must not be {@literal null} or empty.
-	 * @return {@link BulkOperations} on the named collection
-	 */
-	BulkOperations bulkOps(BulkMode mode, String collectionName);
-
-	/**
-	 * Returns a new {@link BulkOperations} for the given entity type.
-	 *
-	 * @param mode the {@link BulkMode} to use for bulk operations, must not be {@literal null}.
-	 * @param entityType the name of the entity class, must not be {@literal null}.
-	 * @return {@link BulkOperations} on the named collection associated of the given entity class.
-	 */
-	BulkOperations bulkOps(BulkMode mode, Class<?> entityType);
-
-	/**
-	 * Returns a new {@link BulkOperations} for the given entity type and collection name.
-	 *
-	 * @param mode the {@link BulkMode} to use for bulk operations, must not be {@literal null}.
-	 * @param entityClass the name of the entity class, must not be {@literal null}.
-	 * @param collectionName the name of the collection to work on, must not be {@literal null} or empty.
-	 * @return {@link BulkOperations} on the named collection associated with the given entity class.
-	 */
-	BulkOperations bulkOps(BulkMode mode, Class<?> entityType, String collectionName);
-
 	/**
 	 * Query for a list of objects of type T from the collection used by the entity class.
 	 * <p/>
@@ -317,7 +258,7 @@ public interface MongoOperations {
 	 * <p/>
 	 * If your collection does not contain a homogeneous collection of types, this operation will not be an efficient way
 	 * to map objects since the test for class type is done in the client and not on the server.
-	 *
+	 * 
 	 * @param entityClass the parameterized type of the returned list
 	 * @return the converted collection
 	 */
@@ -331,7 +272,7 @@ public interface MongoOperations {
 	 * <p/>
 	 * If your collection does not contain a homogeneous collection of types, this operation will not be an efficient way
 	 * to map objects since the test for class type is done in the client and not on the server.
-	 *
+	 * 
 	 * @param entityClass the parameterized type of the returned list.
 	 * @param collectionName name of the collection to retrieve the objects from
 	 * @return the converted collection
@@ -341,7 +282,7 @@ public interface MongoOperations {
 	/**
 	 * Execute a group operation over the entire collection. The group operation entity class should match the 'shape' of
 	 * the returned object that takes int account the initial document structure as well as any finalize functions.
-	 *
+	 * 
 	 * @param criteria The criteria that restricts the row that are considered for grouping. If not specified all rows are
 	 *          considered.
 	 * @param inputCollectionName the collection where the group operation will read from
@@ -356,7 +297,7 @@ public interface MongoOperations {
 	 * Execute a group operation restricting the rows to those which match the provided Criteria. The group operation
 	 * entity class should match the 'shape' of the returned object that takes int account the initial document structure
 	 * as well as any finalize functions.
-	 *
+	 * 
 	 * @param criteria The criteria that restricts the row that are considered for grouping. If not specified all rows are
 	 *          considered.
 	 * @param inputCollectionName the collection where the group operation will read from
@@ -370,7 +311,7 @@ public interface MongoOperations {
 	/**
 	 * Execute an aggregation operation. The raw results will be mapped to the given entity class. The name of the
 	 * inputCollection is derived from the inputType of the aggregation.
-	 *
+	 * 
 	 * @param aggregation The {@link TypedAggregation} specification holding the aggregation operations, must not be
 	 *          {@literal null}.
 	 * @param collectionName The name of the input collection to use for the aggreation.
@@ -383,7 +324,7 @@ public interface MongoOperations {
 	/**
 	 * Execute an aggregation operation. The raw results will be mapped to the given entity class. The name of the
 	 * inputCollection is derived from the inputType of the aggregation.
-	 *
+	 * 
 	 * @param aggregation The {@link TypedAggregation} specification holding the aggregation operations, must not be
 	 *          {@literal null}.
 	 * @param outputType The parameterized type of the returned list, must not be {@literal null}.
@@ -394,7 +335,7 @@ public interface MongoOperations {
 
 	/**
 	 * Execute an aggregation operation. The raw results will be mapped to the given entity class.
-	 *
+	 * 
 	 * @param aggregation The {@link Aggregation} specification holding the aggregation operations, must not be
 	 *          {@literal null}.
 	 * @param inputType the inputType where the aggregation operation will read from, must not be {@literal null} or
@@ -407,7 +348,7 @@ public interface MongoOperations {
 
 	/**
 	 * Execute an aggregation operation. The raw results will be mapped to the given entity class.
-	 *
+	 * 
 	 * @param aggregation The {@link Aggregation} specification holding the aggregation operations, must not be
 	 *          {@literal null}.
 	 * @param collectionName the collection where the aggregation operation will read from, must not be {@literal null} or
@@ -418,84 +359,9 @@ public interface MongoOperations {
 	 */
 	<O> AggregationResults<O> aggregate(Aggregation aggregation, String collectionName, Class<O> outputType);
 
-	/**
-	 * Execute an aggregation operation backed by a Mongo DB {@link Cursor}.
-	 * <p>
-	 * Returns a {@link CloseableIterator} that wraps the a Mongo DB {@link Cursor} that needs to be closed. The raw
-	 * results will be mapped to the given entity class. The name of the inputCollection is derived from the inputType of
-	 * the aggregation.
-	 * <p>
-	 * Aggregation streaming can't be used with {@link AggregationOptions#isExplain() aggregation explain}. Enabling
-	 * explanation mode will throw an {@link IllegalArgumentException}.
-	 *
-	 * @param aggregation The {@link TypedAggregation} specification holding the aggregation operations, must not be
-	 *          {@literal null}.
-	 * @param collectionName The name of the input collection to use for the aggreation.
-	 * @param outputType The parameterized type of the returned list, must not be {@literal null}.
-	 * @return The results of the aggregation operation.
-	 * @since 2.0
-	 */
-	<O> CloseableIterator<O> aggregateStream(TypedAggregation<?> aggregation, String collectionName, Class<O> outputType);
-
-	/**
-	 * Execute an aggregation operation backed by a Mongo DB {@link Cursor}.
-	 * <p/>
-	 * Returns a {@link CloseableIterator} that wraps the a Mongo DB {@link Cursor} that needs to be closed. The raw
-	 * results will be mapped to the given entity class and are returned as stream. The name of the inputCollection is
-	 * derived from the inputType of the aggregation.
-	 * <p/>
-	 * Aggregation streaming can't be used with {@link AggregationOptions#isExplain() aggregation explain}. Enabling
-	 * explanation mode will throw an {@link IllegalArgumentException}.
-	 *
-	 * @param aggregation The {@link TypedAggregation} specification holding the aggregation operations, must not be
-	 *          {@literal null}.
-	 * @param outputType The parameterized type of the returned list, must not be {@literal null}.
-	 * @return The results of the aggregation operation.
-	 * @since 2.0
-	 */
-	<O> CloseableIterator<O> aggregateStream(TypedAggregation<?> aggregation, Class<O> outputType);
-
-	/**
-	 * Execute an aggregation operation backed by a Mongo DB {@link Cursor}.
-	 * <p/>
-	 * Returns a {@link CloseableIterator} that wraps the a Mongo DB {@link Cursor} that needs to be closed. The raw
-	 * results will be mapped to the given entity class.
-	 * <p/>
-	 * Aggregation streaming can't be used with {@link AggregationOptions#isExplain() aggregation explain}. Enabling
-	 * explanation mode will throw an {@link IllegalArgumentException}.
-	 *
-	 * @param aggregation The {@link Aggregation} specification holding the aggregation operations, must not be
-	 *          {@literal null}.
-	 * @param inputType the inputType where the aggregation operation will read from, must not be {@literal null} or
-	 *          empty.
-	 * @param outputType The parameterized type of the returned list, must not be {@literal null}.
-	 * @return The results of the aggregation operation.
-	 * @since 2.0
-	 */
-	<O> CloseableIterator<O> aggregateStream(Aggregation aggregation, Class<?> inputType, Class<O> outputType);
-
-	/**
-	 * Execute an aggregation operation backed by a Mongo DB {@link Cursor}.
-	 * <p/>
-	 * Returns a {@link CloseableIterator} that wraps the a Mongo DB {@link Cursor} that needs to be closed. The raw
-	 * results will be mapped to the given entity class.
-	 * <p/>
-	 * Aggregation streaming can't be used with {@link AggregationOptions#isExplain() aggregation explain}. Enabling
-	 * explanation mode will throw an {@link IllegalArgumentException}.
-	 *
-	 * @param aggregation The {@link Aggregation} specification holding the aggregation operations, must not be
-	 *          {@literal null}.
-	 * @param collectionName the collection where the aggregation operation will read from, must not be {@literal null} or
-	 *          empty.
-	 * @param outputType The parameterized type of the returned list, must not be {@literal null}.
-	 * @return The results of the aggregation operation.
-	 * @since 2.0
-	 */
-	<O> CloseableIterator<O> aggregateStream(Aggregation aggregation, String collectionName, Class<O> outputType);
-
 	/**
 	 * Execute a map-reduce operation. The map-reduce operation will be formed with an output type of INLINE
-	 *
+	 * 
 	 * @param inputCollectionName the collection where the map-reduce will read from
 	 * @param mapFunction The JavaScript map function
 	 * @param reduceFunction The JavaScript reduce function
@@ -508,7 +374,7 @@ public interface MongoOperations {
 
 	/**
 	 * Execute a map-reduce operation that takes additional map-reduce options.
-	 *
+	 * 
 	 * @param inputCollectionName the collection where the map-reduce will read from
 	 * @param mapFunction The JavaScript map function
 	 * @param reduceFunction The JavaScript reduce function
@@ -522,7 +388,7 @@ public interface MongoOperations {
 	/**
 	 * Execute a map-reduce operation that takes a query. The map-reduce operation will be formed with an output type of
 	 * INLINE
-	 *
+	 * 
 	 * @param query The query to use to select the data for the map phase
 	 * @param inputCollectionName the collection where the map-reduce will read from
 	 * @param mapFunction The JavaScript map function
@@ -536,7 +402,7 @@ public interface MongoOperations {
 
 	/**
 	 * Execute a map-reduce operation that takes a query and additional map-reduce options
-	 *
+	 * 
 	 * @param query The query to use to select the data for the map phase
 	 * @param inputCollectionName the collection where the map-reduce will read from
 	 * @param mapFunction The JavaScript map function
@@ -553,7 +419,7 @@ public interface MongoOperations {
 	 * information to determine the collection the query is ran against. Note, that MongoDB limits the number of results
 	 * by default. Make sure to add an explicit limit to the {@link NearQuery} if you expect a particular number of
 	 * results.
-	 *
+	 * 
 	 * @param near must not be {@literal null}.
 	 * @param entityClass must not be {@literal null}.
 	 * @return
@@ -564,7 +430,7 @@ public interface MongoOperations {
 	 * Returns {@link GeoResults} for all entities matching the given {@link NearQuery}. Note, that MongoDB limits the
 	 * number of results by default. Make sure to add an explicit limit to the {@link NearQuery} if you expect a
 	 * particular number of results.
-	 *
+	 * 
 	 * @param near must not be {@literal null}.
 	 * @param entityClass must not be {@literal null}.
 	 * @param collectionName the collection to trigger the query against. If no collection name is given the entity class
@@ -582,7 +448,7 @@ public interface MongoOperations {
 	 * <p/>
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
-	 *
+	 * 
 	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
 	 *          specification
 	 * @param entityClass the parameterized type of the returned list.
@@ -599,7 +465,7 @@ public interface MongoOperations {
 	 * <p/>
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
-	 *
+	 * 
 	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
 	 *          specification
 	 * @param entityClass the parameterized type of the returned list.
@@ -610,7 +476,7 @@ public interface MongoOperations {
 
 	/**
 	 * Determine result of given {@link Query} contains at least one element.
-	 *
+	 * 
 	 * @param query the {@link Query} class that specifies the criteria used to find a record.
 	 * @param collectionName name of the collection to check for objects.
 	 * @return
@@ -619,7 +485,7 @@ public interface MongoOperations {
 
 	/**
 	 * Determine result of given {@link Query} contains at least one element.
-	 *
+	 * 
 	 * @param query the {@link Query} class that specifies the criteria used to find a record.
 	 * @param entityClass the parameterized type.
 	 * @return
@@ -628,7 +494,7 @@ public interface MongoOperations {
 
 	/**
 	 * Determine result of given {@link Query} contains at least one element.
-	 *
+	 * 
 	 * @param query the {@link Query} class that specifies the criteria used to find a record.
 	 * @param entityClass the parameterized type.
 	 * @param collectionName name of the collection to check for objects.
@@ -644,7 +510,7 @@ public interface MongoOperations {
 	 * <p/>
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
-	 *
+	 * 
 	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
 	 *          specification
 	 * @param entityClass the parameterized type of the returned list.
@@ -660,7 +526,7 @@ public interface MongoOperations {
 	 * <p/>
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
-	 *
+	 * 
 	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
 	 *          specification
 	 * @param entityClass the parameterized type of the returned list.
@@ -672,7 +538,7 @@ public interface MongoOperations {
 	/**
 	 * Returns a document with the given id mapped onto the given class. The collection the query is ran against will be
 	 * derived from the given target class as well.
-	 *
+	 * 
 	 * @param <T>
 	 * @param id the id of the document to return.
 	 * @param entityClass the type the document shall be converted into.
@@ -682,7 +548,7 @@ public interface MongoOperations {
 
 	/**
 	 * Returns the document with the given id from the given collection mapped onto the given target class.
-	 *
+	 * 
 	 * @param id the id of the document to return
 	 * @param entityClass the type to convert the document to
 	 * @param collectionName the collection to query for the document
@@ -692,9 +558,9 @@ public interface MongoOperations {
 	<T> T findById(Object id, Class<T> entityClass, String collectionName);
 
 	/**
-	 * Triggers <a href="http://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify <a/>
+	 * Triggers <a href="http://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify<a/>
 	 * to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query}.
-	 *
+	 * 
 	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
 	 *          fields specification.
 	 * @param update the {@link Update} to apply on matching documents.
@@ -704,9 +570,9 @@ public interface MongoOperations {
 	<T> T findAndModify(Query query, Update update, Class<T> entityClass);
 
 	/**
-	 * Triggers <a href="http://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify <a/>
+	 * Triggers <a href="http://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify<a/>
 	 * to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query}.
-	 *
+	 * 
 	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
 	 *          fields specification.
 	 * @param update the {@link Update} to apply on matching documents.
@@ -717,10 +583,10 @@ public interface MongoOperations {
 	<T> T findAndModify(Query query, Update update, Class<T> entityClass, String collectionName);
 
 	/**
-	 * Triggers <a href="http://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify <a/>
+	 * Triggers <a href="http://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify<a/>
 	 * to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query} taking
 	 * {@link FindAndModifyOptions} into account.
-	 *
+	 * 
 	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
 	 *          fields specification.
 	 * @param update the {@link Update} to apply on matching documents.
@@ -731,10 +597,10 @@ public interface MongoOperations {
 	<T> T findAndModify(Query query, Update update, FindAndModifyOptions options, Class<T> entityClass);
 
 	/**
-	 * Triggers <a href="http://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify <a/>
+	 * Triggers <a href="http://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify<a/>
 	 * to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query} taking
 	 * {@link FindAndModifyOptions} into account.
-	 *
+	 * 
 	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
 	 *          fields specification.
 	 * @param update the {@link Update} to apply on matching documents.
@@ -755,7 +621,7 @@ public interface MongoOperations {
 	 * <p/>
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
-	 *
+	 * 
 	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
 	 *          specification
 	 * @param entityClass the parameterized type of the returned list.
@@ -772,7 +638,7 @@ public interface MongoOperations {
 	 * <p/>
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
-	 *
+	 * 
 	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
 	 *          specification
 	 * @param entityClass the parameterized type of the returned list.
@@ -783,7 +649,7 @@ public interface MongoOperations {
 
 	/**
 	 * Returns the number of documents for the given {@link Query} by querying the collection of the given entity class.
-	 *
+	 * 
 	 * @param query
 	 * @param entityClass must not be {@literal null}.
 	 * @return
@@ -791,27 +657,13 @@ public interface MongoOperations {
 	long count(Query query, Class<?> entityClass);
 
 	/**
-	 * Returns the number of documents for the given {@link Query} querying the given collection. The given {@link Query}
-	 * must solely consist of document field references as we lack type information to map potential property references
-	 * onto document fields. TO make sure the query gets mapped, use {@link #count(Query, Class, String)}.
-	 *
+	 * Returns the number of documents for the given {@link Query} querying the given collection.
+	 * 
 	 * @param query
 	 * @param collectionName must not be {@literal null} or empty.
 	 * @return
-	 * @see #count(Query, Class, String)
-	 */
-	long count(Query query, String collectionName);
-
-	/**
-	 * Returns the number of documents for the given {@link Query} by querying the given collection using the given entity
-	 * class to map the given {@link Query}.
-	 *
-	 * @param query
-	 * @param entityClass must not be {@literal null}.
-	 * @param collectionName must not be {@literal null} or empty.
-	 * @return
 	 */
-	long count(Query query, Class<?> entityClass, String collectionName);
+	long count(Query query, String collectionName);
 
 	/**
 	 * Insert the object into the collection for the entity type of the object to save.
@@ -820,13 +672,13 @@ public interface MongoOperations {
 	 * <p/>
 	 * If you object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
 	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
-	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See
-	 * <a href="http://docs.spring.io/spring/docs/current/spring-framework-reference/html/validation.html#core-convert" >
-	 * Spring's Type Conversion"</a> for more details.
+	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See <a
+	 * href="http://docs.spring.io/spring/docs/current/spring-framework-reference/html/validation.html#core-convert"
+	 * >Spring's Type Conversion"</a> for more details.
 	 * <p/>
 	 * <p/>
 	 * Insert is used to initially store the object into the database. To update an existing object use the save method.
-	 *
+	 * 
 	 * @param objectToSave the object to store in the collection.
 	 */
 	void insert(Object objectToSave);
@@ -838,7 +690,7 @@ public interface MongoOperations {
 	 * configured otherwise, an instance of MappingMongoConverter will be used.
 	 * <p/>
 	 * Insert is used to initially store the object into the database. To update an existing object use the save method.
-	 *
+	 * 
 	 * @param objectToSave the object to store in the collection
 	 * @param collectionName name of the collection to store the object in
 	 */
@@ -846,7 +698,7 @@ public interface MongoOperations {
 
 	/**
 	 * Insert a Collection of objects into a collection in a single batch write to the database.
-	 *
+	 * 
 	 * @param batchToSave the list of objects to save.
 	 * @param entityClass class that determines the collection to use
 	 */
@@ -854,7 +706,7 @@ public interface MongoOperations {
 
 	/**
 	 * Insert a list of objects into the specified collection in a single batch write to the database.
-	 *
+	 * 
 	 * @param batchToSave the list of objects to save.
 	 * @param collectionName name of the collection to store the object in
 	 */
@@ -863,7 +715,7 @@ public interface MongoOperations {
 	/**
 	 * Insert a mixed Collection of objects into a database collection determining the collection name to use based on the
 	 * class.
-	 *
+	 * 
 	 * @param collectionToSave the list of objects to save.
 	 */
 	void insertAll(Collection<? extends Object> objectsToSave);
@@ -877,10 +729,10 @@ public interface MongoOperations {
 	 * <p/>
 	 * If you object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
 	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
-	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See
-	 * <a href="http://docs.spring.io/spring/docs/current/spring-framework-reference/html/validation.html#core-convert" >
-	 * Spring's Type Conversion"</a> for more details.
-	 *
+	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See <a
+	 * href="http://docs.spring.io/spring/docs/current/spring-framework-reference/html/validation.html#core-convert"
+	 * >Spring's Type Conversion"</a> for more details.
+	 * 
 	 * @param objectToSave the object to store in the collection
 	 */
 	void save(Object objectToSave);
@@ -897,7 +749,7 @@ public interface MongoOperations {
 	 * property type will be handled by Spring's BeanWrapper class that leverages Type Cobnversion API. See <a
 	 * http://docs.spring.io/spring/docs/current/spring-framework-reference/html/validation.html#core-convert">Spring's
 	 * Type Conversion"</a> for more details.
-	 *
+	 * 
 	 * @param objectToSave the object to store in the collection
 	 * @param collectionName name of the collection to store the object in
 	 */
@@ -906,66 +758,66 @@ public interface MongoOperations {
 	/**
 	 * Performs an upsert. If no document is found that matches the query, a new document is created and inserted by
 	 * combining the query document and the update document.
-	 *
+	 * 
 	 * @param query the query document that specifies the criteria used to select a record to be upserted
 	 * @param update the update document that contains the updated object or $ operators to manipulate the existing object
 	 * @param entityClass class that determines the collection to use
 	 * @return the WriteResult which lets you access the results of the previous write.
 	 */
-	UpdateResult upsert(Query query, Update update, Class<?> entityClass);
+	WriteResult upsert(Query query, Update update, Class<?> entityClass);
 
 	/**
 	 * Performs an upsert. If no document is found that matches the query, a new document is created and inserted by
 	 * combining the query document and the update document.
-	 *
+	 * 
 	 * @param query the query document that specifies the criteria used to select a record to be updated
 	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
 	 *          object.
 	 * @param collectionName name of the collection to update the object in
 	 * @return the WriteResult which lets you access the results of the previous write.
 	 */
-	UpdateResult upsert(Query query, Update update, String collectionName);
+	WriteResult upsert(Query query, Update update, String collectionName);
 
 	/**
 	 * Performs an upsert. If no document is found that matches the query, a new document is created and inserted by
 	 * combining the query document and the update document.
-	 *
+	 * 
 	 * @param query the query document that specifies the criteria used to select a record to be upserted
 	 * @param update the update document that contains the updated object or $ operators to manipulate the existing object
 	 * @param entityClass class of the pojo to be operated on
 	 * @param collectionName name of the collection to update the object in
 	 * @return the WriteResult which lets you access the results of the previous write.
 	 */
-	UpdateResult upsert(Query query, Update update, Class<?> entityClass, String collectionName);
+	WriteResult upsert(Query query, Update update, Class<?> entityClass, String collectionName);
 
 	/**
 	 * Updates the first object that is found in the collection of the entity class that matches the query document with
 	 * the provided update document.
-	 *
+	 * 
 	 * @param query the query document that specifies the criteria used to select a record to be updated
 	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
 	 *          object.
 	 * @param entityClass class that determines the collection to use
 	 * @return the WriteResult which lets you access the results of the previous write.
 	 */
-	UpdateResult updateFirst(Query query, Update update, Class<?> entityClass);
+	WriteResult updateFirst(Query query, Update update, Class<?> entityClass);
 
 	/**
 	 * Updates the first object that is found in the specified collection that matches the query document criteria with
 	 * the provided updated document.
-	 *
+	 * 
 	 * @param query the query document that specifies the criteria used to select a record to be updated
 	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
 	 *          object.
 	 * @param collectionName name of the collection to update the object in
 	 * @return the WriteResult which lets you access the results of the previous write.
 	 */
-	UpdateResult updateFirst(Query query, Update update, String collectionName);
+	WriteResult updateFirst(Query query, Update update, String collectionName);
 
 	/**
 	 * Updates the first object that is found in the specified collection that matches the query document criteria with
 	 * the provided updated document.
-	 *
+	 * 
 	 * @param query the query document that specifies the criteria used to select a record to be updated
 	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
 	 *          object.
@@ -973,36 +825,36 @@ public interface MongoOperations {
 	 * @param collectionName name of the collection to update the object in
 	 * @return the WriteResult which lets you access the results of the previous write.
 	 */
-	UpdateResult updateFirst(Query query, Update update, Class<?> entityClass, String collectionName);
+	WriteResult updateFirst(Query query, Update update, Class<?> entityClass, String collectionName);
 
 	/**
 	 * Updates all objects that are found in the collection for the entity class that matches the query document criteria
 	 * with the provided updated document.
-	 *
+	 * 
 	 * @param query the query document that specifies the criteria used to select a record to be updated
 	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
 	 *          object.
 	 * @param entityClass class that determines the collection to use
 	 * @return the WriteResult which lets you access the results of the previous write.
 	 */
-	UpdateResult updateMulti(Query query, Update update, Class<?> entityClass);
+	WriteResult updateMulti(Query query, Update update, Class<?> entityClass);
 
 	/**
 	 * Updates all objects that are found in the specified collection that matches the query document criteria with the
 	 * provided updated document.
-	 *
+	 * 
 	 * @param query the query document that specifies the criteria used to select a record to be updated
 	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
 	 *          object.
 	 * @param collectionName name of the collection to update the object in
 	 * @return the WriteResult which lets you access the results of the previous write.
 	 */
-	UpdateResult updateMulti(Query query, Update update, String collectionName);
+	WriteResult updateMulti(Query query, Update update, String collectionName);
 
 	/**
 	 * Updates all objects that are found in the collection for the entity class that matches the query document criteria
 	 * with the provided updated document.
-	 *
+	 * 
 	 * @param query the query document that specifies the criteria used to select a record to be updated
 	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
 	 *          object.
@@ -1010,54 +862,54 @@ public interface MongoOperations {
 	 * @param collectionName name of the collection to update the object in
 	 * @return the WriteResult which lets you access the results of the previous write.
 	 */
-	UpdateResult updateMulti(final Query query, final Update update, Class<?> entityClass, String collectionName);
+	WriteResult updateMulti(final Query query, final Update update, Class<?> entityClass, String collectionName);
 
 	/**
 	 * Remove the given object from the collection by id.
-	 *
+	 * 
 	 * @param object
 	 */
-	DeleteResult remove(Object object);
+	WriteResult remove(Object object);
 
 	/**
 	 * Removes the given object from the given collection.
-	 *
+	 * 
 	 * @param object
 	 * @param collection must not be {@literal null} or empty.
 	 */
-	DeleteResult remove(Object object, String collection);
+	WriteResult remove(Object object, String collection);
 
 	/**
 	 * Remove all documents that match the provided query document criteria from the the collection used to store the
 	 * entityClass. The Class parameter is also used to help convert the Id of the object if it is present in the query.
-	 *
+	 * 
 	 * @param query
 	 * @param entityClass
 	 */
-	DeleteResult remove(Query query, Class<?> entityClass);
+	WriteResult remove(Query query, Class<?> entityClass);
 
 	/**
 	 * Remove all documents that match the provided query document criteria from the the collection used to store the
 	 * entityClass. The Class parameter is also used to help convert the Id of the object if it is present in the query.
-	 *
+	 * 
 	 * @param query
 	 * @param entityClass
 	 * @param collectionName
 	 */
-	DeleteResult remove(Query query, Class<?> entityClass, String collectionName);
+	WriteResult remove(Query query, Class<?> entityClass, String collectionName);
 
 	/**
 	 * Remove all documents from the specified collection that match the provided query document criteria. There is no
 	 * conversion/mapping done for any criteria using the id field.
-	 *
+	 * 
 	 * @param query the query document that specifies the criteria used to remove a record
 	 * @param collectionName name of the collection where the objects will removed
 	 */
-	DeleteResult remove(Query query, String collectionName);
+	WriteResult remove(Query query, String collectionName);
 
 	/**
 	 * Returns and removes all documents form the specified collection that match the provided query.
-	 *
+	 * 
 	 * @param query
 	 * @param collectionName
 	 * @return
@@ -1067,7 +919,7 @@ public interface MongoOperations {
 
 	/**
 	 * Returns and removes all documents matching the given query form the collection used to store the entityClass.
-	 *
+	 * 
 	 * @param query
 	 * @param entityClass
 	 * @return
@@ -1079,7 +931,7 @@ public interface MongoOperations {
 	 * Returns and removes all documents that match the provided query document criteria from the the collection used to
 	 * store the entityClass. The Class parameter is also used to help convert the Id of the object if it is present in
 	 * the query.
-	 *
+	 * 
 	 * @param query
 	 * @param entityClass
 	 * @param collectionName
@@ -1090,7 +942,7 @@ public interface MongoOperations {
 
 	/**
 	 * Returns the underlying {@link MongoConverter}.
-	 *
+	 * 
 	 * @return
 	 */
 	MongoConverter getConverter();

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

@@ -0,0 +1,248 @@
+/*
+ * Copyright 2010-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 javax.net.ssl.SSLSocketFactory;
+
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.InitializingBean;
+
+import com.mongodb.MongoOptions;
+
+/**
+ * A factory bean for construction of a {@link MongoOptions} instance.
+ * 
+ * @author Graeme Rocher
+ * @author Mark Pollack
+ * @author Mike Saavedra
+ * @author Thomas Darimont
+ */
+@SuppressWarnings("deprecation")
+public class MongoOptionsFactoryBean implements FactoryBean<MongoOptions>, InitializingBean {
+
+	private static final MongoOptions DEFAULT_MONGO_OPTIONS = new MongoOptions();
+
+	private int connectionsPerHost = DEFAULT_MONGO_OPTIONS.connectionsPerHost;
+	private int threadsAllowedToBlockForConnectionMultiplier = DEFAULT_MONGO_OPTIONS.threadsAllowedToBlockForConnectionMultiplier;
+	private int maxWaitTime = DEFAULT_MONGO_OPTIONS.maxWaitTime;
+	private int connectTimeout = DEFAULT_MONGO_OPTIONS.connectTimeout;
+	private int socketTimeout = DEFAULT_MONGO_OPTIONS.socketTimeout;
+	private boolean socketKeepAlive = DEFAULT_MONGO_OPTIONS.socketKeepAlive;
+	private boolean autoConnectRetry = DEFAULT_MONGO_OPTIONS.autoConnectRetry;
+	private long maxAutoConnectRetryTime = DEFAULT_MONGO_OPTIONS.maxAutoConnectRetryTime;
+	private int writeNumber = DEFAULT_MONGO_OPTIONS.w;
+	private int writeTimeout = DEFAULT_MONGO_OPTIONS.wtimeout;
+	private boolean writeFsync = DEFAULT_MONGO_OPTIONS.fsync;
+	private boolean slaveOk = DEFAULT_MONGO_OPTIONS.slaveOk;
+	private boolean ssl;
+	private SSLSocketFactory sslSocketFactory;
+
+	private MongoOptions options;
+
+	/**
+	 * Configures the maximum number of connections allowed per host until we will block.
+	 * 
+	 * @param connectionsPerHost
+	 */
+	public void setConnectionsPerHost(int connectionsPerHost) {
+		this.connectionsPerHost = connectionsPerHost;
+	}
+
+	/**
+	 * A multiplier for connectionsPerHost for # of threads that can block a connection. If connectionsPerHost is 10, and
+	 * threadsAllowedToBlockForConnectionMultiplier is 5, then 50 threads can block. If more threads try to block an
+	 * exception will be thrown.
+	 * 
+	 * @param threadsAllowedToBlockForConnectionMultiplier
+	 */
+	public void setThreadsAllowedToBlockForConnectionMultiplier(int threadsAllowedToBlockForConnectionMultiplier) {
+		this.threadsAllowedToBlockForConnectionMultiplier = threadsAllowedToBlockForConnectionMultiplier;
+	}
+
+	/**
+	 * Max wait time of a blocking thread for a connection.
+	 * 
+	 * @param maxWaitTime
+	 */
+	public void setMaxWaitTime(int maxWaitTime) {
+		this.maxWaitTime = maxWaitTime;
+	}
+
+	/**
+	 * Configures the connect timeout in milliseconds. Defaults to 0 (infinite time).
+	 * 
+	 * @param connectTimeout
+	 */
+	public void setConnectTimeout(int connectTimeout) {
+		this.connectTimeout = connectTimeout;
+	}
+
+	/**
+	 * Configures the socket timeout. Defaults to 0 (infinite time).
+	 * 
+	 * @param socketTimeout
+	 */
+	public void setSocketTimeout(int socketTimeout) {
+		this.socketTimeout = socketTimeout;
+	}
+
+	/**
+	 * Configures whether or not to have socket keep alive turned on (SO_KEEPALIVE). Defaults to {@literal false}.
+	 * 
+	 * @param socketKeepAlive
+	 */
+	public void setSocketKeepAlive(boolean socketKeepAlive) {
+		this.socketKeepAlive = socketKeepAlive;
+	}
+
+	/**
+	 * This specifies the number of servers to wait for on the write operation, and exception raising behavior. The 'w'
+	 * option to the getlasterror command. Defaults to 0.
+	 * <ul>
+	 * <li>-1 = don't even report network errors</li>
+	 * <li>0 = default, don't call getLastError by default</li>
+	 * <li>1 = basic, call getLastError, but don't wait for slaves</li>
+	 * <li>2 += wait for slaves</li>
+	 * </ul>
+	 * 
+	 * @param writeNumber the number of servers to wait for on the write operation, and exception raising behavior.
+	 */
+	public void setWriteNumber(int writeNumber) {
+		this.writeNumber = writeNumber;
+	}
+
+	/**
+	 * Configures the timeout for write operations in milliseconds. This defaults to {@literal 0} (indefinite).
+	 * 
+	 * @param writeTimeout
+	 */
+	public void setWriteTimeout(int writeTimeout) {
+		this.writeTimeout = writeTimeout;
+	}
+
+	/**
+	 * Configures whether or not to fsync. The 'fsync' option to the getlasterror command. Defaults to {@literal false}.
+	 * 
+	 * @param writeFsync to fsync on <code>write (true)<code>, otherwise {@literal false}.
+	 */
+	public void setWriteFsync(boolean writeFsync) {
+		this.writeFsync = writeFsync;
+	}
+
+	/**
+	 * Configures whether or not the system retries automatically on a failed connect. This defaults to {@literal false}.
+	 */
+	public void setAutoConnectRetry(boolean autoConnectRetry) {
+		this.autoConnectRetry = autoConnectRetry;
+	}
+
+	/**
+	 * Configures the maximum amount of time in millisecons to spend retrying to open connection to the same server. This
+	 * defaults to {@literal 0}, which means to use the default {@literal 15s} if {@link #autoConnectRetry} is on.
+	 * 
+	 * @param maxAutoConnectRetryTime the maxAutoConnectRetryTime to set
+	 */
+	public void setMaxAutoConnectRetryTime(long maxAutoConnectRetryTime) {
+		this.maxAutoConnectRetryTime = maxAutoConnectRetryTime;
+	}
+
+	/**
+	 * Specifies if the driver is allowed to read from secondaries or slaves. Defaults to {@literal false}.
+	 * 
+	 * @param slaveOk true if the driver should read from secondaries or slaves.
+	 */
+	public void setSlaveOk(boolean slaveOk) {
+		this.slaveOk = slaveOk;
+	}
+
+	/**
+	 * Specifies if the driver should use an SSL connection to Mongo. This defaults to {@literal false}. By default
+	 * {@link SSLSocketFactory#getDefault()} will be used. See {@link #setSslSocketFactory(SSLSocketFactory)} if you want
+	 * to configure a custom factory.
+	 * 
+	 * @param ssl true if the driver should use an SSL connection.
+	 * @see #setSslSocketFactory(SSLSocketFactory)
+	 */
+	public void setSsl(boolean ssl) {
+		this.ssl = ssl;
+	}
+
+	/**
+	 * Specifies the {@link SSLSocketFactory} to use for creating SSL connections to Mongo. Defaults to
+	 * {@link SSLSocketFactory#getDefault()}. Implicitly activates {@link #setSsl(boolean)} if a non-{@literal null} value
+	 * is given.
+	 * 
+	 * @param sslSocketFactory the sslSocketFactory to use.
+	 * @see #setSsl(boolean)
+	 */
+	public void setSslSocketFactory(SSLSocketFactory sslSocketFactory) {
+
+		setSsl(sslSocketFactory != null);
+		this.sslSocketFactory = sslSocketFactory;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
+	 */
+	public void afterPropertiesSet() {
+
+		MongoOptions options = new MongoOptions();
+
+		options.connectionsPerHost = connectionsPerHost;
+		options.threadsAllowedToBlockForConnectionMultiplier = threadsAllowedToBlockForConnectionMultiplier;
+		options.maxWaitTime = maxWaitTime;
+		options.connectTimeout = connectTimeout;
+		options.socketTimeout = socketTimeout;
+		options.socketKeepAlive = socketKeepAlive;
+		options.autoConnectRetry = autoConnectRetry;
+		options.maxAutoConnectRetryTime = maxAutoConnectRetryTime;
+		options.slaveOk = slaveOk;
+		options.w = writeNumber;
+		options.wtimeout = writeTimeout;
+		options.fsync = writeFsync;
+
+		if (ssl) {
+			options.setSocketFactory(sslSocketFactory != null ? sslSocketFactory : SSLSocketFactory.getDefault());
+		}
+
+		this.options = options;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.FactoryBean#getObject()
+	 */
+	public MongoOptions getObject() {
+		return this.options;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.FactoryBean#getObjectType()
+	 */
+	public Class<?> getObjectType() {
+		return MongoOptions.class;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.FactoryBean#isSingleton()
+	 */
+	public boolean isSingleton() {
+		return true;
+	}
+}

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

@@ -1,34 +0,0 @@
-/*
- * 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.core;
-
-import org.springframework.dao.DataAccessException;
-
-import com.mongodb.MongoException;
-import com.mongodb.reactivestreams.client.MongoCollection;
-import org.bson.Document;
-import org.reactivestreams.Publisher;
-
-/**
- * @author Mark Paluch
- * @param <T>
- * @since 2.0
- */
-public interface ReactiveCollectionCallback<T> {
-
-	Publisher<T> doInCollection(MongoCollection<Document> collection) throws MongoException, DataAccessException;
-
-}

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

@@ -1,32 +0,0 @@
-/*
- * 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.core;
-
-import org.springframework.dao.DataAccessException;
-
-import com.mongodb.MongoException;
-import com.mongodb.reactivestreams.client.MongoDatabase;
-import org.reactivestreams.Publisher;
-
-/**
- * @author Mark Paluch
- * @param <T>
- * @since 2.0
- */
-public interface ReactiveDatabaseCallback<T> {
-
-	Publisher<T> doInDB(MongoDatabase db) throws MongoException, DataAccessException;
-}

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

@@ -1,62 +0,0 @@
-/*
- * 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.core;
-
-import java.util.List;
-
-import org.springframework.data.mongodb.core.index.IndexDefinition;
-import org.springframework.data.mongodb.core.index.IndexInfo;
-
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-/**
- * Index operations on a collection.
- *
- * @author Mark Paluch
- * @author Christoph Strobl
- * @since 2.0
- */
-public interface ReactiveIndexOperations {
-
-	/**
-	 * Ensure that an index for the provided {@link IndexDefinition} exists for the collection indicated by the entity
-	 * class. If not it will be created.
-	 *
-	 * @param indexDefinition must not be {@literal null}.
-	 */
-	Mono<String> ensureIndex(IndexDefinition indexDefinition);
-
-	/**
-	 * Drops an index from this collection.
-	 *
-	 * @param name name of index to drop
-	 */
-	Mono<Void> dropIndex(String name);
-
-	/**
-	 * Drops all indices from this collection.
-	 */
-	Mono<Void> dropAllIndexes();
-
-	/**
-	 * Returns the index information on the collection.
-	 *
-	 * @return index information on the collection
-	 */
-	Flux<IndexInfo> getIndexInfo();
-
-}

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

@@ -1,129 +0,0 @@
-/*
- * 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.core;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.springframework.dao.DataAccessException;
-import org.springframework.dao.support.PersistenceExceptionTranslator;
-import org.springframework.util.StringUtils;
-
-import com.mongodb.async.client.MongoClientSettings;
-import com.mongodb.reactivestreams.client.MongoClient;
-import com.mongodb.reactivestreams.client.MongoClients;
-
-/**
- * Convenient factory for configuring a reactive streams {@link MongoClient}.
- *
- * @author Mark Paluch
- * @author Christoph Strobl
- * @since 2.0
- */
-public class ReactiveMongoClientFactoryBean extends AbstractFactoryBean<MongoClient>
-		implements PersistenceExceptionTranslator {
-
-	private static final PersistenceExceptionTranslator DEFAULT_EXCEPTION_TRANSLATOR = new MongoExceptionTranslator();
-
-	private String connectionString;
-	private String host;
-	private Integer port;
-	private MongoClientSettings mongoClientSettings;
-	private PersistenceExceptionTranslator exceptionTranslator = DEFAULT_EXCEPTION_TRANSLATOR;
-
-	/**
-	 * Configures the host to connect to.
-	 *
-	 * @param host
-	 */
-	public void setHost(String host) {
-		this.host = host;
-	}
-
-	/**
-	 * Configures the port to connect to.
-	 *
-	 * @param port
-	 */
-	public void setPort(int port) {
-		this.port = port;
-	}
-
-	/**
-	 * Configures the connection string.
-	 *
-	 * @param connectionString
-	 */
-	public void setConnectionString(String connectionString) {
-		this.connectionString = connectionString;
-	}
-
-	/**
-	 * Configures the mongo client settings.
-	 *
-	 * @param mongoClientSettings
-	 */
-	public void setMongoClientSettings(MongoClientSettings mongoClientSettings) {
-		this.mongoClientSettings = mongoClientSettings;
-	}
-
-	/**
-	 * Configures the {@link PersistenceExceptionTranslator} to use.
-	 *
-	 * @param exceptionTranslator
-	 */
-	public void setExceptionTranslator(PersistenceExceptionTranslator exceptionTranslator) {
-		this.exceptionTranslator = exceptionTranslator == null ? DEFAULT_EXCEPTION_TRANSLATOR : exceptionTranslator;
-	}
-
-	@Override
-	public Class<?> getObjectType() {
-		return MongoClient.class;
-	}
-
-	@Override
-	protected MongoClient createInstance() throws Exception {
-
-		if (mongoClientSettings != null) {
-			return MongoClients.create(mongoClientSettings);
-		}
-
-		if (StringUtils.hasText(connectionString)) {
-			return MongoClients.create(connectionString);
-		}
-
-		if (StringUtils.hasText(host)) {
-
-			if (port != null) {
-				return MongoClients.create(String.format("mongodb://%s:%d", host, port));
-			}
-
-			return MongoClients.create(String.format("mongodb://%s", host));
-		}
-
-		throw new IllegalStateException(
-				"Cannot create MongoClients. One of the following is required: mongoClientSettings, connectionString or host/port");
-	}
-
-	@Override
-	protected void destroyInstance(MongoClient instance) throws Exception {
-		instance.close();
-	}
-
-	@Override
-	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
-		return exceptionTranslator.translateExceptionIfPossible(ex);
-	}
-}

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

@@ -1,206 +0,0 @@
-/*
- * 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.core;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bson.codecs.configuration.CodecRegistry;
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.springframework.util.Assert;
-
-import com.mongodb.MongoCredential;
-import com.mongodb.ReadConcern;
-import com.mongodb.ReadPreference;
-import com.mongodb.WriteConcern;
-import com.mongodb.async.client.MongoClientSettings;
-import com.mongodb.connection.ClusterSettings;
-import com.mongodb.connection.ConnectionPoolSettings;
-import com.mongodb.connection.ServerSettings;
-import com.mongodb.connection.SocketSettings;
-import com.mongodb.connection.SslSettings;
-import com.mongodb.connection.StreamFactoryFactory;
-
-/**
- * A factory bean for construction of a {@link MongoClientSettings} instance to be used with the async MongoDB driver.
- *
- * @author Mark Paluch
- * @since 2.0
- */
-public class ReactiveMongoClientSettingsFactoryBean extends AbstractFactoryBean<MongoClientSettings> {
-
-	private static final MongoClientSettings DEFAULT_MONGO_SETTINGS = MongoClientSettings.builder().build();
-
-	private ReadPreference readPreference = DEFAULT_MONGO_SETTINGS.getReadPreference();
-	private WriteConcern writeConcern = DEFAULT_MONGO_SETTINGS.getWriteConcern();
-	private ReadConcern readConcern = DEFAULT_MONGO_SETTINGS.getReadConcern();
-	private List<MongoCredential> credentialList = new ArrayList<>();
-	private StreamFactoryFactory streamFactoryFactory = DEFAULT_MONGO_SETTINGS.getStreamFactoryFactory();
-	private CodecRegistry codecRegistry = DEFAULT_MONGO_SETTINGS.getCodecRegistry();
-	private ClusterSettings clusterSettings = DEFAULT_MONGO_SETTINGS.getClusterSettings();
-	private SocketSettings socketSettings = DEFAULT_MONGO_SETTINGS.getSocketSettings();
-	private SocketSettings heartbeatSocketSettings = DEFAULT_MONGO_SETTINGS.getHeartbeatSocketSettings();
-	private ConnectionPoolSettings connectionPoolSettings = DEFAULT_MONGO_SETTINGS.getConnectionPoolSettings();
-	private ServerSettings serverSettings = DEFAULT_MONGO_SETTINGS.getServerSettings();
-	private SslSettings sslSettings = DEFAULT_MONGO_SETTINGS.getSslSettings();
-
-	/**
-	 * Set the {@link ReadPreference}.
-	 *
-	 * @param readPreference
-	 */
-	public void setReadPreference(ReadPreference readPreference) {
-		this.readPreference = readPreference;
-	}
-
-	/**
-	 * Set the {@link WriteConcern}.
-	 *
-	 * @param writeConcern
-	 */
-	public void setWriteConcern(WriteConcern writeConcern) {
-		this.writeConcern = writeConcern;
-	}
-
-	/**
-	 * Set the {@link ReadConcern}.
-	 *
-	 * @param readConcern
-	 */
-	public void setReadConcern(ReadConcern readConcern) {
-		this.readConcern = readConcern;
-	}
-
-	/**
-	 * Set the List of {@link MongoCredential}s.
-	 *
-	 * @param credentialList must not be {@literal null}.
-	 */
-	public void setCredentialList(List<MongoCredential> credentialList) {
-
-		Assert.notNull(credentialList, "CredendialList must not be null!");
-
-		this.credentialList.addAll(credentialList);
-	}
-
-	/**
-	 * Adds the {@link MongoCredential} to the list of credentials.
-	 *
-	 * @param mongoCredential must not be {@literal null}.
-	 */
-	public void addMongoCredential(MongoCredential mongoCredential) {
-
-		Assert.notNull(mongoCredential, "MongoCredential must not be null!");
-
-		this.credentialList.add(mongoCredential);
-	}
-
-	/**
-	 * Set the {@link StreamFactoryFactory}.
-	 *
-	 * @param streamFactoryFactory
-	 */
-	public void setStreamFactoryFactory(StreamFactoryFactory streamFactoryFactory) {
-		this.streamFactoryFactory = streamFactoryFactory;
-	}
-
-	/**
-	 * Set the {@link CodecRegistry}.
-	 *
-	 * @param codecRegistry
-	 */
-	public void setCodecRegistry(CodecRegistry codecRegistry) {
-		this.codecRegistry = codecRegistry;
-	}
-
-	/**
-	 * Set the {@link ClusterSettings}.
-	 *
-	 * @param clusterSettings
-	 */
-	public void setClusterSettings(ClusterSettings clusterSettings) {
-		this.clusterSettings = clusterSettings;
-	}
-
-	/**
-	 * Set the {@link SocketSettings}.
-	 *
-	 * @param socketSettings
-	 */
-	public void setSocketSettings(SocketSettings socketSettings) {
-		this.socketSettings = socketSettings;
-	}
-
-	/**
-	 * Set the heartbeat {@link SocketSettings}.
-	 *
-	 * @param heartbeatSocketSettings
-	 */
-	public void setHeartbeatSocketSettings(SocketSettings heartbeatSocketSettings) {
-		this.heartbeatSocketSettings = heartbeatSocketSettings;
-	}
-
-	/**
-	 * Set the {@link ConnectionPoolSettings}.
-	 *
-	 * @param connectionPoolSettings
-	 */
-	public void setConnectionPoolSettings(ConnectionPoolSettings connectionPoolSettings) {
-		this.connectionPoolSettings = connectionPoolSettings;
-	}
-
-	/**
-	 * Set the {@link ServerSettings}.
-	 *
-	 * @param serverSettings
-	 */
-	public void setServerSettings(ServerSettings serverSettings) {
-		this.serverSettings = serverSettings;
-	}
-
-	/**
-	 * Set the {@link SslSettings}.
-	 *
-	 * @param sslSettings
-	 */
-	public void setSslSettings(SslSettings sslSettings) {
-		this.sslSettings = sslSettings;
-	}
-
-	@Override
-	public Class<?> getObjectType() {
-		return MongoClientSettings.class;
-	}
-
-	@Override
-	protected MongoClientSettings createInstance() throws Exception {
-
-		return MongoClientSettings.builder() //
-				.readPreference(readPreference) //
-				.writeConcern(writeConcern) //
-				.readConcern(readConcern) //
-				.credentialList(credentialList) //
-				.streamFactoryFactory(streamFactoryFactory) //
-				.codecRegistry(codecRegistry) //
-				.clusterSettings(clusterSettings) //
-				.socketSettings(socketSettings) //
-				.heartbeatSocketSettings(heartbeatSocketSettings) //
-				.connectionPoolSettings(connectionPoolSettings) //
-				.serverSettings(serverSettings) //
-				.sslSettings(sslSettings) //
-				.build();
-	}
-}

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

@@ -1,51 +0,0 @@
-/*
- * 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.core;
-
-import com.mongodb.reactivestreams.client.MongoClient;
-import com.mongodb.reactivestreams.client.MongoDatabase;
-
-/**
- * Helper class featuring helper methods for internal MongoDb classes. Mainly intended for internal use within the
- * framework.
- *
- * @author Mark Paluch
- * @author Christoph Strobl
- * @since 2.0
- */
-public abstract class ReactiveMongoDbUtils {
-
-	/**
-	 * Private constructor to prevent instantiation.
-	 */
-	private ReactiveMongoDbUtils() {}
-
-	/**
-	 * Obtains a {@link MongoDatabase} connection for the given {@link MongoClient} instance and database name
-	 *
-	 * @param mongo the {@link MongoClient} instance, must not be {@literal null}.
-	 * @param databaseName the database name, must not be {@literal null} or empty.
-	 * @return the {@link MongoDatabase} connection
-	 */
-	public static MongoDatabase getMongoDatabase(MongoClient mongo, String databaseName) {
-		return doGetMongoDatabase(mongo, databaseName, true);
-	}
-
-	private static MongoDatabase doGetMongoDatabase(MongoClient mongo, String databaseName, boolean allowCreate) {
-		return mongo.getDatabase(databaseName);
-	}
-
-}

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

@@ -1,945 +0,0 @@
-/*
- * 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.core;
-
-import java.util.Collection;
-
-import org.bson.Document;
-import org.reactivestreams.Publisher;
-import org.reactivestreams.Subscription;
-import org.springframework.data.geo.GeoResult;
-import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
-import org.springframework.data.mongodb.core.convert.MongoConverter;
-import org.springframework.data.mongodb.core.query.BasicQuery;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.NearQuery;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.mongodb.core.query.Update;
-
-import com.mongodb.ReadPreference;
-import com.mongodb.client.result.DeleteResult;
-import com.mongodb.client.result.UpdateResult;
-import com.mongodb.reactivestreams.client.MongoCollection;
-
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-/**
- * Interface that specifies a basic set of MongoDB operations executed in a reactive way.
- * <p>
- * Implemented by {@link ReactiveMongoTemplate}. Not often used but a useful option for extensibility and testability
- * (as it can be easily mocked, stubbed, or be the target of a JDK proxy). Command execution using
- * {@link ReactiveMongoOperations} is deferred until subscriber subscribes to the {@link Publisher}.
- *
- * @author Mark Paluch
- * @author Christoph Strobl
- * @since 2.0
- * @see Flux
- * @see Mono
- * @see <a href="http://projectreactor.io/docs/">Project Reactor</a>
- */
-public interface ReactiveMongoOperations {
-
-	/**
-	 * Returns the reactive operations that can be performed on indexes
-	 *
-	 * @return index operations on the named collection
-	 */
-	ReactiveIndexOperations indexOps(String collectionName);
-
-	/**
-	 * Returns the reactive operations that can be performed on indexes
-	 *
-	 * @return index operations on the named collection associated with the given entity class
-	 */
-	ReactiveIndexOperations indexOps(Class<?> entityClass);
-
-	/**
-	 * Execute the a MongoDB command expressed as a JSON string. This will call the method JSON.parse that is part of the
-	 * MongoDB driver to convert the JSON string to a DBObject. Any errors that result from executing this command will be
-	 * converted into Spring's DAO exception hierarchy.
-	 *
-	 * @param jsonCommand a MongoDB command expressed as a JSON string.
-	 * @return a result object returned by the action
-	 */
-	Mono<Document> executeCommand(String jsonCommand);
-
-	/**
-	 * Execute a MongoDB command. Any errors that result from executing this command will be converted into Spring's DAO
-	 * exception hierarchy.
-	 *
-	 * @param command a MongoDB command
-	 * @return a result object returned by the action
-	 */
-	Mono<Document> executeCommand(Document command);
-
-	/**
-	 * Execute a MongoDB command. Any errors that result from executing this command will be converted into Spring's data
-	 * access exception hierarchy.
-	 *
-	 * @param command a MongoDB command, must not be {@literal null}.
-	 * @param readPreference read preferences to use, can be {@literal null}.
-	 * @return a result object returned by the action
-	 */
-	Mono<Document> executeCommand(Document command, ReadPreference readPreference);
-
-	/**
-	 * Executes a {@link ReactiveDatabaseCallback} translating any exceptions as necessary.
-	 * <p/>
-	 * Allows for returning a result object, that is a domain object or a collection of domain objects.
-	 *
-	 * @param <T> return type
-	 * @param action callback object that specifies the MongoDB actions to perform on the passed in DB instance.
-	 * @return a result object returned by the action
-	 */
-	<T> Flux<T> execute(ReactiveDatabaseCallback<T> action);
-
-	/**
-	 * Executes the given {@link ReactiveCollectionCallback} on the entity collection of the specified class.
-	 * <p/>
-	 * Allows for returning a result object, that is a domain object or a collection of domain objects.
-	 *
-	 * @param entityClass class that determines the collection to use
-	 * @param <T> return type
-	 * @param action callback object that specifies the MongoDB action
-	 * @return a result object returned by the action or <tt>null</tt>
-	 */
-	<T> Flux<T> execute(Class<?> entityClass, ReactiveCollectionCallback<T> action);
-
-	/**
-	 * Executes the given {@link ReactiveCollectionCallback} on the collection of the given name.
-	 * <p/>
-	 * Allows for returning a result object, that is a domain object or a collection of domain objects.
-	 *
-	 * @param <T> return type
-	 * @param collectionName the name of the collection that specifies which DBCollection instance will be passed into
-	 * @param action callback object that specifies the MongoDB action the callback action.
-	 * @return a result object returned by the action or <tt>null</tt>
-	 */
-	<T> Flux<T> execute(String collectionName, ReactiveCollectionCallback<T> action);
-
-	/**
-	 * Create an uncapped collection with a name based on the provided entity class.
-	 *
-	 * @param entityClass class that determines the collection to create
-	 * @return the created collection
-	 */
-	<T> Mono<MongoCollection<Document>> createCollection(Class<T> entityClass);
-
-	/**
-	 * Create a collection with a name based on the provided entity class using the options.
-	 *
-	 * @param entityClass class that determines the collection to create
-	 * @param collectionOptions options to use when creating the collection.
-	 * @return the created collection
-	 */
-	<T> Mono<MongoCollection<Document>> createCollection(Class<T> entityClass, CollectionOptions collectionOptions);
-
-	/**
-	 * Create an uncapped collection with the provided name.
-	 *
-	 * @param collectionName name of the collection
-	 * @return the created collection
-	 */
-	Mono<MongoCollection<Document>> createCollection(String collectionName);
-
-	/**
-	 * Create a collection with the provided name and options.
-	 *
-	 * @param collectionName name of the collection
-	 * @param collectionOptions options to use when creating the collection.
-	 * @return the created collection
-	 */
-	Mono<MongoCollection<Document>> createCollection(String collectionName, CollectionOptions collectionOptions);
-
-	/**
-	 * A set of collection names.
-	 *
-	 * @return Flux of collection names
-	 */
-	Flux<String> getCollectionNames();
-
-	/**
-	 * Get a collection by name, creating it if it doesn't exist.
-	 * <p/>
-	 * Translate any exceptions as necessary.
-	 *
-	 * @param collectionName name of the collection
-	 * @return an existing collection or a newly created one.
-	 */
-	MongoCollection<Document> getCollection(String collectionName);
-
-	/**
-	 * Check to see if a collection with a name indicated by the entity class exists.
-	 * <p/>
-	 * Translate any exceptions as necessary.
-	 *
-	 * @param entityClass class that determines the name of the collection
-	 * @return true if a collection with the given name is found, false otherwise.
-	 */
-	<T> Mono<Boolean> collectionExists(Class<T> entityClass);
-
-	/**
-	 * Check to see if a collection with a given name exists.
-	 * <p/>
-	 * Translate any exceptions as necessary.
-	 *
-	 * @param collectionName name of the collection
-	 * @return true if a collection with the given name is found, false otherwise.
-	 */
-	Mono<Boolean> collectionExists(String collectionName);
-
-	/**
-	 * Drop the collection with the name indicated by the entity class.
-	 * <p/>
-	 * Translate any exceptions as necessary.
-	 *
-	 * @param entityClass class that determines the collection to drop/delete.
-	 */
-	<T> Mono<Void> dropCollection(Class<T> entityClass);
-
-	/**
-	 * Drop the collection with the given name.
-	 * <p/>
-	 * Translate any exceptions as necessary.
-	 *
-	 * @param collectionName name of the collection to drop/delete.
-	 */
-	Mono<Void> dropCollection(String collectionName);
-
-	/**
-	 * Query for a {@link Flux} of objects of type T from the collection used by the entity class.
-	 * <p/>
-	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
-	 * If your collection does not contain a homogeneous collection of types, this operation will not be an efficient way
-	 * to map objects since the test for class type is done in the client and not on the server.
-	 * @param entityClass the parametrized type of the returned {@link Flux}.
-	 *
-	 * @return the converted collection
-	 */
-	<T> Flux<T> findAll(Class<T> entityClass);
-
-	/**
-	 * Query for a {@link Flux} of objects of type T from the specified collection.
-	 * <p/>
-	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
-	 * If your collection does not contain a homogeneous collection of types, this operation will not be an efficient way
-	 * to map objects since the test for class type is done in the client and not on the server.
-	 *
-	 * @param entityClass the parametrized type of the returned {@link Flux}.
-	 * @param collectionName name of the collection to retrieve the objects from
-	 * @return the converted collection
-	 */
-	<T> Flux<T> findAll(Class<T> entityClass, String collectionName);
-
-	/**
-	 * Map the results of an ad-hoc query on the collection for the entity class to a single instance of an object of the
-	 * specified type.
-	 * <p/>
-	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
-	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
-	 * feature rich {@link Query}.
-	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
-	 *          specification
-	 * @param entityClass the parametrized type of the returned {@link Mono}.
-	 * @return the converted object
-	 */
-	<T> Mono<T> findOne(Query query, Class<T> entityClass);
-
-	/**
-	 * Map the results of an ad-hoc query on the specified collection to a single instance of an object of the specified
-	 * type.
-	 * <p/>
-	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
-	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
-	 * feature rich {@link Query}.
-	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
-	 *          specification
-	 * @param entityClass the parametrized type of the returned {@link Mono}.
-	 * @param collectionName name of the collection to retrieve the objects from
-	 * @return the converted object
-	 */
-	<T> Mono<T> findOne(Query query, Class<T> entityClass, String collectionName);
-
-	/**
-	 * Determine result of given {@link Query} contains at least one element.
-	 *
-	 * @param query the {@link Query} class that specifies the criteria used to find a record.
-	 * @param collectionName name of the collection to check for objects.
-	 * @return
-	 */
-	Mono<Boolean> exists(Query query, String collectionName);
-
-	/**
-	 * Determine result of given {@link Query} contains at least one element.
-	 *
-	 * @param query the {@link Query} class that specifies the criteria used to find a record.
-	 * @param entityClass the parametrized type.
-	 * @return
-	 */
-	Mono<Boolean> exists(Query query, Class<?> entityClass);
-
-	/**
-	 * Determine result of given {@link Query} contains at least one element.
-	 *
-	 * @param query the {@link Query} class that specifies the criteria used to find a record.
-	 * @param entityClass the parametrized type.
-	 * @param collectionName name of the collection to check for objects.
-	 * @return
-	 */
-	Mono<Boolean> exists(Query query, Class<?> entityClass, String collectionName);
-
-	/**
-	 * Map the results of an ad-hoc query on the collection for the entity class to a {@link Flux} of the specified type.
-	 * <p/>
-	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
-	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
-	 * feature rich {@link Query}.
-	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
-	 *          specification
-	 * @param entityClass the parametrized type of the returned {@link Flux}.
-	 * @return the {@link Flux} of converted objects
-	 */
-	<T> Flux<T> find(Query query, Class<T> entityClass);
-
-	/**
-	 * Map the results of an ad-hoc query on the specified collection to a {@link Flux} of the specified type.
-	 * <p/>
-	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
-	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
-	 * feature rich {@link Query}.
-	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
-	 *          specification
-	 * @param entityClass the parametrized type of the returned {@link Flux}.
-	 * @param collectionName name of the collection to retrieve the objects from
-	 * @return the {@link Flux} of converted objects
-	 */
-	<T> Flux<T> find(Query query, Class<T> entityClass, String collectionName);
-
-	/**
-	 * Returns a document with the given id mapped onto the given class. The collection the query is ran against will be
-	 * derived from the given target class as well.
-	 *
-	 * @param <T>
-	 * @param id the id of the document to return.
-	 * @param entityClass the type the document shall be converted into.
-	 * @return the document with the given id mapped onto the given target class.
-	 */
-	<T> Mono<T> findById(Object id, Class<T> entityClass);
-
-	/**
-	 * Returns the document with the given id from the given collection mapped onto the given target class.
-	 *
-	 * @param id the id of the document to return
-	 * @param entityClass the type to convert the document to
-	 * @param collectionName the collection to query for the document
-	 * @param <T>
-	 * @return
-	 */
-	<T> Mono<T> findById(Object id, Class<T> entityClass, String collectionName);
-
-	/**
-	 * Returns {@link Flux} of {@link GeoResult} for all entities matching the given {@link NearQuery}. Will consider entity mapping
-	 * information to determine the collection the query is ran against. Note, that MongoDB limits the number of results
-	 * by default. Make sure to add an explicit limit to the {@link NearQuery} if you expect a particular number of
-	 * results.
-	 *
-	 * @param near must not be {@literal null}.
-	 * @param entityClass must not be {@literal null}.
-	 * @return
-	 */
-	<T> Flux<GeoResult<T>> geoNear(NearQuery near, Class<T> entityClass);
-
-	/**
-	 * Returns {@link Flux} of {@link GeoResult} for all entities matching the given {@link NearQuery}. Note, that MongoDB limits the
-	 * number of results by default. Make sure to add an explicit limit to the {@link NearQuery} if you expect a
-	 * particular number of results.
-	 *
-	 * @param near must not be {@literal null}.
-	 * @param entityClass must not be {@literal null}.
-	 * @param collectionName the collection to trigger the query against. If no collection name is given the entity class
-	 *          will be inspected.
-	 * @return
-	 */
-	<T> Flux<GeoResult<T>> geoNear(NearQuery near, Class<T> entityClass, String collectionName);
-
-	/**
-	 * Triggers <a href="https://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify <a/>
-	 * to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query}.
-	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification.
-	 * @param update the {@link Update} to apply on matching documents.
-	 * @param entityClass the parametrized type.
-	 * @return
-	 */
-	<T> Mono<T> findAndModify(Query query, Update update, Class<T> entityClass);
-
-	/**
-	 * Triggers <a href="https://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify <a/>
-	 * to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query}.
-	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification.
-	 * @param update the {@link Update} to apply on matching documents.
-	 * @param entityClass the parametrized type.
-	 * @param collectionName the collection to query.
-	 * @return
-	 */
-	<T> Mono<T> findAndModify(Query query, Update update, Class<T> entityClass, String collectionName);
-
-	/**
-	 * Triggers <a href="https://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify <a/>
-	 * to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query} taking
-	 * {@link FindAndModifyOptions} into account.
-	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification.
-	 * @param update the {@link Update} to apply on matching documents.
-	 * @param options the {@link FindAndModifyOptions} holding additional information.
-	 * @param entityClass the parametrized type.
-	 * @return
-	 */
-	<T> Mono<T> findAndModify(Query query, Update update, FindAndModifyOptions options, Class<T> entityClass);
-
-	/**
-	 * Triggers <a href="https://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify <a/>
-	 * to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query} taking
-	 * {@link FindAndModifyOptions} into account.
-	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification.
-	 * @param update the {@link Update} to apply on matching documents.
-	 * @param options the {@link FindAndModifyOptions} holding additional information.
-	 * @param entityClass the parametrized type.
-	 * @param collectionName the collection to query.
-	 * @return
-	 */
-	<T> Mono<T> findAndModify(Query query, Update update, FindAndModifyOptions options, Class<T> entityClass,
-			String collectionName);
-
-	/**
-	 * Map the results of an ad-hoc query on the collection for the entity type to a single instance of an object of the
-	 * specified type. The first document that matches the query is returned and also removed from the collection in the
-	 * database.
-	 * <p/>
-	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}.
-	 * <p/>
-	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
-	 * feature rich {@link Query}.
-	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
-	 *          specification
-	 * @param entityClass the parametrized type of the returned {@link Mono}.
-	 * @return the converted object
-	 */
-	<T> Mono<T> findAndRemove(Query query, Class<T> entityClass);
-
-	/**
-	 * Map the results of an ad-hoc query on the specified collection to a single instance of an object of the specified
-	 * type. The first document that matches the query is returned and also removed from the collection in the database.
-	 * <p/>
-	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
-	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
-	 * feature rich {@link Query}.
-	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
-	 *          specification
-	 * @param entityClass the parametrized type of the returned {@link Mono}.
-	 * @param collectionName name of the collection to retrieve the objects from.
-	 * @return the converted object
-	 */
-	<T> Mono<T> findAndRemove(Query query, Class<T> entityClass, String collectionName);
-
-	/**
-	 * Returns the number of documents for the given {@link Query} by querying the collection of the given entity class.
-	 *
-	 * @param query
-	 * @param entityClass must not be {@literal null}.
-	 * @return
-	 */
-	Mono<Long> count(Query query, Class<?> entityClass);
-
-	/**
-	 * Returns the number of documents for the given {@link Query} querying the given collection. The given {@link Query}
-	 * must solely consist of document field references as we lack type information to map potential property references
-	 * onto document fields. TO make sure the query gets mapped, use {@link #count(Query, Class, String)}.
-	 *
-	 * @param query
-	 * @param collectionName must not be {@literal null} or empty.
-	 * @return
-	 * @see #count(Query, Class, String)
-	 */
-	Mono<Long> count(Query query, String collectionName);
-
-	/**
-	 * Returns the number of documents for the given {@link Query} by querying the given collection using the given entity
-	 * class to map the given {@link Query}.
-	 *
-	 * @param query
-	 * @param entityClass must not be {@literal null}.
-	 * @param collectionName must not be {@literal null} or empty.
-	 * @return
-	 */
-	Mono<Long> count(Query query, Class<?> entityClass, String collectionName);
-
-	/**
-	 * Insert the object into the collection for the entity type of the object to save.
-	 * <p/>
-	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}.
-	 * <p/>
-	 * If you object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
-	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
-	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See
-	 * <a href="http://docs.spring.io/spring/docs/current/spring-framework-reference/html/validation.html#core-convert" >
-	 * Spring's Type Conversion"</a> for more details.
-	 * <p/>
-	 * <p/>
-	 * Insert is used to initially store the object into the database. To update an existing object use the save method.
-	 *
-	 * @param objectToSave the object to store in the collection.
-	 * @return
-	 */
-	<T> Mono<T> insert(T objectToSave);
-
-	/**
-	 * Insert the object into the specified collection.
-	 * <p/>
-	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
-	 * Insert is used to initially store the object into the database. To update an existing object use the save method.
-	 *
-	 * @param objectToSave the object to store in the collection
-	 * @param collectionName name of the collection to store the object in
-	 * @return
-	 */
-	<T> Mono<T> insert(T objectToSave, String collectionName);
-
-	/**
-	 * Insert a Collection of objects into a collection in a single batch write to the database.
-	 *
-	 * @param batchToSave the batch of objects to save.
-	 * @param entityClass class that determines the collection to use
-	 * @return
-	 */
-	<T> Flux<T> insert(Collection<? extends T> batchToSave, Class<?> entityClass);
-
-	/**
-	 * Insert a batch of objects into the specified collection in a single batch write to the database.
-	 *
-	 * @param batchToSave the list of objects to save.
-	 * @param collectionName name of the collection to store the object in
-	 * @return
-	 */
-	<T> Flux<T> insert(Collection<? extends T> batchToSave, String collectionName);
-
-	/**
-	 * Insert a mixed Collection of objects into a database collection determining the collection name to use based on the
-	 * class.
-	 *
-	 * @param objectsToSave the list of objects to save.
-	 * @return
-	 */
-	<T> Flux<T> insertAll(Collection<? extends T> objectsToSave);
-
-	/**
-	 * Insert the object into the collection for the entity type of the object to save.
-	 * <p/>
-	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}.
-	 * <p/>
-	 * If you object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
-	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
-	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See
-	 * <a href="http://docs.spring.io/spring/docs/current/spring-framework-reference/html/validation.html#core-convert" >
-	 * Spring's Type Conversion"</a> for more details.
-	 * <p/>
-	 * <p/>
-	 * Insert is used to initially store the object into the database. To update an existing object use the save method.
-	 *
-	 * @param objectToSave the object to store in the collection.
-	 * @return
-	 */
-	<T> Mono<T> insert(Mono<? extends T> objectToSave);
-
-	/**
-	 * Insert a Collection of objects into a collection in a single batch write to the database.
-	 *
-	 * @param batchToSave the publisher which provides objects to save.
-	 * @param entityClass class that determines the collection to use
-	 * @return
-	 */
-	<T> Flux<T> insertAll(Mono<? extends Collection<? extends T>> batchToSave, Class<?> entityClass);
-
-	/**
-	 * Insert objects into the specified collection in a single batch write to the database.
-	 *
-	 * @param batchToSave the publisher which provides objects to save.
-	 * @param collectionName name of the collection to store the object in
-	 * @return
-	 */
-	<T> Flux<T> insertAll(Mono<? extends Collection<? extends T>> batchToSave, String collectionName);
-
-	/**
-	 * Insert a mixed Collection of objects into a database collection determining the collection name to use based on the
-	 * class.
-	 *
-	 * @param objectsToSave the publisher which provides objects to save.
-	 * @return
-	 */
-	<T> Flux<T> insertAll(Mono<? extends Collection<? extends T>> objectsToSave);
-
-	/**
-	 * Save the object to the collection for the entity type of the object to save. This will perform an insert if the
-	 * object is not already present, that is an 'upsert'.
-	 * <p/>
-	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
-	 * If you object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
-	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
-	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See
-	 * <a href="http://docs.spring.io/spring/docs/current/spring-framework-reference/html/validation.html#core-convert" >
-	 * Spring's Type Conversion"</a> for more details.
-	 *
-	 * @param objectToSave the object to store in the collection
-	 * @return
-	 */
-	<T> Mono<T> save(T objectToSave);
-
-	/**
-	 * Save the object to the specified collection. This will perform an insert if the object is not already present, that
-	 * is an 'upsert'.
-	 * <p/>
-	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
-	 * If you object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
-	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
-	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See <a
-	 * http://docs.spring.io/spring/docs/current/spring-framework-reference/html/validation.html#core-convert">Spring's
-	 * Type Conversion"</a> for more details.
-	 *
-	 * @param objectToSave the object to store in the collection
-	 * @param collectionName name of the collection to store the object in
-	 * @return
-	 */
-	<T> Mono<T> save(T objectToSave, String collectionName);
-
-	/**
-	 * Save the object to the collection for the entity type of the object to save. This will perform an insert if the
-	 * object is not already present, that is an 'upsert'.
-	 * <p/>
-	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
-	 * If you object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
-	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
-	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See
-	 * <a href="http://docs.spring.io/spring/docs/current/spring-framework-reference/html/validation.html#core-convert" >
-	 * Spring's Type Conversion"</a> for more details.
-	 *
-	 * @param objectToSave the object to store in the collection
-	 * @return
-	 */
-	<T> Mono<T> save(Mono<? extends T> objectToSave);
-
-	/**
-	 * Save the object to the specified collection. This will perform an insert if the object is not already present, that
-	 * is an 'upsert'.
-	 * <p/>
-	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
-	 * If you object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
-	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
-	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See <a
-	 * http://docs.spring.io/spring/docs/current/spring-framework-reference/html/validation.html#core-convert">Spring's
-	 * Type Conversion"</a> for more details.
-	 *
-	 * @param objectToSave the object to store in the collection
-	 * @param collectionName name of the collection to store the object in
-	 * @return
-	 */
-	<T> Mono<T> save(Mono<? extends T> objectToSave, String collectionName);
-
-	/**
-	 * Performs an upsert. If no document is found that matches the query, a new document is created and inserted by
-	 * combining the query document and the update document.
-	 *
-	 * @param query the query document that specifies the criteria used to select a record to be upserted
-	 * @param update the update document that contains the updated object or $ operators to manipulate the existing object
-	 * @param entityClass class that determines the collection to use
-	 * @return the WriteResult which lets you access the results of the previous write.
-	 */
-	Mono<UpdateResult> upsert(Query query, Update update, Class<?> entityClass);
-
-	/**
-	 * Performs an upsert. If no document is found that matches the query, a new document is created and inserted by
-	 * combining the query document and the update document.
-	 *
-	 * @param query the query document that specifies the criteria used to select a record to be updated
-	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
-	 *          object.
-	 * @param collectionName name of the collection to update the object in
-	 * @return the WriteResult which lets you access the results of the previous write.
-	 */
-	Mono<UpdateResult> upsert(Query query, Update update, String collectionName);
-
-	/**
-	 * Performs an upsert. If no document is found that matches the query, a new document is created and inserted by
-	 * combining the query document and the update document.
-	 *
-	 * @param query the query document that specifies the criteria used to select a record to be upserted
-	 * @param update the update document that contains the updated object or $ operators to manipulate the existing object
-	 * @param entityClass class of the pojo to be operated on
-	 * @param collectionName name of the collection to update the object in
-	 * @return the WriteResult which lets you access the results of the previous write.
-	 */
-	Mono<UpdateResult> upsert(Query query, Update update, Class<?> entityClass, String collectionName);
-
-	/**
-	 * Updates the first object that is found in the collection of the entity class that matches the query document with
-	 * the provided update document.
-	 *
-	 * @param query the query document that specifies the criteria used to select a record to be updated
-	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
-	 *          object.
-	 * @param entityClass class that determines the collection to use
-	 * @return the WriteResult which lets you access the results of the previous write.
-	 */
-	Mono<UpdateResult> updateFirst(Query query, Update update, Class<?> entityClass);
-
-	/**
-	 * Updates the first object that is found in the specified collection that matches the query document criteria with
-	 * the provided updated document.
-	 *
-	 * @param query the query document that specifies the criteria used to select a record to be updated
-	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
-	 *          object.
-	 * @param collectionName name of the collection to update the object in
-	 * @return the WriteResult which lets you access the results of the previous write.
-	 */
-	Mono<UpdateResult> updateFirst(Query query, Update update, String collectionName);
-
-	/**
-	 * Updates the first object that is found in the specified collection that matches the query document criteria with
-	 * the provided updated document.
-	 *
-	 * @param query the query document that specifies the criteria used to select a record to be updated
-	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
-	 *          object.
-	 * @param entityClass class of the pojo to be operated on
-	 * @param collectionName name of the collection to update the object in
-	 * @return the WriteResult which lets you access the results of the previous write.
-	 */
-	Mono<UpdateResult> updateFirst(Query query, Update update, Class<?> entityClass, String collectionName);
-
-	/**
-	 * Updates all objects that are found in the collection for the entity class that matches the query document criteria
-	 * with the provided updated document.
-	 *
-	 * @param query the query document that specifies the criteria used to select a record to be updated
-	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
-	 *          object.
-	 * @param entityClass class that determines the collection to use
-	 * @return the WriteResult which lets you access the results of the previous write.
-	 */
-	Mono<UpdateResult> updateMulti(Query query, Update update, Class<?> entityClass);
-
-	/**
-	 * Updates all objects that are found in the specified collection that matches the query document criteria with the
-	 * provided updated document.
-	 *
-	 * @param query the query document that specifies the criteria used to select a record to be updated
-	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
-	 *          object.
-	 * @param collectionName name of the collection to update the object in
-	 * @return the WriteResult which lets you access the results of the previous write.
-	 */
-	Mono<UpdateResult> updateMulti(Query query, Update update, String collectionName);
-
-	/**
-	 * Updates all objects that are found in the collection for the entity class that matches the query document criteria
-	 * with the provided updated document.
-	 *
-	 * @param query the query document that specifies the criteria used to select a record to be updated
-	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
-	 *          object.
-	 * @param entityClass class of the pojo to be operated on
-	 * @param collectionName name of the collection to update the object in
-	 * @return the WriteResult which lets you access the results of the previous write.
-	 */
-	Mono<UpdateResult> updateMulti(final Query query, final Update update, Class<?> entityClass, String collectionName);
-
-	/**
-	 * Remove the given object from the collection by id.
-	 *
-	 * @param object
-	 * @return
-	 */
-	Mono<DeleteResult> remove(Object object);
-
-	/**
-	 * Removes the given object from the given collection.
-	 *
-	 * @param object
-	 * @param collection must not be {@literal null} or empty.
-	 */
-	Mono<DeleteResult> remove(Object object, String collection);
-
-	/**
-	 * Remove the given object from the collection by id.
-	 *
-	 * @param objectToRemove
-	 * @return
-	 */
-	Mono<DeleteResult> remove(Mono<? extends Object> objectToRemove);
-
-	/**
-	 * Removes the given object from the given collection.
-	 *
-	 * @param objectToRemove
-	 * @param collection must not be {@literal null} or empty.
-	 * @return
-	 */
-	Mono<DeleteResult> remove(Mono<? extends Object> objectToRemove, String collection);
-
-	/**
-	 * Remove all documents that match the provided query document criteria from the the collection used to store the
-	 * entityClass. The Class parameter is also used to help convert the Id of the object if it is present in the query.
-	 *
-	 * @param query
-	 * @param entityClass
-	 * @return
-	 */
-	Mono<DeleteResult> remove(Query query, Class<?> entityClass);
-
-	/**
-	 * Remove all documents that match the provided query document criteria from the the collection used to store the
-	 * entityClass. The Class parameter is also used to help convert the Id of the object if it is present in the query.
-	 *
-	 * @param query
-	 * @param entityClass
-	 * @param collectionName
-	 * @return
-	 */
-	Mono<DeleteResult> remove(Query query, Class<?> entityClass, String collectionName);
-
-	/**
-	 * Remove all documents from the specified collection that match the provided query document criteria. There is no
-	 * conversion/mapping done for any criteria using the id field.
-	 *
-	 * @param query the query document that specifies the criteria used to remove a record
-	 * @param collectionName name of the collection where the objects will removed
-	 */
-	Mono<DeleteResult> remove(Query query, String collectionName);
-
-	/**
-	 * Returns and removes all documents form the specified collection that match the provided query.
-	 *
-	 * @param query
-	 * @param collectionName
-	 * @return
-	 */
-	<T> Flux<T> findAllAndRemove(Query query, String collectionName);
-
-	/**
-	 * Returns and removes all documents matching the given query form the collection used to store the entityClass.
-	 *
-	 * @param query
-	 * @param entityClass
-	 * @return
-	 */
-	<T> Flux<T> findAllAndRemove(Query query, Class<T> entityClass);
-
-	/**
-	 * Returns and removes all documents that match the provided query document criteria from the the collection used to
-	 * store the entityClass. The Class parameter is also used to help convert the Id of the object if it is present in
-	 * the query.
-	 *
-	 * @param query
-	 * @param entityClass
-	 * @param collectionName
-	 * @return
-	 */
-	<T> Flux<T> findAllAndRemove(Query query, Class<T> entityClass, String collectionName);
-
-	/**
-	 * Map the results of an ad-hoc query on the collection for the entity class to a stream of objects of the specified
-	 * type. The stream uses a {@link com.mongodb.CursorType#TailableAwait tailable} cursor that may be an infinite
-	 * stream. The stream will not be completed unless the {@link org.reactivestreams.Subscription} is
-	 * {@link Subscription#cancel() canceled}.
-	 * <p/>
-	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
-	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
-	 * feature rich {@link Query}.
-	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
-	 *          specification
-	 * @param entityClass the parametrized type of the returned {@link Flux}.
-	 * @return the {@link Flux} of converted objects
-	 */
-	<T> Flux<T> tail(Query query, Class<T> entityClass);
-
-	/**
-	 * Map the results of an ad-hoc query on the collection for the entity class to a stream of objects of the specified
-	 * type. The stream uses a {@link com.mongodb.CursorType#TailableAwait tailable} cursor that may be an infinite
-	 * stream. The stream will not be completed unless the {@link org.reactivestreams.Subscription} is
-	 * {@link Subscription#cancel() canceled}.
-	 * <p/>
-	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
-	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
-	 * feature rich {@link Query}.
-	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
-	 *          specification
-	 * @param entityClass the parametrized type of the returned {@link Flux}.
-	 * @param collectionName name of the collection to retrieve the objects from
-	 * @return the {@link Flux} of converted objects
-	 */
-	<T> Flux<T> tail(Query query, Class<T> entityClass, String collectionName);
-
-	/**
-	 * Returns the underlying {@link MongoConverter}.
-	 *
-	 * @return
-	 */
-	MongoConverter getConverter();
-
-}

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

@@ -1,84 +0,0 @@
-/*
- * Copyright 2014-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 java.util.Set;
-
-import org.springframework.data.mongodb.core.script.ExecutableMongoScript;
-import org.springframework.data.mongodb.core.script.NamedMongoScript;
-
-import com.mongodb.DB;
-
-/**
- * Script operations on {@link com.mongodb.DB} level. Allows interaction with server side JavaScript functions.
- * 
- * @author Christoph Strobl
- * @author Oliver Gierke
- * @since 1.7
- */
-public interface ScriptOperations {
-
-	/**
-	 * Store given {@link ExecutableMongoScript} generating a syntheitcal name so that it can be called by it
-	 * subsequently.
-	 * 
-	 * @param script must not be {@literal null}.
-	 * @return {@link NamedMongoScript} with name under which the {@code JavaScript} function can be called.
-	 */
-	NamedMongoScript register(ExecutableMongoScript script);
-
-	/**
-	 * Registers the given {@link NamedMongoScript} in the database.
-	 * 
-	 * @param script the {@link NamedMongoScript} to be registered.
-	 * @return
-	 */
-	NamedMongoScript register(NamedMongoScript script);
-
-	/**
-	 * Executes the {@literal script} by either calling it via its {@literal name} or directly sending it.
-	 * 
-	 * @param script must not be {@literal null}.
-	 * @param args arguments to pass on for script execution.
-	 * @return the script evaluation result.
-	 * @throws org.springframework.dao.DataAccessException
-	 */
-	Object execute(ExecutableMongoScript script, Object... args);
-
-	/**
-	 * Call the {@literal JavaScript} by its name.
-	 * 
-	 * @param scriptName must not be {@literal null} or empty.
-	 * @param args
-	 * @return
-	 */
-	Object call(String scriptName, Object... args);
-
-	/**
-	 * Checks {@link DB} for existence of {@link ServerSideJavaScript} with given name.
-	 * 
-	 * @param scriptName must not be {@literal null} or empty.
-	 * @return false if no {@link ServerSideJavaScript} with given name exists.
-	 */
-	boolean exists(String scriptName);
-
-	/**
-	 * Returns names of {@literal JavaScript} functions that can be called.
-	 * 
-	 * @return empty {@link Set} if no scripts found.
-	 */
-	Set<String> getScriptNames();
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 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.
@@ -20,71 +20,101 @@ import java.net.UnknownHostException;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
+import org.springframework.data.authentication.UserCredentials;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 import com.mongodb.DB;
-import com.mongodb.MongoClient;
-import com.mongodb.MongoClientURI;
+import com.mongodb.Mongo;
+import com.mongodb.MongoException;
+import com.mongodb.MongoURI;
 import com.mongodb.WriteConcern;
-import com.mongodb.client.MongoDatabase;
 
 /**
- * Factory to create {@link DB} instances from a {@link MongoClient} instance.
+ * Factory to create {@link DB} instances from a {@link Mongo} instance.
  * 
  * @author Mark Pollack
  * @author Oliver Gierke
  * @author Thomas Darimont
- * @author Christoph Strobl
  */
 public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 
-	private final MongoClient mongoClient;
+	private final Mongo mongo;
 	private final String databaseName;
 	private final boolean mongoInstanceCreated;
+	private final UserCredentials credentials;
 	private final PersistenceExceptionTranslator exceptionTranslator;
+	private final String authenticationDatabaseName;
 
 	private WriteConcern writeConcern;
 
 	/**
-	 * Creates a new {@link SimpleMongoDbFactory} instance from the given {@link MongoClientURI}.
+	 * Create an instance of {@link SimpleMongoDbFactory} given the {@link Mongo} instance and database name.
+	 * 
+	 * @param mongo Mongo instance, must not be {@literal null}.
+	 * @param databaseName database name, not be {@literal null} or empty.
+	 */
+	public SimpleMongoDbFactory(Mongo mongo, String databaseName) {
+		this(mongo, databaseName, null);
+	}
+
+	/**
+	 * Create an instance of SimpleMongoDbFactory given the Mongo instance, database name, and username/password
+	 * 
+	 * @param mongo Mongo instance, must not be {@literal null}.
+	 * @param databaseName Database name, must not be {@literal null} or empty.
+	 * @param credentials username and password.
+	 */
+	public SimpleMongoDbFactory(Mongo mongo, String databaseName, UserCredentials credentials) {
+		this(mongo, databaseName, credentials, false, null);
+	}
+
+	/**
+	 * Create an instance of SimpleMongoDbFactory given the Mongo instance, database name, and username/password
+	 * 
+	 * @param mongo Mongo instance, must not be {@literal null}.
+	 * @param databaseName Database name, must not be {@literal null} or empty.
+	 * @param credentials username and password.
+	 * @param authenticationDatabaseName the database name to use for authentication
+	 */
+	public SimpleMongoDbFactory(Mongo mongo, String databaseName, UserCredentials credentials,
+			String authenticationDatabaseName) {
+		this(mongo, databaseName, credentials, false, authenticationDatabaseName);
+	}
+
+	/**
+	 * Creates a new {@link SimpleMongoDbFactory} instance from the given {@link MongoURI}.
 	 * 
 	 * @param uri must not be {@literal null}.
+	 * @throws MongoException
 	 * @throws UnknownHostException
-	 * @since 1.7
+	 * @see MongoURI
 	 */
-	public SimpleMongoDbFactory(MongoClientURI uri) {
-		this(new MongoClient(uri), uri.getDatabase(), true);
+	@SuppressWarnings("deprecation")
+	public SimpleMongoDbFactory(MongoURI uri) throws MongoException, UnknownHostException {
+		this(new Mongo(uri), uri.getDatabase(), new UserCredentials(uri.getUsername(), parseChars(uri.getPassword())),
+				true, uri.getDatabase());
 	}
 
-	/**
-	 * Creates a new {@link SimpleMongoDbFactory} instance from the given {@link MongoClient}.
-	 * 
-	 * @param mongoClient must not be {@literal null}.
-	 * @param databaseName must not be {@literal null}.
-	 * @since 1.7
-	 */
-	public SimpleMongoDbFactory(MongoClient mongoClient, String databaseName) {
-		this(mongoClient, databaseName, false);
-	}
+	private SimpleMongoDbFactory(Mongo mongo, String databaseName, UserCredentials credentials,
+			boolean mongoInstanceCreated, String authenticationDatabaseName) {
 
-	/**
-	 * @param client
-	 * @param databaseName
-	 * @param mongoInstanceCreated
-	 * @since 1.7
-	 */
-	private SimpleMongoDbFactory(MongoClient mongoClient, String databaseName, boolean mongoInstanceCreated) {
-
-		Assert.notNull(mongoClient, "MongoClient must not be null!");
-		Assert.hasText(databaseName, "Database name must not be empty!");
+		Assert.notNull(mongo, "Mongo must not be null");
+		Assert.hasText(databaseName, "Database name must not be empty");
 		Assert.isTrue(databaseName.matches("[\\w-]+"),
 				"Database name must only contain letters, numbers, underscores and dashes!");
 
-		this.mongoClient = mongoClient;
+		this.mongo = mongo;
 		this.databaseName = databaseName;
 		this.mongoInstanceCreated = mongoInstanceCreated;
+		this.credentials = credentials == null ? UserCredentials.NO_CREDENTIALS : credentials;
 		this.exceptionTranslator = new MongoExceptionTranslator();
+		this.authenticationDatabaseName = StringUtils.hasText(authenticationDatabaseName) ? authenticationDatabaseName
+				: databaseName;
+
+		Assert.isTrue(this.authenticationDatabaseName.matches("[\\w-]+"),
+				"Authentication database name must only contain letters, numbers, underscores and dashes!");
 	}
 
 	/**
@@ -100,7 +130,7 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.MongoDbFactory#getDb()
 	 */
-	public MongoDatabase getDb() throws DataAccessException {
+	public DB getDb() throws DataAccessException {
 		return getDb(databaseName);
 	}
 
@@ -108,17 +138,17 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.MongoDbFactory#getDb(java.lang.String)
 	 */
-	public MongoDatabase getDb(String dbName) throws DataAccessException {
+	public DB getDb(String dbName) throws DataAccessException {
 
 		Assert.hasText(dbName, "Database name must not be empty.");
 
-		MongoDatabase db = mongoClient.getDatabase(dbName);
+		DB db = MongoDbUtils.getDB(mongo, dbName, credentials, authenticationDatabaseName);
 
-		if (writeConcern == null) {
-			return db;
+		if (writeConcern != null) {
+			db.setWriteConcern(writeConcern);
 		}
 
-		return db.withWriteConcern(writeConcern);
+		return db;
 	}
 
 	/**
@@ -128,10 +158,14 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	 */
 	public void destroy() throws Exception {
 		if (mongoInstanceCreated) {
-			mongoClient.close();
+			mongo.close();
 		}
 	}
 
+	private static String parseChars(char[] chars) {
+		return chars == null ? null : String.valueOf(chars);
+	}
+
 	/* 
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.MongoDbFactory#getExceptionTranslator()
@@ -140,10 +174,4 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	public PersistenceExceptionTranslator getExceptionTranslator() {
 		return this.exceptionTranslator;
 	}
-
-	@SuppressWarnings("deprecation")
-	@Override
-	public DB getLegacyDb() {
-		return mongoClient.getDB(databaseName);
-	}
 }

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

@@ -1,134 +0,0 @@
-/*
- * 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.core;
-
-import java.net.UnknownHostException;
-
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.dao.DataAccessException;
-import org.springframework.dao.support.PersistenceExceptionTranslator;
-import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory;
-import org.springframework.util.Assert;
-
-import com.mongodb.ConnectionString;
-import com.mongodb.WriteConcern;
-import com.mongodb.reactivestreams.client.MongoClient;
-import com.mongodb.reactivestreams.client.MongoClients;
-import com.mongodb.reactivestreams.client.MongoDatabase;
-
-/**
- * Factory to create {@link MongoDatabase} instances from a {@link MongoClient} instance.
- *
- * @author Mark Paluch
- * @since 2.0
- */
-public class SimpleReactiveMongoDatabaseFactory implements DisposableBean, ReactiveMongoDatabaseFactory {
-
-	private final MongoClient mongo;
-	private final String databaseName;
-	private final boolean mongoInstanceCreated;
-	private final PersistenceExceptionTranslator exceptionTranslator;
-
-	private WriteConcern writeConcern;
-
-	/**
-	 * Creates a new {@link SimpleReactiveMongoDatabaseFactory} instance from the given {@link ConnectionString}.
-	 *
-	 * @param connectionString must not be {@literal null}.
-	 * @throws UnknownHostException
-	 */
-	public SimpleReactiveMongoDatabaseFactory(ConnectionString connectionString) throws UnknownHostException {
-		this(MongoClients.create(connectionString), connectionString.getDatabase(), true);
-	}
-
-	/**
-	 * Creates a new {@link SimpleReactiveMongoDatabaseFactory} instance from the given {@link MongoClient}.
-	 *
-	 * @param mongoClient must not be {@literal null}.
-	 * @param databaseName must not be {@literal null}.
-	 * @since 1.7
-	 */
-	public SimpleReactiveMongoDatabaseFactory(MongoClient mongoClient, String databaseName) {
-		this(mongoClient, databaseName, false);
-	}
-
-	private SimpleReactiveMongoDatabaseFactory(MongoClient client, String databaseName, boolean mongoInstanceCreated) {
-
-		Assert.notNull(client, "MongoClient must not be null!");
-		Assert.hasText(databaseName, "Database name must not be empty!");
-		Assert.isTrue(databaseName.matches("[\\w-]+"),
-				"Database name must only contain letters, numbers, underscores and dashes!");
-
-		this.mongo = client;
-		this.databaseName = databaseName;
-		this.mongoInstanceCreated = mongoInstanceCreated;
-		this.exceptionTranslator = new MongoExceptionTranslator();
-	}
-
-	/**
-	 * Configures the {@link WriteConcern} to be used on the {@link MongoDatabase} instance being created.
-	 *
-	 * @param writeConcern the writeConcern to set
-	 */
-	public void setWriteConcern(WriteConcern writeConcern) {
-		this.writeConcern = writeConcern;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.ReactiveMongoDbFactory#getMongoDatabase()
-	 */
-	public MongoDatabase getMongoDatabase() throws DataAccessException {
-		return getMongoDatabase(databaseName);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.ReactiveMongoDbFactory#getMongoDatabase(java.lang.String)
-	 */
-	public MongoDatabase getMongoDatabase(String dbName) throws DataAccessException {
-
-		Assert.hasText(dbName, "Database name must not be empty.");
-
-		MongoDatabase db = ReactiveMongoDbUtils.getMongoDatabase(mongo, dbName);
-
-		if (writeConcern != null) {
-
-			db = db.withWriteConcern(writeConcern);
-		}
-
-		return db;
-	}
-
-	/**
-	 * Clean up the Mongo instance if it was created by the factory itself.
-	 *
-	 * @see DisposableBean#destroy()
-	 */
-	public void destroy() throws Exception {
-		if (mongoInstanceCreated) {
-			mongo.close();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.ReactiveMongoDbFactory#getExceptionTranslator()
-	 */
-	public PersistenceExceptionTranslator getExceptionTranslator() {
-		return this.exceptionTranslator;
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 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.
@@ -17,12 +17,12 @@ package org.springframework.data.mongodb.core;
 
 /**
  * Enum to represent how strict the check of {@link com.mongodb.WriteResult} shall be. It can either be skipped entirely
- * (use {@link #NONE}) or cause an exception to be thrown {@link #EXCEPTION}.
- *
+ * (use {@link #NONE}), or errors can be logged ({@link #LOG}) or cause an exception to be thrown {@link #EXCEPTION}.
+ * 
  * @author Thomas Risberg
  * @author Oliver Gierke
  */
 public enum WriteResultChecking {
 
-	NONE, EXCEPTION
+	NONE, LOG, EXCEPTION
 }

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

@@ -1,151 +0,0 @@
-/*
- * 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.core.aggregation;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-
-import org.bson.Document;
-import org.springframework.util.ObjectUtils;
-
-/**
- * @author Christoph Strobl
- * @since 1.10
- */
-abstract class AbstractAggregationExpression implements AggregationExpression {
-
-	private final Object value;
-
-	protected AbstractAggregationExpression(Object value) {
-		this.value = value;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
-	@Override
-	public Document toDocument(AggregationOperationContext context) {
-		return toDocument(this.value, context);
-	}
-
-	@SuppressWarnings("unchecked")
-	public Document toDocument(Object value, AggregationOperationContext context) {
-
-		Object valueToUse;
-		if (value instanceof List) {
-
-			List<Object> arguments = (List<Object>) value;
-			List<Object> args = new ArrayList<Object>(arguments.size());
-
-			for (Object val : arguments) {
-				args.add(unpack(val, context));
-			}
-			valueToUse = args;
-		} else if (value instanceof java.util.Map) {
-
-			Document dbo = new Document();
-			for (java.util.Map.Entry<String, Object> entry : ((java.util.Map<String, Object>) value).entrySet()) {
-				dbo.put(entry.getKey(), unpack(entry.getValue(), context));
-			}
-			valueToUse = dbo;
-		} else {
-			valueToUse = unpack(value, context);
-		}
-
-		return new Document(getMongoMethod(), valueToUse);
-	}
-
-	protected static List<Field> asFields(String... fieldRefs) {
-
-		if (ObjectUtils.isEmpty(fieldRefs)) {
-			return Collections.emptyList();
-		}
-
-		return Fields.fields(fieldRefs).asList();
-	}
-
-	@SuppressWarnings("unchecked")
-	private Object unpack(Object value, AggregationOperationContext context) {
-
-		if (value instanceof AggregationExpression) {
-			return ((AggregationExpression) value).toDocument(context);
-		}
-
-		if (value instanceof Field) {
-			return context.getReference((Field) value).toString();
-		}
-
-		if (value instanceof List) {
-
-			List<Object> sourceList = (List<Object>) value;
-			List<Object> mappedList = new ArrayList<Object>(sourceList.size());
-
-			for (Object item : sourceList) {
-				mappedList.add(unpack(item, context));
-			}
-			return mappedList;
-		}
-
-		return value;
-	}
-
-	protected List<Object> append(Object value) {
-
-		if (this.value instanceof List) {
-
-			List<Object> clone = new ArrayList<Object>((List) this.value);
-
-			if (value instanceof List) {
-				for (Object val : (List) value) {
-					clone.add(val);
-				}
-			} else {
-				clone.add(value);
-			}
-			return clone;
-		}
-
-		return Arrays.asList(this.value, value);
-	}
-
-	@SuppressWarnings("unchecked")
-	protected java.util.Map<String, Object> append(String key, Object value) {
-
-		if (!(this.value instanceof java.util.Map)) {
-			throw new IllegalArgumentException("o_O");
-		}
-		java.util.Map<String, Object> clone = new LinkedHashMap<String, Object>((java.util.Map<String, Object>) this.value);
-		clone.put(key, value);
-		return clone;
-
-	}
-
-	protected List<Object> values() {
-
-		if (value instanceof List) {
-			return new ArrayList<Object>((List) value);
-		}
-		if (value instanceof java.util.Map) {
-			return new ArrayList<Object>(((java.util.Map) value).values());
-		}
-		return new ArrayList<Object>(Collections.singletonList(value));
-	}
-
-	protected abstract String getMongoMethod();
-}

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

@@ -1,647 +0,0 @@
-/*
- * 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.core.aggregation;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.bson.Document;
-import org.springframework.util.Assert;
-
-/**
- * Gateway to {@literal accumulator} aggregation operations.
- *
- * @author Christoph Strobl
- * @since 1.10
- * @soundtrack Rage Against The Machine - Killing In The Name
- */
-public class AccumulatorOperators {
-
-	/**
-	 * Take the numeric value referenced by given {@literal fieldReference}.
-	 *
-	 * @param fieldReference must not be {@literal null}.
-	 * @return
-	 */
-	public static AccumulatorOperatorFactory valueOf(String fieldReference) {
-		return new AccumulatorOperatorFactory(fieldReference);
-	}
-
-	/**
-	 * Take the numeric value referenced resulting from given {@link AggregationExpression}.
-	 *
-	 * @param expression must not be {@literal null}.
-	 * @return
-	 */
-	public static AccumulatorOperatorFactory valueOf(AggregationExpression expression) {
-		return new AccumulatorOperatorFactory(expression);
-	}
-
-	/**
-	 * @author Christoph Strobl
-	 */
-	public static class AccumulatorOperatorFactory {
-
-		private final String fieldReference;
-		private final AggregationExpression expression;
-
-		/**
-		 * Creates new {@link AccumulatorOperatorFactory} for given {@literal fieldReference}.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 */
-		public AccumulatorOperatorFactory(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			this.fieldReference = fieldReference;
-			this.expression = null;
-		}
-
-		/**
-		 * Creates new {@link AccumulatorOperatorFactory} for given {@link AggregationExpression}.
-		 *
-		 * @param expression must not be {@literal null}.
-		 */
-		public AccumulatorOperatorFactory(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			this.fieldReference = null;
-			this.expression = expression;
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that takes the associated numeric value expression and calculates and
-		 * returns the sum.
-		 *
-		 * @return
-		 */
-		public Sum sum() {
-			return usesFieldRef() ? Sum.sumOf(fieldReference) : Sum.sumOf(expression);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that takes the associated numeric value expression and returns the
-		 * average value.
-		 *
-		 * @return
-		 */
-		public Avg avg() {
-			return usesFieldRef() ? Avg.avgOf(fieldReference) : Avg.avgOf(expression);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that takes the associated numeric value expression and returns the
-		 * maximum value.
-		 *
-		 * @return
-		 */
-		public Max max() {
-			return usesFieldRef() ? Max.maxOf(fieldReference) : Max.maxOf(expression);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that takes the associated numeric value expression and returns the
-		 * minimum value.
-		 *
-		 * @return
-		 */
-		public Min min() {
-			return usesFieldRef() ? Min.minOf(fieldReference) : Min.minOf(expression);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that takes the associated numeric value expression and calculates the
-		 * population standard deviation of the input values.
-		 *
-		 * @return
-		 */
-		public StdDevPop stdDevPop() {
-			return usesFieldRef() ? StdDevPop.stdDevPopOf(fieldReference) : StdDevPop.stdDevPopOf(expression);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that takes the associated numeric value expression and calculates the
-		 * sample standard deviation of the input values.
-		 *
-		 * @return
-		 */
-		public StdDevSamp stdDevSamp() {
-			return usesFieldRef() ? StdDevSamp.stdDevSampOf(fieldReference) : StdDevSamp.stdDevSampOf(expression);
-		}
-
-		private boolean usesFieldRef() {
-			return fieldReference != null;
-		}
-	}
-
-	/**
-	 * {@link AggregationExpression} for {@code $sum}.
-	 *
-	 * @author Christoph Strobl
-	 */
-	public static class Sum extends AbstractAggregationExpression {
-
-		private Sum(Object value) {
-			super(value);
-		}
-
-		@Override
-		protected String getMongoMethod() {
-			return "$sum";
-		}
-
-		/**
-		 * Creates new {@link Sum}.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public static Sum sumOf(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Sum(asFields(fieldReference));
-		}
-
-		/**
-		 * Creates new {@link Sum}.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public static Sum sumOf(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Sum(Collections.singletonList(expression));
-		}
-
-		/**
-		 * Creates new {@link Sum} with all previously added arguments appending the given one. <br />
-		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public Sum and(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Sum(append(Fields.field(fieldReference)));
-		}
-
-		/**
-		 * Creates new {@link Sum} with all previously added arguments appending the given one. <br />
-		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public Sum and(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Sum(append(expression));
-		}
-
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDocument(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
-		@Override
-		@SuppressWarnings("unchecked")
-		public Document toDocument(Object value, AggregationOperationContext context) {
-
-			if (value instanceof List) {
-				if (((List) value).size() == 1) {
-					return super.toDocument(((List<Object>) value).iterator().next(), context);
-				}
-			}
-
-			return super.toDocument(value, context);
-		}
-	}
-
-	/**
-	 * {@link AggregationExpression} for {@code $avg}.
-	 *
-	 * @author Christoph Strobl
-	 */
-	public static class Avg extends AbstractAggregationExpression {
-
-		private Avg(Object value) {
-			super(value);
-		}
-
-		@Override
-		protected String getMongoMethod() {
-			return "$avg";
-		}
-
-		/**
-		 * Creates new {@link Avg}.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public static Avg avgOf(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Avg(asFields(fieldReference));
-		}
-
-		/**
-		 * Creates new {@link Avg}.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public static Avg avgOf(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Avg(Collections.singletonList(expression));
-		}
-
-		/**
-		 * Creates new {@link Avg} with all previously added arguments appending the given one. <br />
-		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public Avg and(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Avg(append(Fields.field(fieldReference)));
-		}
-
-		/**
-		 * Creates new {@link Avg} with all previously added arguments appending the given one. <br />
-		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public Avg and(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Avg(append(expression));
-		}
-
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDocument(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
-		@Override
-		@SuppressWarnings("unchecked")
-		public Document toDocument(Object value, AggregationOperationContext context) {
-
-			if (value instanceof List) {
-				if (((List) value).size() == 1) {
-					return super.toDocument(((List<Object>) value).iterator().next(), context);
-				}
-			}
-
-			return super.toDocument(value, context);
-		}
-	}
-
-	/**
-	 * {@link AggregationExpression} for {@code $max}.
-	 *
-	 * @author Christoph Strobl
-	 */
-	public static class Max extends AbstractAggregationExpression {
-
-		private Max(Object value) {
-			super(value);
-		}
-
-		@Override
-		protected String getMongoMethod() {
-			return "$max";
-		}
-
-		/**
-		 * Creates new {@link Max}.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public static Max maxOf(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Max(asFields(fieldReference));
-		}
-
-		/**
-		 * Creates new {@link Max}.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public static Max maxOf(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Max(Collections.singletonList(expression));
-		}
-
-		/**
-		 * Creates new {@link Max} with all previously added arguments appending the given one. <br />
-		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public Max and(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Max(append(Fields.field(fieldReference)));
-		}
-
-		/**
-		 * Creates new {@link Max} with all previously added arguments appending the given one. <br />
-		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public Max and(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Max(append(expression));
-		}
-
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDocument(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
-		@Override
-		@SuppressWarnings("unchecked")
-		public Document toDocument(Object value, AggregationOperationContext context) {
-
-			if (value instanceof List) {
-				if (((List) value).size() == 1) {
-					return super.toDocument(((List<Object>) value).iterator().next(), context);
-				}
-			}
-
-			return super.toDocument(value, context);
-		}
-	}
-
-	/**
-	 * {@link AggregationExpression} for {@code $min}.
-	 *
-	 * @author Christoph Strobl
-	 */
-	public static class Min extends AbstractAggregationExpression {
-
-		private Min(Object value) {
-			super(value);
-		}
-
-		@Override
-		protected String getMongoMethod() {
-			return "$min";
-		}
-
-		/**
-		 * Creates new {@link Min}.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public static Min minOf(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Min(asFields(fieldReference));
-		}
-
-		/**
-		 * Creates new {@link Min}.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public static Min minOf(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Min(Collections.singletonList(expression));
-		}
-
-		/**
-		 * Creates new {@link Min} with all previously added arguments appending the given one. <br />
-		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public Min and(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Min(append(Fields.field(fieldReference)));
-		}
-
-		/**
-		 * Creates new {@link Min} with all previously added arguments appending the given one. <br />
-		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public Min and(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Min(append(expression));
-		}
-
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDocument(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
-		@Override
-		@SuppressWarnings("unchecked")
-		public Document toDocument(Object value, AggregationOperationContext context) {
-
-			if (value instanceof List) {
-				if (((List) value).size() == 1) {
-					return super.toDocument(((List<Object>) value).iterator().next(), context);
-				}
-			}
-
-			return super.toDocument(value, context);
-		}
-	}
-
-	/**
-	 * {@link AggregationExpression} for {@code $stdDevPop}.
-	 *
-	 * @author Christoph Strobl
-	 */
-	public static class StdDevPop extends AbstractAggregationExpression {
-
-		private StdDevPop(Object value) {
-			super(value);
-		}
-
-		@Override
-		protected String getMongoMethod() {
-			return "$stdDevPop";
-		}
-
-		/**
-		 * Creates new {@link StdDevPop}.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public static StdDevPop stdDevPopOf(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new StdDevPop(asFields(fieldReference));
-		}
-
-		/**
-		 * Creates new {@link StdDevPop} with all previously added arguments appending the given one.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public static StdDevPop stdDevPopOf(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new StdDevPop(Collections.singletonList(expression));
-		}
-
-		/**
-		 * Creates new {@link StdDevPop} with all previously added arguments appending the given one. <br/>
-		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public StdDevPop and(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new StdDevPop(append(Fields.field(fieldReference)));
-		}
-
-		/**
-		 * Creates new {@link StdDevSamp} with all previously added arguments appending the given one. <br />
-		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public StdDevPop and(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new StdDevPop(append(expression));
-		}
-
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDocument(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
-		@Override
-		@SuppressWarnings("unchecked")
-		public Document toDocument(Object value, AggregationOperationContext context) {
-
-			if (value instanceof List) {
-				if (((List) value).size() == 1) {
-					return super.toDocument(((List<Object>) value).iterator().next(), context);
-				}
-			}
-
-			return super.toDocument(value, context);
-		}
-	}
-
-	/**
-	 * {@link AggregationExpression} for {@code $stdDevSamp}.
-	 *
-	 * @author Christoph Strobl
-	 */
-	public static class StdDevSamp extends AbstractAggregationExpression {
-
-		private StdDevSamp(Object value) {
-			super(value);
-		}
-
-		@Override
-		protected String getMongoMethod() {
-			return "$stdDevSamp";
-		}
-
-		/**
-		 * Creates new {@link StdDevSamp}.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public static StdDevSamp stdDevSampOf(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new StdDevSamp(asFields(fieldReference));
-		}
-
-		/**
-		 * Creates new {@link StdDevSamp}.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public static StdDevSamp stdDevSampOf(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new StdDevSamp(Collections.singletonList(expression));
-		}
-
-		/**
-		 * Creates new {@link StdDevSamp} with all previously added arguments appending the given one. <br />
-		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public StdDevSamp and(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new StdDevSamp(append(Fields.field(fieldReference)));
-		}
-
-		/**
-		 * Creates new {@link StdDevSamp} with all previously added arguments appending the given one. <br />
-		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public StdDevSamp and(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new StdDevSamp(append(expression));
-		}
-
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDocument(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
-		@Override
-		@SuppressWarnings("unchecked")
-		public Document toDocument(Object value, AggregationOperationContext context) {
-
-			if (value instanceof List) {
-				if (((List) value).size() == 1) {
-					return super.toDocument(((List<Object>) value).iterator().next(), context);
-				}
-			}
-
-			return super.toDocument(value, context);
-		}
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * 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.
@@ -21,61 +21,36 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.bson.Document;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
-import org.springframework.data.mongodb.core.aggregation.CountOperation.CountOperationBuilder;
-import org.springframework.data.mongodb.core.aggregation.ExposedFields.DirectFieldReference;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
-import org.springframework.data.mongodb.core.aggregation.FacetOperation.FacetOperationBuilder;
-import org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation.InheritsFieldsAggregationOperation;
-import org.springframework.data.mongodb.core.aggregation.GraphLookupOperation.StartWithBuilder;
-import org.springframework.data.mongodb.core.aggregation.ReplaceRootOperation.ReplaceRootDocumentOperationBuilder;
-import org.springframework.data.mongodb.core.aggregation.ReplaceRootOperation.ReplaceRootOperationBuilder;
-import org.springframework.data.mongodb.core.aggregation.Fields.*;
+import org.springframework.data.mongodb.core.aggregation.Fields.AggregationField;
 import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.CriteriaDefinition;
-import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.SerializationUtils;
 import org.springframework.util.Assert;
 
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
 /**
  * An {@code Aggregation} is a representation of a list of aggregation steps to be performed by the MongoDB Aggregation
  * Framework.
- *
+ * 
  * @author Tobias Trelle
  * @author Thomas Darimont
  * @author Oliver Gierke
- * @author Mark Paluch
- * @author Alessio Fachechi
- * @author Christoph Strobl
- * @author Nikolay Bogdanov
  * @since 1.3
  */
 public class Aggregation {
 
-	/**
-	 * References the root document, i.e. the top-level document, currently being processed in the aggregation pipeline
-	 * stage.
-	 */
-	public static final String ROOT = SystemVariable.ROOT.toString();
+	public static final AggregationOperationContext DEFAULT_CONTEXT = new NoOpAggregationOperationContext();
 
-	/**
-	 * References the start of the field path being processed in the aggregation pipeline stage. Unless documented
-	 * otherwise, all stages start with CURRENT the same as ROOT.
-	 */
-	public static final String CURRENT = SystemVariable.CURRENT.toString();
-
-	public static final AggregationOperationContext DEFAULT_CONTEXT = AggregationOperationRenderer.DEFAULT_CONTEXT;
-	public static final AggregationOptions DEFAULT_OPTIONS = newAggregationOptions().build();
-
-	protected final List<AggregationOperation> operations;
-	private final AggregationOptions options;
+	private final List<AggregationOperation> operations;
 
 	/**
 	 * Creates a new {@link Aggregation} from the given {@link AggregationOperation}s.
-	 *
+	 * 
 	 * @param operations must not be {@literal null} or empty.
 	 */
 	public static Aggregation newAggregation(List<? extends AggregationOperation> operations) {
@@ -84,30 +59,16 @@ public class Aggregation {
 
 	/**
 	 * Creates a new {@link Aggregation} from the given {@link AggregationOperation}s.
-	 *
+	 * 
 	 * @param operations must not be {@literal null} or empty.
 	 */
 	public static Aggregation newAggregation(AggregationOperation... operations) {
 		return new Aggregation(operations);
 	}
 
-	/**
-	 * Returns a copy of this {@link Aggregation} with the given {@link AggregationOptions} set. Note that options are
-	 * supported in MongoDB version 2.6+.
-	 *
-	 * @param options must not be {@literal null}.
-	 * @return
-	 * @since 1.6
-	 */
-	public Aggregation withOptions(AggregationOptions options) {
-
-		Assert.notNull(options, "AggregationOptions must not be null.");
-		return new Aggregation(this.operations, options);
-	}
-
 	/**
 	 * Creates a new {@link TypedAggregation} for the given type and {@link AggregationOperation}s.
-	 *
+	 * 
 	 * @param type must not be {@literal null}.
 	 * @param operations must not be {@literal null} or empty.
 	 */
@@ -117,7 +78,7 @@ public class Aggregation {
 
 	/**
 	 * Creates a new {@link TypedAggregation} for the given type and {@link AggregationOperation}s.
-	 *
+	 * 
 	 * @param type must not be {@literal null}.
 	 * @param operations must not be {@literal null} or empty.
 	 */
@@ -127,63 +88,20 @@ public class Aggregation {
 
 	/**
 	 * Creates a new {@link Aggregation} from the given {@link AggregationOperation}s.
-	 *
+	 * 
 	 * @param aggregationOperations must not be {@literal null} or empty.
 	 */
 	protected Aggregation(AggregationOperation... aggregationOperations) {
-		this(asAggregationList(aggregationOperations));
-	}
-
-	/**
-	 * @param aggregationOperations must not be {@literal null} or empty.
-	 * @return
-	 */
-	protected static List<AggregationOperation> asAggregationList(AggregationOperation... aggregationOperations) {
-
-		Assert.notEmpty(aggregationOperations, "AggregationOperations must not be null or empty!");
-
-		return Arrays.asList(aggregationOperations);
-	}
-
-	/**
-	 * Creates a new {@link Aggregation} from the given {@link AggregationOperation}s.
-	 *
-	 * @param aggregationOperations must not be {@literal null} or empty.
-	 */
-	protected Aggregation(List<AggregationOperation> aggregationOperations) {
-		this(aggregationOperations, DEFAULT_OPTIONS);
-	}
-
-	/**
-	 * Creates a new {@link Aggregation} from the given {@link AggregationOperation}s.
-	 *
-	 * @param aggregationOperations must not be {@literal null} or empty.
-	 * @param options must not be {@literal null} or empty.
-	 */
-	protected Aggregation(List<AggregationOperation> aggregationOperations, AggregationOptions options) {
 
 		Assert.notNull(aggregationOperations, "AggregationOperations must not be null!");
-		Assert.isTrue(!aggregationOperations.isEmpty(), "At least one AggregationOperation has to be provided");
-		Assert.notNull(options, "AggregationOptions must not be null!");
+		Assert.isTrue(aggregationOperations.length > 0, "At least one AggregationOperation has to be provided");
 
-		// check $out is the last operation if it exists
-		for (AggregationOperation aggregationOperation : aggregationOperations) {
-			if (aggregationOperation instanceof OutOperation && !isLast(aggregationOperation, aggregationOperations)) {
-				throw new IllegalArgumentException("The $out operator must be the last stage in the pipeline.");
-			}
-		}
-
-		this.operations = aggregationOperations;
-		this.options = options;
-	}
-
-	private boolean isLast(AggregationOperation aggregationOperation, List<AggregationOperation> aggregationOperations) {
-		return aggregationOperations.indexOf(aggregationOperation) == aggregationOperations.size() - 1;
+		this.operations = Arrays.asList(aggregationOperations);
 	}
 
 	/**
 	 * A pointer to the previous {@link AggregationOperation}.
-	 *
+	 * 
 	 * @return
 	 */
 	public static String previousOperation() {
@@ -192,7 +110,7 @@ public class Aggregation {
 
 	/**
 	 * Creates a new {@link ProjectionOperation} including the given fields.
-	 *
+	 * 
 	 * @param fields must not be {@literal null}.
 	 * @return
 	 */
@@ -201,8 +119,8 @@ public class Aggregation {
 	}
 
 	/**
-	 * Creates a new {@link ProjectionOperation} including the given {@link Fields}.
-	 *
+	 * Creates a new {@link ProjectionOperation} includeing the given {@link Fields}.
+	 * 
 	 * @param fields must not be {@literal null}.
 	 * @return
 	 */
@@ -212,95 +130,17 @@ public class Aggregation {
 
 	/**
 	 * Factory method to create a new {@link UnwindOperation} for the field with the given name.
-	 *
-	 * @param field must not be {@literal null} or empty.
+	 * 
+	 * @param fieldName must not be {@literal null} or empty.
 	 * @return
 	 */
 	public static UnwindOperation unwind(String field) {
 		return new UnwindOperation(field(field));
 	}
 
-	/**
-	 * Factory method to create a new {@link ReplaceRootOperation} for the field with the given name.
-	 *
-	 * @param fieldName must not be {@literal null} or empty.
-	 * @return
-	 * @since 1.10
-	 */
-	public static ReplaceRootOperation replaceRoot(String fieldName) {
-		return ReplaceRootOperation.builder().withValueOf(fieldName);
-	}
-
-	/**
-	 * Factory method to create a new {@link ReplaceRootOperation} for the field with the given
-	 * {@link AggregationExpression}.
-	 *
-	 * @param aggregationExpression must not be {@literal null}.
-	 * @return
-	 * @since 1.10
-	 */
-	public static ReplaceRootOperation replaceRoot(AggregationExpression aggregationExpression) {
-		return ReplaceRootOperation.builder().withValueOf(aggregationExpression);
-	}
-
-	/**
-	 * Factory method to create a new {@link ReplaceRootDocumentOperationBuilder} to configure a
-	 * {@link ReplaceRootOperation}.
-	 *
-	 * @return the {@literal ReplaceRootDocumentOperationBuilder}.
-	 * @since 1.10
-	 */
-	public static ReplaceRootOperationBuilder replaceRoot() {
-		return ReplaceRootOperation.builder();
-	}
-
-	/**
-	 * Factory method to create a new {@link UnwindOperation} for the field with the given name and
-	 * {@code preserveNullAndEmptyArrays}. Note that extended unwind is supported in MongoDB version 3.2+.
-	 *
-	 * @param field must not be {@literal null} or empty.
-	 * @param preserveNullAndEmptyArrays {@literal true} to output the document if path is {@literal null}, missing or
-	 *          array is empty.
-	 * @return new {@link UnwindOperation}
-	 * @since 1.10
-	 */
-	public static UnwindOperation unwind(String field, boolean preserveNullAndEmptyArrays) {
-		return new UnwindOperation(field(field), preserveNullAndEmptyArrays);
-	}
-
-	/**
-	 * Factory method to create a new {@link UnwindOperation} for the field with the given name including the name of a
-	 * new field to hold the array index of the element as {@code arrayIndex}. Note that extended unwind is supported in
-	 * MongoDB version 3.2+.
-	 *
-	 * @param field must not be {@literal null} or empty.
-	 * @param arrayIndex must not be {@literal null} or empty.
-	 * @return new {@link UnwindOperation}
-	 * @since 1.10
-	 */
-	public static UnwindOperation unwind(String field, String arrayIndex) {
-		return new UnwindOperation(field(field), field(arrayIndex), false);
-	}
-
-	/**
-	 * Factory method to create a new {@link UnwindOperation} for the field with the given nameincluding the name of a new
-	 * field to hold the array index of the element as {@code arrayIndex} using {@code preserveNullAndEmptyArrays}. Note
-	 * that extended unwind is supported in MongoDB version 3.2+.
-	 *
-	 * @param field must not be {@literal null} or empty.
-	 * @param arrayIndex must not be {@literal null} or empty.
-	 * @param preserveNullAndEmptyArrays {@literal true} to output the document if path is {@literal null}, missing or
-	 *          array is empty.
-	 * @return new {@link UnwindOperation}
-	 * @since 1.10
-	 */
-	public static UnwindOperation unwind(String field, String arrayIndex, boolean preserveNullAndEmptyArrays) {
-		return new UnwindOperation(field(field), field(arrayIndex), preserveNullAndEmptyArrays);
-	}
-
 	/**
 	 * Creates a new {@link GroupOperation} for the given fields.
-	 *
+	 * 
 	 * @param fields must not be {@literal null}.
 	 * @return
 	 */
@@ -310,7 +150,7 @@ public class Aggregation {
 
 	/**
 	 * Creates a new {@link GroupOperation} for the given {@link Fields}.
-	 *
+	 * 
 	 * @param fields must not be {@literal null}.
 	 * @return
 	 */
@@ -318,21 +158,9 @@ public class Aggregation {
 		return new GroupOperation(fields);
 	}
 
-	/**
-	 * Creates a new {@link GraphLookupOperation.GraphLookupOperationFromBuilder} to construct a
-	 * {@link GraphLookupOperation} given {@literal fromCollection}.
-	 *
-	 * @param fromCollection must not be {@literal null} or empty.
-	 * @return
-	 * @since 1.10
-	 */
-	public static StartWithBuilder graphLookup(String fromCollection) {
-		return GraphLookupOperation.builder().from(fromCollection);
-	}
-
 	/**
 	 * Factory method to create a new {@link SortOperation} for the given {@link Sort}.
-	 *
+	 * 
 	 * @param sort must not be {@literal null}.
 	 * @return
 	 */
@@ -342,7 +170,7 @@ public class Aggregation {
 
 	/**
 	 * Factory method to create a new {@link SortOperation} for the given sort {@link Direction} and {@code fields}.
-	 *
+	 * 
 	 * @param direction must not be {@literal null}.
 	 * @param fields must not be {@literal null}.
 	 * @return
@@ -353,28 +181,17 @@ public class Aggregation {
 
 	/**
 	 * Creates a new {@link SkipOperation} skipping the given number of elements.
-	 *
+	 * 
 	 * @param elementsToSkip must not be less than zero.
 	 * @return
-	 * @deprecated prepare to get this one removed in favor of {@link #skip(long)}.
 	 */
 	public static SkipOperation skip(int elementsToSkip) {
 		return new SkipOperation(elementsToSkip);
 	}
 
-	/**
-	 * Creates a new {@link SkipOperation} skipping the given number of elements.
-	 *
-	 * @param elementsToSkip must not be less than zero.
-	 * @return
-	 */
-	public static SkipOperation skip(long elementsToSkip) {
-		return new SkipOperation(elementsToSkip);
-	}
-
 	/**
 	 * Creates a new {@link LimitOperation} limiting the result to the given number of elements.
-	 *
+	 * 
 	 * @param maxElements must not be less than zero.
 	 * @return
 	 */
@@ -384,7 +201,7 @@ public class Aggregation {
 
 	/**
 	 * Creates a new {@link MatchOperation} using the given {@link Criteria}.
-	 *
+	 * 
 	 * @param criteria must not be {@literal null}.
 	 * @return
 	 */
@@ -392,142 +209,12 @@ public class Aggregation {
 		return new MatchOperation(criteria);
 	}
 
-	/**
-	 * Creates a new {@link MatchOperation} using the given {@link CriteriaDefinition}.
-	 *
-	 * @param criteria must not be {@literal null}.
-	 * @return
-	 * @since 1.10
-	 */
-	public static MatchOperation match(CriteriaDefinition criteria) {
-		return new MatchOperation(criteria);
-	}
-
-	/**
-	 * Creates a new {@link OutOperation} using the given collection name. This operation must be the last operation in
-	 * the pipeline.
-	 *
-	 * @param outCollectionName collection name to export aggregation results. The {@link OutOperation} creates a new
-	 *          collection in the current database if one does not already exist. The collection is not visible until the
-	 *          aggregation completes. If the aggregation fails, MongoDB does not create the collection. Must not be
-	 *          {@literal null}.
-	 * @return
-	 */
-	public static OutOperation out(String outCollectionName) {
-		return new OutOperation(outCollectionName);
-	}
-
-	/**
-	 * Creates a new {@link BucketOperation} given {@literal groupByField}.
-	 *
-	 * @param groupByField must not be {@literal null} or empty.
-	 * @return
-	 * @since 1.10
-	 */
-	public static BucketOperation bucket(String groupByField) {
-		return new BucketOperation(field(groupByField));
-	}
-
-	/**
-	 * Creates a new {@link BucketOperation} given {@link AggregationExpression group-by expression}.
-	 *
-	 * @param groupByExpression must not be {@literal null}.
-	 * @return
-	 * @since 1.10
-	 */
-	public static BucketOperation bucket(AggregationExpression groupByExpression) {
-		return new BucketOperation(groupByExpression);
-	}
-
-	/**
-	 * Creates a new {@link BucketAutoOperation} given {@literal groupByField}.
-	 *
-	 * @param groupByField must not be {@literal null} or empty.
-	 * @param buckets number of buckets, must be a positive integer.
-	 * @return
-	 * @since 1.10
-	 */
-	public static BucketAutoOperation bucketAuto(String groupByField, int buckets) {
-		return new BucketAutoOperation(field(groupByField), buckets);
-	}
-
-	/**
-	 * Creates a new {@link BucketAutoOperation} given {@link AggregationExpression group-by expression}.
-	 *
-	 * @param groupByExpression must not be {@literal null}.
-	 * @param buckets number of buckets, must be a positive integer.
-	 * @return
-	 * @since 1.10
-	 */
-	public static BucketAutoOperation bucketAuto(AggregationExpression groupByExpression, int buckets) {
-		return new BucketAutoOperation(groupByExpression, buckets);
-	}
-
-	/**
-	 * Creates a new {@link FacetOperation}.
-	 *
-	 * @return
-	 * @since 1.10
-	 */
-	public static FacetOperation facet() {
-		return FacetOperation.EMPTY;
-	}
-
-	/**
-	 * Creates a new {@link FacetOperationBuilder} given {@link Aggregation}.
-	 *
-	 * @param aggregationOperations the sub-pipeline, must not be {@literal null}.
-	 * @return
-	 * @since 1.10
-	 */
-	public static FacetOperationBuilder facet(AggregationOperation... aggregationOperations) {
-		return facet().and(aggregationOperations);
-	}
-
-	/**
-	 * Creates a new {@link LookupOperation}.
-	 *
-	 * @param from must not be {@literal null}.
-	 * @param localField must not be {@literal null}.
-	 * @param foreignField must not be {@literal null}.
-	 * @param as must not be {@literal null}.
-	 * @return never {@literal null}.
-	 * @since 1.9
-	 */
-	public static LookupOperation lookup(String from, String localField, String foreignField, String as) {
-		return lookup(field(from), field(localField), field(foreignField), field(as));
-	}
-
-	/**
-	 * Creates a new {@link LookupOperation} for the given {@link Fields}.
-	 *
-	 * @param from must not be {@literal null}.
-	 * @param localField must not be {@literal null}.
-	 * @param foreignField must not be {@literal null}.
-	 * @param as must not be {@literal null}.
-	 * @return never {@literal null}.
-	 * @since 1.9
-	 */
-	public static LookupOperation lookup(Field from, Field localField, Field foreignField, Field as) {
-		return new LookupOperation(from, localField, foreignField, as);
-	}
-
-	/**
-	 * Creates a new {@link CountOperationBuilder}.
-	 *
-	 * @return never {@literal null}.
-	 * @since 1.10
-	 */
-	public static CountOperationBuilder count() {
-		return new CountOperationBuilder();
-	}
-
 	/**
 	 * Creates a new {@link Fields} instance for the given field names.
-	 *
+	 * 
+	 * @see Fields#fields(String...)
 	 * @param fields must not be {@literal null}.
 	 * @return
-	 * @see Fields#fields(String...)
 	 */
 	public static Fields fields(String... fields) {
 		return Fields.fields(fields);
@@ -535,7 +222,7 @@ public class Aggregation {
 
 	/**
 	 * Creates a new {@link Fields} instance from the given field name and target reference.
-	 *
+	 * 
 	 * @param name must not be {@literal null} or empty.
 	 * @param target must not be {@literal null} or empty.
 	 * @return
@@ -545,43 +232,29 @@ public class Aggregation {
 	}
 
 	/**
-	 * Creates a new {@link GeoNearOperation} instance from the given {@link NearQuery} and the{@code distanceField}. The
-	 * {@code distanceField} defines output field that contains the calculated distance.
-	 *
-	 * @param query must not be {@literal null}.
-	 * @param distanceField must not be {@literal null} or empty.
-	 * @return
-	 * @since 1.7
-	 */
-	public static GeoNearOperation geoNear(NearQuery query, String distanceField) {
-		return new GeoNearOperation(query, distanceField);
-	}
-
-	/**
-	 * Returns a new {@link AggregationOptions.Builder}.
-	 *
-	 * @return
-	 * @since 1.6
-	 */
-	public static AggregationOptions.Builder newAggregationOptions() {
-		return new AggregationOptions.Builder();
-	}
-
-	/**
-	 * Converts this {@link Aggregation} specification to a {@link Document}.
-	 *
+	 * Converts this {@link Aggregation} specification to a {@link DBObject}.
+	 * 
 	 * @param inputCollectionName the name of the input collection
-	 * @return the {@code Document} representing this aggregation
+	 * @return the {@code DBObject} representing this aggregation
 	 */
-	public Document toDocument(String inputCollectionName, AggregationOperationContext rootContext) {
+	public DBObject toDbObject(String inputCollectionName, AggregationOperationContext rootContext) {
 
-		List<Document> operationDocuments = AggregationOperationRenderer.toDocument(operations, rootContext);
+		AggregationOperationContext context = rootContext;
+		List<DBObject> operationDocuments = new ArrayList<DBObject>(operations.size());
 
-		Document command = new Document("aggregate", inputCollectionName);
+		for (AggregationOperation operation : operations) {
+
+			operationDocuments.add(operation.toDBObject(context));
+
+			if (operation instanceof FieldsExposingAggregationOperation) {
+				FieldsExposingAggregationOperation exposedFieldsOperation = (FieldsExposingAggregationOperation) operation;
+				context = new ExposedFieldsAggregationOperationContext(exposedFieldsOperation.getFields(), rootContext);
+			}
+		}
+
+		DBObject command = new BasicDBObject("aggregate", inputCollectionName);
 		command.put("pipeline", operationDocuments);
 
-		command = options.applyAndReturnPotentiallyChangedCommand(command);
-
 		return command;
 	}
 
@@ -591,53 +264,42 @@ public class Aggregation {
 	 */
 	@Override
 	public String toString() {
-		return SerializationUtils.serializeToJsonSafely(toDocument("__collection__", DEFAULT_CONTEXT));
+		return SerializationUtils
+				.serializeToJsonSafely(toDbObject("__collection__", new NoOpAggregationOperationContext()));
 	}
 
 	/**
-	 * Describes the system variables available in MongoDB aggregation framework pipeline expressions.
-	 *
-	 * @author Thomas Darimont
-	 * @see <a href="https://docs.mongodb.org/manual/reference/aggregation-variables">Aggregation Variables</a>
+	 * Simple {@link AggregationOperationContext} that just returns {@link FieldReference}s as is.
+	 * 
+	 * @author Oliver Gierke
 	 */
-	enum SystemVariable {
+	private static class NoOpAggregationOperationContext implements AggregationOperationContext {
 
-		ROOT, CURRENT;
-
-		private static final String PREFIX = "$$";
-
-		/**
-		 * Return {@literal true} if the given {@code fieldRef} denotes a well-known system variable, {@literal false}
-		 * otherwise.
-		 *
-		 * @param fieldRef may be {@literal null}.
-		 * @return
-		 */
-		public static boolean isReferingToSystemVariable(String fieldRef) {
-
-			if (fieldRef == null || !fieldRef.startsWith(PREFIX) || fieldRef.length() <= 2) {
-				return false;
-			}
-
-			int indexOfFirstDot = fieldRef.indexOf('.');
-			String candidate = fieldRef.substring(2, indexOfFirstDot == -1 ? fieldRef.length() : indexOfFirstDot);
-
-			for (SystemVariable value : values()) {
-				if (value.name().equals(candidate)) {
-					return true;
-				}
-			}
-
-			return false;
-		}
-
-		/*
+		/* 
 		 * (non-Javadoc)
-		 * @see java.lang.Enum#toString()
+		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(com.mongodb.DBObject)
 		 */
 		@Override
-		public String toString() {
-			return PREFIX.concat(name());
+		public DBObject getMappedObject(DBObject dbObject) {
+			return dbObject;
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(org.springframework.data.mongodb.core.aggregation.ExposedFields.AvailableField)
+		 */
+		@Override
+		public FieldReference getReference(Field field) {
+			return new FieldReference(new ExposedField(field, true));
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(java.lang.String)
+		 */
+		@Override
+		public FieldReference getReference(String name) {
+			return new FieldReference(new ExposedField(new AggregationField(name), true));
 		}
 	}
 }

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

@@ -15,7 +15,6 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import org.bson.Document;
 import org.springframework.data.mongodb.core.aggregation.AggregationExpressionTransformer.AggregationExpressionTransformationContext;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
 import org.springframework.data.mongodb.core.spel.ExpressionNode;
@@ -23,16 +22,16 @@ import org.springframework.data.mongodb.core.spel.ExpressionTransformationContex
 import org.springframework.data.mongodb.core.spel.ExpressionTransformer;
 import org.springframework.util.Assert;
 
+import com.mongodb.DBObject;
+
 /**
  * Interface to type an {@link ExpressionTransformer} to the contained
  * {@link AggregationExpressionTransformationContext}.
  * 
  * @author Oliver Gierke
- * @author Christoph Strobl
- * @since 1.4
  */
-interface AggregationExpressionTransformer
-		extends ExpressionTransformer<AggregationExpressionTransformationContext<ExpressionNode>> {
+interface AggregationExpressionTransformer extends
+		ExpressionTransformer<AggregationExpressionTransformationContext<ExpressionNode>> {
 
 	/**
 	 * A special {@link ExpressionTransformationContextSupport} to be aware of the {@link AggregationOperationContext}.
@@ -40,8 +39,8 @@ interface AggregationExpressionTransformer
 	 * @author Oliver Gierke
 	 * @author Thomas Darimont
 	 */
-	class AggregationExpressionTransformationContext<T extends ExpressionNode>
-			extends ExpressionTransformationContextSupport<T> {
+	public static class AggregationExpressionTransformationContext<T extends ExpressionNode> extends
+			ExpressionTransformationContextSupport<T> {
 
 		private final AggregationOperationContext aggregationContext;
 
@@ -54,7 +53,7 @@ interface AggregationExpressionTransformer
 		 * @param aggregationContext must not be {@literal null}.
 		 */
 		public AggregationExpressionTransformationContext(T currentNode, ExpressionNode parentNode,
-				Document previousOperationObject, AggregationOperationContext context) {
+				DBObject previousOperationObject, AggregationOperationContext context) {
 
 			super(currentNode, parentNode, previousOperationObject);
 

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

@@ -1,108 +0,0 @@
-/*
- * Copyright 2015-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.core.aggregation;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.bson.Document;
-import org.springframework.util.Assert;
-
-/**
- * An enum of supported {@link AggregationExpression}s in aggregation pipeline stages.
- * 
- * @author Thomas Darimont
- * @author Oliver Gierke
- * @author Christoph Strobl
- * @author Mark Paluch
- * @since 1.7
- * @deprecated since 1.10. Please use {@link ArithmeticOperators} and {@link ComparisonOperators} instead.
- */
-@Deprecated
-public enum AggregationFunctionExpressions {
-
-	SIZE, CMP, EQ, GT, GTE, LT, LTE, NE, SUBTRACT, ADD, MULTIPLY;
-
-	/**
-	 * Returns an {@link AggregationExpression} build from the current {@link Enum} name and the given parameters.
-	 * 
-	 * @param parameters must not be {@literal null}
-	 * @return
-	 */
-	public AggregationExpression of(Object... parameters) {
-
-		Assert.notNull(parameters, "Parameters must not be null!");
-		return new FunctionExpression(name().toLowerCase(), parameters);
-	}
-
-	/**
-	 * An {@link AggregationExpression} representing a function call.
-	 * 
-	 * @author Thomas Darimont
-	 * @author Oliver Gierke
-	 * @since 1.7
-	 */
-	static class FunctionExpression implements AggregationExpression {
-
-		private final String name;
-		private final List<Object> values;
-
-		/**
-		 * Creates a new {@link FunctionExpression} for the given name and values.
-		 * 
-		 * @param name must not be {@literal null} or empty.
-		 * @param values must not be {@literal null}.
-		 */
-		public FunctionExpression(String name, Object[] values) {
-
-			Assert.hasText(name, "Name must not be null!");
-			Assert.notNull(values, "Values must not be null!");
-
-			this.name = name;
-			this.values = Arrays.asList(values);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.Expression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
-		@Override
-		public Document toDocument(AggregationOperationContext context) {
-
-			List<Object> args = new ArrayList<Object>(values.size());
-
-			for (Object value : values) {
-				args.add(unpack(value, context));
-			}
-
-			return new Document("$" + name, args);
-		}
-
-		private static Object unpack(Object value, AggregationOperationContext context) {
-
-			if (value instanceof AggregationExpression) {
-				return ((AggregationExpression) value).toDocument(context);
-			}
-
-			if (value instanceof Field) {
-				return context.getReference((Field) value).toString();
-			}
-
-			return value;
-		}
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * 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.
@@ -15,7 +15,7 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import org.bson.Document;
+import com.mongodb.DBObject;
 
 /**
  * Represents one single operation in an aggregation pipeline.
@@ -23,16 +23,15 @@ import org.bson.Document;
  * @author Sebastian Herold
  * @author Thomas Darimont
  * @author Oliver Gierke
- * @author Christoph Strobl
  * @since 1.3
  */
 public interface AggregationOperation {
 
 	/**
-	 * Turns the {@link AggregationOperation} into a {@link Document} by using the given
+	 * Turns the {@link AggregationOperation} into a {@link DBObject} by using the given
 	 * {@link AggregationOperationContext}.
 	 * 
-	 * @return the Document
+	 * @return the DBObject
 	 */
-	Document toDocument(AggregationOperationContext context);
+	DBObject toDBObject(AggregationOperationContext context);
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * 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.
@@ -15,25 +15,25 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import org.bson.Document;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
 
+import com.mongodb.DBObject;
+
 /**
  * The context for an {@link AggregationOperation}.
  * 
  * @author Oliver Gierke
- * @author Christoph Strobl
  * @since 1.3
  */
 public interface AggregationOperationContext {
 
 	/**
-	 * Returns the mapped {@link Document}, potentially converting the source considering mapping metadata etc.
+	 * Returns the mapped {@link DBObject}, potentially converting the source considering mapping metadata etc.
 	 * 
-	 * @param document will never be {@literal null}.
+	 * @param dbObject will never be {@literal null}.
 	 * @return must not be {@literal null}.
 	 */
-	Document getMappedObject(Document document);
+	DBObject getMappedObject(DBObject dbObject);
 
 	/**
 	 * Returns a {@link FieldReference} for the given field or {@literal null} if the context does not expose the given

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

@@ -1,108 +0,0 @@
-/*
- * 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.core.aggregation;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bson.Document;
-import org.springframework.data.mongodb.core.aggregation.ExposedFields.DirectFieldReference;
-import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
-import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
-import org.springframework.data.mongodb.core.aggregation.Fields.AggregationField;
-import org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation.InheritsFieldsAggregationOperation;
-
-/**
- * Rendering support for {@link AggregationOperation} into a {@link List} of {@link org.bson.Document}.
- *
- * @author Mark Paluch
- * @author Christoph Strobl
- * @since 1.10
- */
-class AggregationOperationRenderer {
-
-	static final AggregationOperationContext DEFAULT_CONTEXT = new NoOpAggregationOperationContext();
-
-	/**
-	 * Render a {@link List} of {@link AggregationOperation} given {@link AggregationOperationContext} into their
-	 * {@link Document} representation.
-	 *
-	 * @param operations must not be {@literal null}.
-	 * @param context must not be {@literal null}.
-	 * @return the {@link List} of {@link Document}.
-	 */
-	static List<Document> toDocument(List<AggregationOperation> operations, AggregationOperationContext rootContext) {
-
-		List<Document> operationDocuments = new ArrayList<Document>(operations.size());
-
-		AggregationOperationContext contextToUse = rootContext;
-
-		for (AggregationOperation operation : operations) {
-
-			operationDocuments.add(operation.toDocument(contextToUse));
-
-			if (operation instanceof FieldsExposingAggregationOperation) {
-
-				FieldsExposingAggregationOperation exposedFieldsOperation = (FieldsExposingAggregationOperation) operation;
-				ExposedFields fields = exposedFieldsOperation.getFields();
-
-				if (operation instanceof InheritsFieldsAggregationOperation) {
-					contextToUse = new InheritingExposedFieldsAggregationOperationContext(fields, contextToUse);
-				} else {
-					contextToUse = fields.exposesNoFields() ? DEFAULT_CONTEXT
-							: new ExposedFieldsAggregationOperationContext(exposedFieldsOperation.getFields(), contextToUse);
-				}
-			}
-		}
-
-		return operationDocuments;
-	}
-
-	/**
-	 * Simple {@link AggregationOperationContext} that just returns {@link FieldReference}s as is.
-	 *
-	 * @author Oliver Gierke
-	 */
-	private static class NoOpAggregationOperationContext implements AggregationOperationContext {
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(org.bson.Document)
-		 */
-		@Override
-		public Document getMappedObject(Document document) {
-			return document;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(org.springframework.data.mongodb.core.aggregation.ExposedFields.AvailableField)
-		 */
-		@Override
-		public FieldReference getReference(Field field) {
-			return new DirectFieldReference(new ExposedField(field, true));
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(java.lang.String)
-		 */
-		@Override
-		public FieldReference getReference(String name) {
-			return new DirectFieldReference(new ExposedField(new AggregationField(name), true));
-		}
-	}
-}

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

@@ -1,269 +0,0 @@
-/*
- * 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.aggregation;
-
-import org.bson.Document;
-import org.springframework.util.Assert;
-
-import com.mongodb.DBObject;
-
-/**
- * Holds a set of configurable aggregation options that can be used within an aggregation pipeline. A list of support
- * aggregation options can be found in the MongoDB reference documentation
- * https://docs.mongodb.org/manual/reference/command/aggregate/#aggregate
- *
- * @author Thomas Darimont
- * @author Oliver Gierke
- * @author Christoph Strobl
- * @author Mark Paluch
- * @see Aggregation#withOptions(AggregationOptions)
- * @see TypedAggregation#withOptions(AggregationOptions)
- * @since 1.6
- */
-public class AggregationOptions {
-
-	private static final String BATCH_SIZE = "batchSize";
-	private static final String CURSOR = "cursor";
-	private static final String EXPLAIN = "explain";
-	private static final String ALLOW_DISK_USE = "allowDiskUse";
-
-	private final boolean allowDiskUse;
-	private final boolean explain;
-	private final Document cursor;
-
-	/**
-	 * Creates a new {@link AggregationOptions}.
-	 *
-	 * @param allowDiskUse whether to off-load intensive sort-operations to disk.
-	 * @param explain whether to get the execution plan for the aggregation instead of the actual results.
-	 * @param cursor can be {@literal null}, used to pass additional options to the aggregation.
-	 */
-	public AggregationOptions(boolean allowDiskUse, boolean explain, Document cursor) {
-
-		this.allowDiskUse = allowDiskUse;
-		this.explain = explain;
-		this.cursor = cursor;
-	}
-
-	/**
-	 * Creates a new {@link AggregationOptions}.
-	 *
-	 * @param allowDiskUse whether to off-load intensive sort-operations to disk.
-	 * @param explain whether to get the execution plan for the aggregation instead of the actual results.
-	 * @param cursorBatchSize initial cursor batch size.
-	 * @since 2.0
-	 */
-	public AggregationOptions(boolean allowDiskUse, boolean explain, int cursorBatchSize) {
-		this(allowDiskUse, explain, createCursor(cursorBatchSize));
-	}
-
-	/**
-	 * Creates new {@link AggregationOptions} given {@link DBObject} containing aggregation options.
-	 *
-	 * @param document must not be {@literal null}.
-	 * @return the {@link AggregationOptions}.
-	 * @since 2.0
-	 */
-	public static AggregationOptions fromDocument(Document document) {
-
-		Assert.notNull(document, "Document must not be null!");
-
-		boolean allowDiskUse = false;
-		boolean explain = false;
-		Document cursor = null;
-
-		if (document.containsKey(ALLOW_DISK_USE)) {
-			allowDiskUse = document.get(ALLOW_DISK_USE, Boolean.class);
-		}
-
-		if (document.containsKey(EXPLAIN)) {
-			explain = (Boolean) document.get(EXPLAIN);
-		}
-
-		if (document.containsKey(CURSOR)) {
-			cursor = document.get(CURSOR, Document.class);
-		}
-
-		return new AggregationOptions(allowDiskUse, explain, cursor);
-	}
-
-	/**
-	 * Enables writing to temporary files. When set to true, aggregation stages can write data to the _tmp subdirectory in
-	 * the dbPath directory.
-	 *
-	 * @return
-	 */
-	public boolean isAllowDiskUse() {
-		return allowDiskUse;
-	}
-
-	/**
-	 * Specifies to return the information on the processing of the pipeline.
-	 *
-	 * @return
-	 */
-	public boolean isExplain() {
-		return explain;
-	}
-
-	/**
-	 * The initial cursor batch size, if available, otherwise {@literal null}.
-	 *
-	 * @return the batch size or {@literal null}.
-	 * @since 2.0
-	 */
-	public Integer getCursorBatchSize() {
-
-		if (cursor != null && cursor.containsKey("batchSize")) {
-			return cursor.get("batchSize", Integer.class);
-		}
-
-		return null;
-	}
-
-	/**
-	 * Specify a document that contains options that control the creation of the cursor object.
-	 *
-	 * @return
-	 */
-	public Document getCursor() {
-		return cursor;
-	}
-
-	/**
-	 * Returns a new potentially adjusted copy for the given {@code aggregationCommandObject} with the configuration
-	 * applied.
-	 *
-	 * @param command the aggregation command.
-	 * @return
-	 */
-	Document applyAndReturnPotentiallyChangedCommand(Document command) {
-
-		Document result = new Document(command);
-
-		if (allowDiskUse && !result.containsKey(ALLOW_DISK_USE)) {
-			result.put(ALLOW_DISK_USE, allowDiskUse);
-		}
-
-		if (explain && !result.containsKey(EXPLAIN)) {
-			result.put(EXPLAIN, explain);
-		}
-
-		if (cursor != null && !result.containsKey(CURSOR)) {
-			result.put(CURSOR, cursor);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Returns a {@link Document} representation of this {@link AggregationOptions}.
-	 *
-	 * @return
-	 */
-	public Document toDocument() {
-
-		Document document = new Document();
-		document.put(ALLOW_DISK_USE, allowDiskUse);
-		document.put(EXPLAIN, explain);
-		document.put(CURSOR, cursor);
-
-		return document;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return toDocument().toJson();
-	}
-
-	static Document createCursor(int cursorBatchSize) {
-		return new Document("batchSize", cursorBatchSize);
-	}
-
-	/**
-	 * A Builder for {@link AggregationOptions}.
-	 *
-	 * @author Thomas Darimont
-	 * @author Mark Paluch
-	 */
-	public static class Builder {
-
-		private boolean allowDiskUse;
-		private boolean explain;
-		private Document cursor;
-
-		/**
-		 * Defines whether to off-load intensive sort-operations to disk.
-		 *
-		 * @param allowDiskUse
-		 * @return
-		 */
-		public Builder allowDiskUse(boolean allowDiskUse) {
-
-			this.allowDiskUse = allowDiskUse;
-			return this;
-		}
-
-		/**
-		 * Defines whether to get the execution plan for the aggregation instead of the actual results.
-		 *
-		 * @param explain
-		 * @return
-		 */
-		public Builder explain(boolean explain) {
-
-			this.explain = explain;
-			return this;
-		}
-
-		/**
-		 * Additional options to the aggregation.
-		 *
-		 * @param cursor
-		 * @return
-		 */
-		public Builder cursor(Document cursor) {
-
-			this.cursor = cursor;
-			return this;
-		}
-
-		/**
-		 * Define the initial cursor batch size.
-		 *
-		 * @param batchSize
-		 * @return
-		 * @since 2.0
-		 */
-		public Builder cursorBatchSize(int batchSize) {
-
-			this.cursor = createCursor(batchSize);
-			return this;
-		}
-
-		/**
-		 * Returns a new {@link AggregationOptions} instance with the given configuration.
-		 *
-		 * @return
-		 */
-		public AggregationOptions build() {
-			return new AggregationOptions(allowDiskUse, explain, cursor);
-		}
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * 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.
@@ -19,24 +19,22 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-import org.bson.Document;
 import org.springframework.util.Assert;
 
+import com.mongodb.DBObject;
+
 /**
  * Collects the results of executing an aggregation operation.
  * 
  * @author Tobias Trelle
  * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Christoph Strobl
- * @author Mark Paluch
  * @param <T> The class in which the results are mapped onto.
  * @since 1.3
  */
 public class AggregationResults<T> implements Iterable<T> {
 
 	private final List<T> mappedResults;
-	private final Document rawResults;
+	private final DBObject rawResults;
 	private final String serverUsed;
 
 	/**
@@ -45,10 +43,10 @@ public class AggregationResults<T> implements Iterable<T> {
 	 * @param mappedResults must not be {@literal null}.
 	 * @param rawResults must not be {@literal null}.
 	 */
-	public AggregationResults(List<T> mappedResults, Document rawResults) {
+	public AggregationResults(List<T> mappedResults, DBObject rawResults) {
 
-		Assert.notNull(mappedResults, "List of mapped results must not be null!");
-		Assert.notNull(rawResults, "Raw results must not be null!");
+		Assert.notNull(mappedResults);
+		Assert.notNull(rawResults);
 
 		this.mappedResults = Collections.unmodifiableList(mappedResults);
 		this.rawResults = rawResults;
@@ -92,16 +90,6 @@ public class AggregationResults<T> implements Iterable<T> {
 		return serverUsed;
 	}
 
-	/**
-	 * Returns the raw result that was returned by the server.
-	 * 
-	 * @return
-	 * @since 1.6
-	 */
-	public Document getRawResults() {
-		return rawResults;
-	}
-
 	private String parseServerUsed() {
 
 		Object object = rawResults.get("serverUsed");

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

@@ -1,73 +0,0 @@
-/*
- * 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.core.aggregation;
-
-import org.bson.Document;
-import org.springframework.util.Assert;
-
-/**
- * An {@link AggregationExpression} that renders a MongoDB Aggregation Framework expression from the AST of a
- * <a href="http://docs.spring.io/spring/docs/current/spring-framework-reference/html/expressions.html">SpEL
- * expression</a>. <br />
- * <br />
- * <strong>Samples:</strong> <br />
- * <code>
- * <pre>
- * // { $and: [ { $gt: [ "$qty", 100 ] }, { $lt: [ "$qty", 250 ] } ] }
- * expressionOf("qty > 100 && qty < 250);
- *
- * // { $cond : { if : { $gte : [ "$a", 42 ]}, then : "answer", else : "no-answer" } }
- * expressionOf("cond(a >= 42, 'answer', 'no-answer')");
- * </pre>
- * </code>
- * 
- * @author Christoph Strobl
- * @see SpelExpressionTransformer
- * @since 1.10
- */
-public class AggregationSpELExpression implements AggregationExpression {
-
-	private static final SpelExpressionTransformer TRANSFORMER = new SpelExpressionTransformer();
-	private final String rawExpression;
-	private final Object[] parameters;
-
-	private AggregationSpELExpression(String rawExpression, Object[] parameters) {
-
-		this.rawExpression = rawExpression;
-		this.parameters = parameters;
-	}
-
-	/**
-	 * Creates new {@link AggregationSpELExpression} for the given {@literal expressionString} and {@literal parameters}.
-	 *
-	 * @param expressionString must not be {@literal null}.
-	 * @param parameters can be empty.
-	 * @return
-	 */
-	public static AggregationSpELExpression expressionOf(String expressionString, Object... parameters) {
-
-		Assert.notNull(expressionString, "ExpressionString must not be null!");
-		return new AggregationSpELExpression(expressionString, parameters);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
-	@Override
-	public Document toDocument(AggregationOperationContext context) {
-		return (Document) TRANSFORMER.transform(rawExpression, context, parameters);
-	}
-}

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

@@ -1,353 +0,0 @@
-/*
- * 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.core.aggregation;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.springframework.util.Assert;
-
-/**
- * Gateway to {@literal boolean expressions} that evaluate their argument expressions as booleans and return a boolean
- * as the result.
- *
- * @author Christoph Strobl
- * @since 1.10
- */
-public class BooleanOperators {
-
-	/**
-	 * Take the array referenced by given {@literal fieldReference}.
-	 *
-	 * @param fieldReference must not be {@literal null}.
-	 * @return
-	 */
-	public static BooleanOperatorFactory valueOf(String fieldReference) {
-		return new BooleanOperatorFactory(fieldReference);
-	}
-
-	/**
-	 * Take the value resulting of the given {@link AggregationExpression}.
-	 *
-	 * @param fieldReference must not be {@literal null}.
-	 * @return
-	 */
-	public static BooleanOperatorFactory valueOf(AggregationExpression fieldReference) {
-		return new BooleanOperatorFactory(fieldReference);
-	}
-
-	/**
-	 * Creates new {@link AggregationExpression} that evaluates the boolean value of the referenced field and returns the
-	 * opposite boolean value.
-	 *
-	 * @param fieldReference must not be {@literal null}.
-	 * @return
-	 */
-	public static Not not(String fieldReference) {
-		return Not.not(fieldReference);
-	}
-
-	/**
-	 * Creates new {@link AggregationExpression} that evaluates the boolean value of {@link AggregationExpression} result
-	 * and returns the opposite boolean value.
-	 *
-	 * @param expression must not be {@literal null}.
-	 * @return
-	 */
-	public static Not not(AggregationExpression expression) {
-		return Not.not(expression);
-	}
-
-	/**
-	 * @author Christoph Strobl
-	 */
-	public static class BooleanOperatorFactory {
-
-		private final String fieldReference;
-		private final AggregationExpression expression;
-
-		/**
-		 * Creates new {@link BooleanOperatorFactory} for given {@literal fieldReference}.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 */
-		public BooleanOperatorFactory(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			this.fieldReference = fieldReference;
-			this.expression = null;
-		}
-
-		/**
-		 * Creates new {@link BooleanOperatorFactory} for given {@link AggregationExpression}.
-		 *
-		 * @param expression must not be {@literal null}.
-		 */
-		public BooleanOperatorFactory(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			this.fieldReference = null;
-			this.expression = expression;
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that evaluates one or more expressions and returns {@literal true} if
-		 * all of the expressions are {@literal true}.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public And and(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return createAnd().andExpression(expression);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that evaluates one or more expressions and returns {@literal true} if
-		 * all of the expressions are {@literal true}.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public And and(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return createAnd().andField(fieldReference);
-		}
-
-		private And createAnd() {
-			return usesFieldRef() ? And.and(Fields.field(fieldReference)) : And.and(expression);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that evaluates one or more expressions and returns {@literal true} if
-		 * any of the expressions are {@literal true}.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public Or or(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return createOr().orExpression(expression);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that evaluates one or more expressions and returns {@literal true} if
-		 * any of the expressions are {@literal true}.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public Or or(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return createOr().orField(fieldReference);
-		}
-
-		private Or createOr() {
-			return usesFieldRef() ? Or.or(Fields.field(fieldReference)) : Or.or(expression);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that evaluates a boolean and returns the opposite boolean value.
-		 *
-		 * @return
-		 */
-		public Not not() {
-			return usesFieldRef() ? Not.not(fieldReference) : Not.not(expression);
-		}
-
-		private boolean usesFieldRef() {
-			return this.fieldReference != null;
-		}
-	}
-
-	/**
-	 * {@link AggregationExpression} for {@code $and}.
-	 *
-	 * @author Christoph Strobl
-	 */
-	public static class And extends AbstractAggregationExpression {
-
-		private And(List<?> values) {
-			super(values);
-		}
-
-		@Override
-		protected String getMongoMethod() {
-			return "$and";
-		}
-
-		/**
-		 * Creates new {@link And} that evaluates one or more expressions and returns {@literal true} if all of the
-		 * expressions are {@literal true}.
-		 *
-		 * @param expressions
-		 * @return
-		 */
-		public static And and(Object... expressions) {
-			return new And(Arrays.asList(expressions));
-		}
-
-		/**
-		 * Creates new {@link And} with all previously added arguments appending the given one.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public And andExpression(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new And(append(expression));
-		}
-
-		/**
-		 * Creates new {@link And} with all previously added arguments appending the given one.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public And andField(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new And(append(Fields.field(fieldReference)));
-		}
-
-		/**
-		 * Creates new {@link And} with all previously added arguments appending the given one.
-		 *
-		 * @param value must not be {@literal null}.
-		 * @return
-		 */
-		public And andValue(Object value) {
-
-			Assert.notNull(value, "Value must not be null!");
-			return new And(append(value));
-		}
-	}
-
-	/**
-	 * {@link AggregationExpression} for {@code $or}.
-	 *
-	 * @author Christoph Strobl
-	 */
-	public static class Or extends AbstractAggregationExpression {
-
-		private Or(List<?> values) {
-			super(values);
-		}
-
-		@Override
-		protected String getMongoMethod() {
-			return "$or";
-		}
-
-		/**
-		 * Creates new {@link Or} that evaluates one or more expressions and returns {@literal true} if any of the
-		 * expressions are {@literal true}.
-		 *
-		 * @param expressions must not be {@literal null}.
-		 * @return
-		 */
-		public static Or or(Object... expressions) {
-
-			Assert.notNull(expressions, "Expressions must not be null!");
-			return new Or(Arrays.asList(expressions));
-		}
-
-		/**
-		 * Creates new {@link Or} with all previously added arguments appending the given one.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public Or orExpression(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Or(append(expression));
-		}
-
-		/**
-		 * Creates new {@link Or} with all previously added arguments appending the given one.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public Or orField(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Or(append(Fields.field(fieldReference)));
-		}
-
-		/**
-		 * Creates new {@link Or} with all previously added arguments appending the given one.
-		 *
-		 * @param value must not be {@literal null}.
-		 * @return
-		 */
-		public Or orValue(Object value) {
-
-			Assert.notNull(value, "Value must not be null!");
-			return new Or(append(value));
-		}
-	}
-
-	/**
-	 * {@link AggregationExpression} for {@code $not}.
-	 *
-	 * @author Christoph Strobl
-	 */
-	public static class Not extends AbstractAggregationExpression {
-
-		private Not(Object value) {
-			super(value);
-		}
-
-		@Override
-		protected String getMongoMethod() {
-			return "$not";
-		}
-
-		/**
-		 * Creates new {@link Not} that evaluates the boolean value of the referenced field and returns the opposite boolean
-		 * value.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public static Not not(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Not(asFields(fieldReference));
-		}
-
-		/**
-		 * Creates new {@link Not} that evaluates the resulting boolean value of the given {@link AggregationExpression} and
-		 * returns the opposite boolean value.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public static Not not(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Not(Collections.singletonList(expression));
-		}
-	}
-}

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

@@ -1,275 +0,0 @@
-/*
- * 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.core.aggregation;
-
-import org.springframework.data.mongodb.core.aggregation.BucketAutoOperation.BucketAutoOperationOutputBuilder;
-import org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OutputBuilder;
-import org.springframework.util.Assert;
-
-import org.bson.Document;
-
-/**
- * Encapsulates the aggregation framework {@code $bucketAuto}-operation. <br />
- * Bucket stage is typically used with {@link Aggregation} and {@code $facet}. Categorizes incoming documents into a
- * specific number of groups, called buckets, based on a specified expression. Bucket boundaries are automatically
- * determined in an attempt to evenly distribute the documents into the specified number of buckets. <br />
- * We recommend to use the static factory method {@link Aggregation#bucketAuto(String, int)} instead of creating
- * instances of this class directly.
- *
- * @see <a href=
- *      "https://docs.mongodb.org/manual/reference/aggregation/bucketAuto/">https://docs.mongodb.org/manual/reference/aggregation/bucketAuto/</a>
- * @see BucketOperationSupport
- * @author Mark Paluch
- * @author Christoph Strobl
- * @since 1.10
- */
-public class BucketAutoOperation extends BucketOperationSupport<BucketAutoOperation, BucketAutoOperationOutputBuilder>
-		implements FieldsExposingAggregationOperation {
-
-	private final int buckets;
-	private final String granularity;
-
-	/**
-	 * Creates a new {@link BucketAutoOperation} given a {@link Field group-by field}.
-	 *
-	 * @param groupByField must not be {@literal null}.
-	 * @param buckets number of buckets, must be a positive integer.
-	 */
-	public BucketAutoOperation(Field groupByField, int buckets) {
-
-		super(groupByField);
-
-		Assert.isTrue(buckets > 0, "Number of buckets must be greater 0!");
-
-		this.buckets = buckets;
-		this.granularity = null;
-	}
-
-	/**
-	 * Creates a new {@link BucketAutoOperation} given a {@link AggregationExpression group-by expression}.
-	 *
-	 * @param groupByExpression must not be {@literal null}.
-	 * @param buckets number of buckets, must be a positive integer.
-	 */
-	public BucketAutoOperation(AggregationExpression groupByExpression, int buckets) {
-
-		super(groupByExpression);
-
-		Assert.isTrue(buckets > 0, "Number of buckets must be greater 0!");
-
-		this.buckets = buckets;
-		this.granularity = null;
-	}
-
-	private BucketAutoOperation(BucketAutoOperation bucketOperation, Outputs outputs) {
-
-		super(bucketOperation, outputs);
-
-		this.buckets = bucketOperation.buckets;
-		this.granularity = bucketOperation.granularity;
-	}
-
-	private BucketAutoOperation(BucketAutoOperation bucketOperation, int buckets, String granularity) {
-
-		super(bucketOperation);
-
-		this.buckets = buckets;
-		this.granularity = granularity;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
-	@Override
-	public Document toDocument(AggregationOperationContext context) {
-
-		Document options = new Document();
-
-		options.put("buckets", buckets);
-
-		if (granularity != null) {
-			options.put("granularity", granularity);
-		}
-
-		options.putAll(super.toDocument(context));
-
-		return new Document("$bucketAuto", options);
-	}
-
-	/**
-	 * Configures a number of bucket {@literal buckets} and return a new {@link BucketAutoOperation}.
-	 *
-	 * @param buckets must be a positive number.
-	 * @return
-	 */
-	public BucketAutoOperation withBuckets(int buckets) {
-
-		Assert.isTrue(buckets > 0, "Number of buckets must be greater 0!");
-		return new BucketAutoOperation(this, buckets, granularity);
-	}
-
-	/**
-	 * Configures {@link Granularity granularity} that specifies the preferred number series to use to ensure that the
-	 * calculated boundary edges end on preferred round numbers or their powers of 10 and return a new
-	 * {@link BucketAutoOperation}. <br />
-	 * Use either predefined {@link Granularities} or provide a own one.
-	 *
-	 * @param granularity must not be {@literal null}.
-	 * @return
-	 */
-	public BucketAutoOperation withGranularity(Granularity granularity) {
-
-		Assert.notNull(granularity, "Granularity must not be null!");
-
-		return new BucketAutoOperation(this, buckets, granularity.getMongoRepresentation());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#newBucketOperation(org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.Outputs)
-	 */
-	@Override
-	protected BucketAutoOperation newBucketOperation(Outputs outputs) {
-		return new BucketAutoOperation(this, outputs);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#andOutputExpression(java.lang.String, java.lang.Object[])
-	 */
-	@Override
-	public ExpressionBucketAutoOperationBuilder andOutputExpression(String expression, Object... params) {
-		return new ExpressionBucketAutoOperationBuilder(expression, this, params);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#andOutput(org.springframework.data.mongodb.core.aggregation.AggregationExpression)
-	 */
-	@Override
-	public BucketAutoOperationOutputBuilder andOutput(AggregationExpression expression) {
-		return new BucketAutoOperationOutputBuilder(expression, this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#andOutput(java.lang.String)
-	 */
-	@Override
-	public BucketAutoOperationOutputBuilder andOutput(String fieldName) {
-		return new BucketAutoOperationOutputBuilder(Fields.field(fieldName), this);
-	}
-
-	/**
-	 * {@link OutputBuilder} implementation for {@link BucketAutoOperation}.
-	 */
-	public static class BucketAutoOperationOutputBuilder
-			extends OutputBuilder<BucketAutoOperationOutputBuilder, BucketAutoOperation> {
-
-		/**
-		 * Creates a new {@link BucketAutoOperationOutputBuilder} fot the given value and {@link BucketAutoOperation}.
-		 *
-		 * @param value must not be {@literal null}.
-		 * @param operation must not be {@literal null}.
-		 */
-		protected BucketAutoOperationOutputBuilder(Object value, BucketAutoOperation operation) {
-			super(value, operation);
-		}
-
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OutputBuilder#apply(org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OperationOutput)
-		 */
-		@Override
-		protected BucketAutoOperationOutputBuilder apply(OperationOutput operationOutput) {
-			return new BucketAutoOperationOutputBuilder(operationOutput, this.operation);
-		}
-	}
-
-	/**
-	 * {@link ExpressionBucketOperationBuilderSupport} implementation for {@link BucketAutoOperation} using SpEL
-	 * expression based {@link Output}.
-	 *
-	 * @author Mark Paluch
-	 */
-	public static class ExpressionBucketAutoOperationBuilder
-			extends ExpressionBucketOperationBuilderSupport<BucketAutoOperationOutputBuilder, BucketAutoOperation> {
-
-		/**
-		 * Creates a new {@link ExpressionBucketAutoOperationBuilder} for the given value, {@link BucketAutoOperation} and
-		 * parameters.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @param operation must not be {@literal null}.
-		 * @param parameters
-		 */
-		protected ExpressionBucketAutoOperationBuilder(String expression, BucketAutoOperation operation,
-				Object[] parameters) {
-			super(expression, operation, parameters);
-		}
-
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OutputBuilder#apply(org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OperationOutput)
-		 */
-		@Override
-		protected BucketAutoOperationOutputBuilder apply(OperationOutput operationOutput) {
-			return new BucketAutoOperationOutputBuilder(operationOutput, this.operation);
-		}
-	}
-
-	/**
-	 * @author Mark Paluch
-	 */
-	public interface Granularity {
-
-		/**
-		 * @return a String that represents a MongoDB granularity to be used with {@link BucketAutoOperation}. Never
-		 *         {@literal null}.
-		 */
-		String getMongoRepresentation();
-	}
-
-	/**
-	 * Supported MongoDB granularities.
-	 *
-	 * @see <a
-	 *      href="https://docs.mongodb.com/manual/reference/operator/aggregation/bucketAuto/#granularity>https://docs.mongodb.com/manual/reference/operator/aggregation/bucketAuto/#granularity</a>
-	 * @author Mark Paluch
-	 */
-	public enum Granularities implements Granularity {
-
-		R5, R10, R20, R40, R80, //
-
-		SERIES_1_2_5("1-2-5"), //
-
-		E6, E12, E24, E48, E96, E192, //
-
-		POWERSOF2;
-
-		private final String granularity;
-
-		Granularities() {
-			this.granularity = name();
-		}
-
-		Granularities(String granularity) {
-			this.granularity = granularity;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.GranularitytoMongoGranularity()
-		 */
-		@Override
-		public String getMongoRepresentation() {
-			return granularity;
-		}
-	}
-}

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

@@ -1,226 +0,0 @@
-/*
- * 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.core.aggregation;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.springframework.data.mongodb.core.aggregation.BucketOperation.BucketOperationOutputBuilder;
-import org.springframework.util.Assert;
-
-import org.bson.Document;
-
-/**
- * Encapsulates the aggregation framework {@code $bucket}-operation. <br />
- *
- * Bucket stage is typically used with {@link Aggregation} and {@code $facet}. Categorizes incoming documents into
- * groups, called buckets, based on a specified expression and bucket boundaries. <br />
- *
- * We recommend to use the static factory method {@link Aggregation#bucket(String)} instead of creating instances of
- * this class directly.
- *
- * @see <a href="https://docs.mongodb.org/manual/reference/aggregation/bucket/">https://docs.mongodb.org/manual/reference/aggregation/bucket/</a>
- * @see BucketOperationSupport
- * @author Mark Paluch
- * @since 1.10
- */
-public class BucketOperation extends BucketOperationSupport<BucketOperation, BucketOperationOutputBuilder>
-		implements FieldsExposingAggregationOperation {
-
-	private final List<Object> boundaries;
-	private final Object defaultBucket;
-
-	/**
-	 * Creates a new {@link BucketOperation} given a {@link Field group-by field}.
-	 *
-	 * @param groupByField must not be {@literal null}.
-	 */
-	public BucketOperation(Field groupByField) {
-
-		super(groupByField);
-
-		this.boundaries = Collections.emptyList();
-		this.defaultBucket = null;
-	}
-
-	/**
-	 * Creates a new {@link BucketOperation} given a {@link AggregationExpression group-by expression}.
-	 *
-	 * @param groupByExpression must not be {@literal null}.
-	 */
-	public BucketOperation(AggregationExpression groupByExpression) {
-
-		super(groupByExpression);
-
-		this.boundaries = Collections.emptyList();
-		this.defaultBucket = null;
-	}
-
-	private BucketOperation(BucketOperation bucketOperation, Outputs outputs) {
-
-		super(bucketOperation, outputs);
-
-		this.boundaries = bucketOperation.boundaries;
-		this.defaultBucket = bucketOperation.defaultBucket;
-	}
-
-	private BucketOperation(BucketOperation bucketOperation, List<Object> boundaries, Object defaultBucket) {
-
-		super(bucketOperation);
-
-		this.boundaries = new ArrayList<Object>(boundaries);
-		this.defaultBucket = defaultBucket;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
-	@Override
-	public Document toDocument(AggregationOperationContext context) {
-
-		Document options = new Document();
-
-		options.put("boundaries", context.getMappedObject(new Document("$set", boundaries)).get("$set"));
-
-		if (defaultBucket != null) {
-			options.put("default", context.getMappedObject(new Document("$set", defaultBucket)).get("$set"));
-		}
-
-		options.putAll(super.toDocument(context));
-
-		return new Document("$bucket", options);
-	}
-
-	/**
-	 * Configures a default bucket {@literal literal} and return a new {@link BucketOperation}.
-	 *
-	 * @param literal must not be {@literal null}.
-	 * @return
-	 */
-	public BucketOperation withDefaultBucket(Object literal) {
-
-		Assert.notNull(literal, "Default bucket literal must not be null!");
-		return new BucketOperation(this, boundaries, literal);
-	}
-
-	/**
-	 * Configures {@literal boundaries} and return a new {@link BucketOperation}. Existing {@literal boundaries} are
-	 * preserved and the new {@literal boundaries} are appended.
-	 *
-	 * @param boundaries must not be {@literal null}.
-	 * @return
-	 */
-	public BucketOperation withBoundaries(Object... boundaries) {
-
-		Assert.notNull(boundaries, "Boundaries must not be null!");
-		Assert.noNullElements(boundaries, "Boundaries must not contain null values!");
-
-		List<Object> newBoundaries = new ArrayList<Object>(this.boundaries.size() + boundaries.length);
-		newBoundaries.addAll(this.boundaries);
-		newBoundaries.addAll(Arrays.asList(boundaries));
-
-		return new BucketOperation(this, newBoundaries, defaultBucket);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#newBucketOperation(org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.Outputs)
-	 */
-	@Override
-	protected BucketOperation newBucketOperation(Outputs outputs) {
-		return new BucketOperation(this, outputs);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#andOutputExpression(java.lang.String, java.lang.Object[])
-	 */
-	@Override
-	public ExpressionBucketOperationBuilder andOutputExpression(String expression, Object... params) {
-		return new ExpressionBucketOperationBuilder(expression, this, params);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#andOutput(org.springframework.data.mongodb.core.aggregation.AggregationExpression)
-	 */
-	@Override
-	public BucketOperationOutputBuilder andOutput(AggregationExpression expression) {
-		return new BucketOperationOutputBuilder(expression, this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#andOutput(java.lang.String)
-	 */
-	@Override
-	public BucketOperationOutputBuilder andOutput(String fieldName) {
-		return new BucketOperationOutputBuilder(Fields.field(fieldName), this);
-	}
-
-	/**
-	 * {@link OutputBuilder} implementation for {@link BucketOperation}.
-	 */
-	public static class BucketOperationOutputBuilder
-			extends BucketOperationSupport.OutputBuilder<BucketOperationOutputBuilder, BucketOperation> {
-
-		/**
-		 * Creates a new {@link BucketOperationOutputBuilder} fot the given value and {@link BucketOperation}.
-		 *
-		 * @param value must not be {@literal null}.
-		 * @param operation must not be {@literal null}.
-		 */
-		protected BucketOperationOutputBuilder(Object value, BucketOperation operation) {
-			super(value, operation);
-		}
-
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OutputBuilder#apply(org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OperationOutput)
-		 */
-		@Override
-		protected BucketOperationOutputBuilder apply(OperationOutput operationOutput) {
-			return new BucketOperationOutputBuilder(operationOutput, this.operation);
-		}
-	}
-
-	/**
-	 * {@link ExpressionBucketOperationBuilderSupport} implementation for {@link BucketOperation} using SpEL expression
-	 * based {@link Output}.
-	 *
-	 * @author Mark Paluch
-	 */
-	public static class ExpressionBucketOperationBuilder
-			extends ExpressionBucketOperationBuilderSupport<BucketOperationOutputBuilder, BucketOperation> {
-
-		/**
-		 * Creates a new {@link ExpressionBucketOperationBuilderSupport} for the given value, {@link BucketOperation}
-		 * and parameters.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @param operation must not be {@literal null}.
-		 * @param parameters
-		 */
-		protected ExpressionBucketOperationBuilder(String expression, BucketOperation operation, Object[] parameters) {
-			super(expression, operation, parameters);
-		}
-
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OutputBuilder#apply(org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OperationOutput)
-		 */
-		@Override
-		protected BucketOperationOutputBuilder apply(OperationOutput operationOutput) {
-			return new BucketOperationOutputBuilder(operationOutput, this.operation);
-		}
-	}
-}

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

@@ -1,679 +0,0 @@
-/*
- * 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.core.aggregation;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OutputBuilder;
-import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
-import org.springframework.data.mongodb.core.aggregation.ProjectionOperation.ProjectionOperationBuilder;
-import org.springframework.expression.spel.ast.Projection;
-import org.springframework.util.Assert;
-
-import org.bson.Document;
-
-/**
- * Base class for bucket operations that support output expressions the aggregation framework. <br />
- * Bucket stages collect documents into buckets and can contribute output fields. <br />
- * Implementing classes are required to provide an {@link OutputBuilder}.
- *
- * @author Mark Paluch
- * @author Christoph Strobl
- * @since 1.10
- */
-public abstract class BucketOperationSupport<T extends BucketOperationSupport<T, B>, B extends OutputBuilder<B, T>>
-		implements FieldsExposingAggregationOperation {
-
-	private final Field groupByField;
-	private final AggregationExpression groupByExpression;
-	private final Outputs outputs;
-
-	/**
-	 * Creates a new {@link BucketOperationSupport} given a {@link Field group-by field}.
-	 *
-	 * @param groupByField must not be {@literal null}.
-	 */
-	protected BucketOperationSupport(Field groupByField) {
-
-		Assert.notNull(groupByField, "Group by field must not be null!");
-
-		this.groupByField = groupByField;
-		this.groupByExpression = null;
-		this.outputs = Outputs.EMPTY;
-	}
-
-	/**
-	 * Creates a new {@link BucketOperationSupport} given a {@link AggregationExpression group-by expression}.
-	 *
-	 * @param groupByExpression must not be {@literal null}.
-	 */
-	protected BucketOperationSupport(AggregationExpression groupByExpression) {
-
-		Assert.notNull(groupByExpression, "Group by AggregationExpression must not be null!");
-
-		this.groupByExpression = groupByExpression;
-		this.groupByField = null;
-		this.outputs = Outputs.EMPTY;
-	}
-
-	/**
-	 * Creates a copy of {@link BucketOperationSupport}.
-	 *
-	 * @param operationSupport must not be {@literal null}.
-	 */
-	protected BucketOperationSupport(BucketOperationSupport<?, ?> operationSupport) {
-		this(operationSupport, operationSupport.outputs);
-	}
-
-	/**
-	 * Creates a copy of {@link BucketOperationSupport} and applies the new {@link Outputs}.
-	 *
-	 * @param operationSupport must not be {@literal null}.
-	 * @param outputs must not be {@literal null}.
-	 */
-	protected BucketOperationSupport(BucketOperationSupport<?, ?> operationSupport, Outputs outputs) {
-
-		Assert.notNull(operationSupport, "BucketOperationSupport must not be null!");
-		Assert.notNull(outputs, "Outputs must not be null!");
-
-		this.groupByField = operationSupport.groupByField;
-		this.groupByExpression = operationSupport.groupByExpression;
-		this.outputs = outputs;
-	}
-
-	/**
-	 * Creates a new {@link ExpressionBucketOperationBuilderSupport} given a SpEL {@literal expression} and optional
-	 * {@literal params} to add an output field to the resulting bucket documents.
-	 *
-	 * @param expression the SpEL expression, must not be {@literal null} or empty.
-	 * @param params must not be {@literal null}
-	 * @return
-	 */
-	public abstract ExpressionBucketOperationBuilderSupport<B, T> andOutputExpression(String expression,
-			Object... params);
-
-	/**
-	 * Creates a new {@link BucketOperationSupport} given an {@link AggregationExpression} to add an output field to the
-	 * resulting bucket documents.
-	 *
-	 * @param expression the SpEL expression, must not be {@literal null} or empty.
-	 * @return
-	 */
-	public abstract B andOutput(AggregationExpression expression);
-
-	/**
-	 * Creates a new {@link BucketOperationSupport} given {@literal fieldName} to add an output field to the resulting
-	 * bucket documents. {@link BucketOperationSupport} exposes accumulation operations that can be applied to
-	 * {@literal fieldName}.
-	 *
-	 * @param fieldName must not be {@literal null} or empty.
-	 * @return
-	 */
-	public abstract B andOutput(String fieldName);
-
-	/**
-	 * Creates a new {@link BucketOperationSupport} given to add a count field to the resulting bucket documents.
-	 *
-	 * @return
-	 */
-	public B andOutputCount() {
-		return andOutput(new AggregationExpression() {
-			@Override
-			public Document toDocument(AggregationOperationContext context) {
-				return new Document("$sum", 1);
-			}
-		});
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
-	@Override
-	public Document toDocument(AggregationOperationContext context) {
-
-		Document document = new Document();
-
-		document.put("groupBy", groupByExpression == null ? context.getReference(groupByField).toString()
-				: groupByExpression.toDocument(context));
-
-		if (!outputs.isEmpty()) {
-			document.put("output", outputs.toDocument(context));
-		}
-
-		return document;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields()
-	 */
-	@Override
-	public ExposedFields getFields() {
-		return outputs.asExposedFields();
-	}
-
-	/**
-	 * Implementation hook to create a new bucket operation.
-	 *
-	 * @param outputs the outputs
-	 * @return the new bucket operation.
-	 */
-	protected abstract T newBucketOperation(Outputs outputs);
-
-	protected T andOutput(Output output) {
-		return newBucketOperation(outputs.and(output));
-	}
-
-	/**
-	 * Builder for SpEL expression-based {@link Output}.
-	 *
-	 * @author Mark Paluch
-	 */
-	public abstract static class ExpressionBucketOperationBuilderSupport<B extends OutputBuilder<B, T>, T extends BucketOperationSupport<T, B>>
-			extends OutputBuilder<B, T> {
-
-		/**
-		 * Creates a new {@link ExpressionBucketOperationBuilderSupport} for the given value, {@link BucketOperationSupport}
-		 * and parameters.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @param operation must not be {@literal null}.
-		 * @param parameters
-		 */
-		protected ExpressionBucketOperationBuilderSupport(String expression, T operation, Object[] parameters) {
-			super(new SpelExpressionOutput(expression, parameters), operation);
-		}
-	}
-
-	/**
-	 * Base class for {@link Output} builders that result in a {@link BucketOperationSupport} providing the built
-	 * {@link Output}.
-	 *
-	 * @author Mark Paluch
-	 */
-	public abstract static class OutputBuilder<B extends OutputBuilder<B, T>, T extends BucketOperationSupport<T, B>> {
-
-		protected final Object value;
-		protected final T operation;
-
-		/**
-		 * Creates a new {@link OutputBuilder} for the given value and {@link BucketOperationSupport}.
-		 *
-		 * @param value must not be {@literal null}.
-		 * @param operation must not be {@literal null}.
-		 */
-		protected OutputBuilder(Object value, T operation) {
-
-			Assert.notNull(value, "Value must not be null or empty!");
-			Assert.notNull(operation, "ProjectionOperation must not be null!");
-
-			this.value = value;
-			this.operation = operation;
-		}
-
-		/**
-		 * Generates a builder for a {@code $sum}-expression. <br />
-		 * Count expressions are emulated via {@code $sum: 1}.
-		 *
-		 * @return
-		 */
-		public B count() {
-			return sum(1);
-		}
-
-		/**
-		 * Generates a builder for a {@code $sum}-expression for the current value.
-		 *
-		 * @return
-		 */
-		public B sum() {
-			return apply(Accumulators.SUM);
-		}
-
-		/**
-		 * Generates a builder for a {@code $sum}-expression for the given {@literal value}.
-		 *
-		 * @param value
-		 * @return
-		 */
-		public B sum(Number value) {
-			return apply(new OperationOutput(Accumulators.SUM.getMongoOperator(), Collections.singleton(value)));
-		}
-
-		/**
-		 * Generates a builder for an {@code $last}-expression for the current value..
-		 *
-		 * @return
-		 */
-		public B last() {
-			return apply(Accumulators.LAST);
-		}
-
-		/**
-		 * Generates a builder for a {@code $first}-expression the current value.
-		 *
-		 * @return
-		 */
-		public B first() {
-			return apply(Accumulators.FIRST);
-		}
-
-		/**
-		 * Generates a builder for an {@code $avg}-expression for the current value.
-		 *
-		 * @param reference
-		 * @return
-		 */
-		public B avg() {
-			return apply(Accumulators.AVG);
-		}
-
-		/**
-		 * Generates a builder for an {@code $min}-expression for the current value.
-		 *
-		 * @return
-		 */
-		public B min() {
-			return apply(Accumulators.MIN);
-		}
-
-		/**
-		 * Generates a builder for an {@code $max}-expression for the current value.
-		 *
-		 * @return
-		 */
-		public B max() {
-			return apply(Accumulators.MAX);
-		}
-
-		/**
-		 * Generates a builder for an {@code $push}-expression for the current value.
-		 *
-		 * @return
-		 */
-		public B push() {
-			return apply(Accumulators.PUSH);
-		}
-
-		/**
-		 * Generates a builder for an {@code $addToSet}-expression for the current value.
-		 *
-		 * @return
-		 */
-		public B addToSet() {
-			return apply(Accumulators.ADDTOSET);
-		}
-
-		/**
-		 * Apply an operator to the current value.
-		 *
-		 * @param operation the operation name, must not be {@literal null} or empty.
-		 * @param values must not be {@literal null}.
-		 * @return
-		 */
-		public B apply(String operation, Object... values) {
-
-			Assert.hasText(operation, "Operation must not be empty or null!");
-			Assert.notNull(value, "Values must not be null!");
-
-			List<Object> objects = new ArrayList<Object>(values.length + 1);
-			objects.add(value);
-			objects.addAll(Arrays.asList(values));
-			return apply(new OperationOutput(operation, objects));
-		}
-
-		/**
-		 * Apply an {@link OperationOutput} to this output.
-		 *
-		 * @param operationOutput must not be {@literal null}.
-		 * @return
-		 */
-		protected abstract B apply(OperationOutput operationOutput);
-
-		private B apply(Accumulators operation) {
-			return this.apply(operation.getMongoOperator());
-		}
-
-		/**
-		 * Returns the finally to be applied {@link BucketOperation} with the given alias.
-		 *
-		 * @param alias will never be {@literal null} or empty.
-		 * @return
-		 */
-		public T as(String alias) {
-
-			if (value instanceof OperationOutput) {
-				return this.operation.andOutput(((OperationOutput) this.value).withAlias(alias));
-			}
-
-			if (value instanceof Field) {
-				throw new IllegalStateException("Cannot add a field as top-level output. Use accumulator expressions.");
-			}
-
-			return this.operation
-					.andOutput(new AggregationExpressionOutput(Fields.field(alias), (AggregationExpression) value));
-		}
-	}
-
-	private enum Accumulators {
-
-		SUM("$sum"), AVG("$avg"), FIRST("$first"), LAST("$last"), MAX("$max"), MIN("$min"), PUSH("$push"), ADDTOSET(
-				"$addToSet");
-
-		private String mongoOperator;
-
-		Accumulators(String mongoOperator) {
-			this.mongoOperator = mongoOperator;
-		}
-
-		public String getMongoOperator() {
-			return mongoOperator;
-		}
-	}
-
-	/**
-	 * Encapsulates {@link Output}s.
-	 *
-	 * @author Mark Paluch
-	 */
-	protected static class Outputs implements AggregationExpression {
-
-		protected static final Outputs EMPTY = new Outputs();
-
-		private List<Output> outputs;
-
-		/**
-		 * Creates a new, empty {@link Outputs}.
-		 */
-		private Outputs() {
-			this.outputs = new ArrayList<Output>();
-		}
-
-		/**
-		 * Creates new {@link Outputs} containing all given {@link Output}s.
-		 *
-		 * @param current
-		 * @param output
-		 */
-		private Outputs(Collection<Output> current, Output output) {
-
-			this.outputs = new ArrayList<Output>(current.size() + 1);
-			this.outputs.addAll(current);
-			this.outputs.add(output);
-		}
-
-		/**
-		 * @return the {@link ExposedFields} derived from {@link Output}.
-		 */
-		protected ExposedFields asExposedFields() {
-
-			// The count field is included by default when the output is not specified.
-			if (isEmpty()) {
-				return ExposedFields.from(new ExposedField("count", true));
-			}
-
-			ExposedFields fields = ExposedFields.from();
-
-			for (Output output : outputs) {
-				fields = fields.and(output.getExposedField());
-			}
-
-			return fields;
-		}
-
-		/**
-		 * Create a new {@link Outputs} that contains the new {@link Output}.
-		 *
-		 * @param output must not be {@literal null}.
-		 * @return the new {@link Outputs} that contains the new {@link Output}
-		 */
-		protected Outputs and(Output output) {
-
-			Assert.notNull(output, "BucketOutput must not be null!");
-			return new Outputs(this.outputs, output);
-		}
-
-		/**
-		 * @return {@literal true} if {@link Outputs} contains no {@link Output}.
-		 */
-		protected boolean isEmpty() {
-			return outputs.isEmpty();
-		}
-
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
-		@Override
-		public Document toDocument(AggregationOperationContext context) {
-
-			Document document = new Document();
-
-			for (Output output : outputs) {
-				document.put(output.getExposedField().getName(), output.toDocument(context));
-			}
-
-			return document;
-		}
-
-	}
-
-	/**
-	 * Encapsulates an output field in a bucket aggregation stage. <br />
-	 * Output fields can be either top-level fields that define a valid field name or nested output fields using
-	 * operators.
-	 *
-	 * @author Mark Paluch
-	 */
-	protected abstract static class Output implements AggregationExpression {
-
-		private final ExposedField field;
-
-		/**
-		 * Creates new {@link Projection} for the given {@link Field}.
-		 *
-		 * @param field must not be {@literal null}.
-		 */
-		protected Output(Field field) {
-
-			Assert.notNull(field, "Field must not be null!");
-			this.field = new ExposedField(field, true);
-		}
-
-		/**
-		 * Returns the field exposed by the {@link Output}.
-		 *
-		 * @return will never be {@literal null}.
-		 */
-		protected ExposedField getExposedField() {
-			return field;
-		}
-	}
-
-	/**
-	 * Output field that uses a Mongo operation (expression object) to generate an output field value. <br />
-	 * {@link OperationOutput} is used either with a regular field name or an operation keyword (e.g.
-	 * {@literal $sum, $count}).
-	 *
-	 * @author Mark Paluch
-	 */
-	protected static class OperationOutput extends Output {
-
-		private final String operation;
-		private final List<Object> values;
-
-		/**
-		 * Creates a new {@link Output} for the given field.
-		 *
-		 * @param operation the actual operation key, must not be {@literal null} or empty.
-		 * @param values the values to pass into the operation, must not be {@literal null}.
-		 */
-		public OperationOutput(String operation, Collection<? extends Object> values) {
-
-			super(Fields.field(operation));
-
-			Assert.hasText(operation, "Operation must not be null or empty!");
-			Assert.notNull(values, "Values must not be null!");
-
-			this.operation = operation;
-			this.values = new ArrayList<Object>(values);
-		}
-
-		private OperationOutput(Field field, OperationOutput operationOutput) {
-
-			super(field);
-
-			this.operation = operationOutput.operation;
-			this.values = operationOutput.values;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
-		@Override
-		public Document toDocument(AggregationOperationContext context) {
-
-			List<Object> operationArguments = getOperationArguments(context);
-			return new Document(operation,
-					operationArguments.size() == 1 ? operationArguments.get(0) : operationArguments);
-		}
-
-		protected List<Object> getOperationArguments(AggregationOperationContext context) {
-
-			List<Object> result = new ArrayList<Object>(values != null ? values.size() : 1);
-
-			for (Object element : values) {
-
-				if (element instanceof Field) {
-					result.add(context.getReference((Field) element).toString());
-				} else if (element instanceof Fields) {
-					for (Field field : (Fields) element) {
-						result.add(context.getReference(field).toString());
-					}
-				} else if (element instanceof AggregationExpression) {
-					result.add(((AggregationExpression) element).toDocument(context));
-				} else {
-					result.add(element);
-				}
-			}
-
-			return result;
-		}
-
-		/**
-		 * Returns the field that holds the {@link ProjectionOperationBuilder.OperationProjection}.
-		 *
-		 * @return
-		 */
-		protected Field getField() {
-			return getExposedField();
-		}
-
-		/**
-		 * Creates a new instance of this {@link OperationOutput} with the given alias.
-		 *
-		 * @param alias the alias to set
-		 * @return
-		 */
-		public OperationOutput withAlias(String alias) {
-
-			final Field aliasedField = Fields.field(alias);
-			return new OperationOutput(aliasedField, this) {
-
-				@Override
-				protected Field getField() {
-					return aliasedField;
-				}
-
-				@Override
-				protected List<Object> getOperationArguments(AggregationOperationContext context) {
-
-					// We have to make sure that we use the arguments from the "previous" OperationOutput that we replace
-					// with this new instance.
-					return OperationOutput.this.getOperationArguments(context);
-				}
-			};
-		}
-	}
-
-	/**
-	 * A {@link Output} based on a SpEL expression.
-	 */
-	private static class SpelExpressionOutput extends Output {
-
-		private static final SpelExpressionTransformer TRANSFORMER = new SpelExpressionTransformer();
-
-		private final String expression;
-		private final Object[] params;
-
-		/**
-		 * Creates a new {@link SpelExpressionOutput} for the given field, SpEL expression and parameters.
-		 *
-		 * @param expression must not be {@literal null} or empty.
-		 * @param parameters must not be {@literal null}.
-		 */
-		public SpelExpressionOutput(String expression, Object[] parameters) {
-
-			super(Fields.field(expression));
-
-			Assert.hasText(expression, "Expression must not be null!");
-			Assert.notNull(parameters, "Parameters must not be null!");
-
-			this.expression = expression;
-			this.params = parameters.clone();
-		}
-
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.Output#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
-		@Override
-		public Document toDocument(AggregationOperationContext context) {
-			return (Document) TRANSFORMER.transform(expression, context, params);
-		}
-	}
-
-	/**
-	 * @author Mark Paluch
-	 */
-	private static class AggregationExpressionOutput extends Output {
-
-		private final AggregationExpression expression;
-
-		/**
-		 * Creates a new {@link AggregationExpressionOutput}.
-		 *
-		 * @param field
-		 * @param expression
-		 */
-		protected AggregationExpressionOutput(Field field, AggregationExpression expression) {
-
-			super(field);
-
-			this.expression = expression;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.Output#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
-		@Override
-		public Document toDocument(AggregationOperationContext context) {
-			return expression.toDocument(context);
-		}
-	}
-}

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

@@ -1,879 +0,0 @@
-/*
- * 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.core.aggregation;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.springframework.util.Assert;
-
-/**
- * Gateway to {@literal comparison expressions}.
- *
- * @author Christoph Strobl
- * @since 1.10
- */
-public class ComparisonOperators {
-
-	/**
-	 * Take the field referenced by given {@literal fieldReference}.
-	 *
-	 * @param fieldReference must not be {@literal null}.
-	 * @return
-	 */
-	public static ComparisonOperatorFactory valueOf(String fieldReference) {
-		return new ComparisonOperatorFactory(fieldReference);
-	}
-
-	/**
-	 * Take the value resulting from the given {@link AggregationExpression}.
-	 *
-	 * @param expression must not be {@literal null}.
-	 * @return
-	 */
-	public static ComparisonOperatorFactory valueOf(AggregationExpression expression) {
-		return new ComparisonOperatorFactory(expression);
-	}
-
-	public static class ComparisonOperatorFactory {
-
-		private final String fieldReference;
-		private final AggregationExpression expression;
-
-		/**
-		 * Creates new {@link ComparisonOperatorFactory} for given {@literal fieldReference}.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 */
-		public ComparisonOperatorFactory(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			this.fieldReference = fieldReference;
-			this.expression = null;
-		}
-
-		/**
-		 * Creates new {@link ComparisonOperatorFactory} for given {@link AggregationExpression}.
-		 *
-		 * @param expression must not be {@literal null}.
-		 */
-		public ComparisonOperatorFactory(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			this.fieldReference = null;
-			this.expression = expression;
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that compares two values.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public Cmp compareTo(String fieldReference) {
-			return createCmp().compareTo(fieldReference);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that compares two values.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public Cmp compareTo(AggregationExpression expression) {
-			return createCmp().compareTo(expression);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that compares two values.
-		 *
-		 * @param value must not be {@literal null}.
-		 * @return
-		 */
-		public Cmp compareToValue(Object value) {
-			return createCmp().compareToValue(value);
-		}
-
-		private Cmp createCmp() {
-			return usesFieldRef() ? Cmp.valueOf(fieldReference) : Cmp.valueOf(expression);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that compares two values and returns {@literal true} when the first
-		 * value is equal to the value of the referenced field.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public Eq equalTo(String fieldReference) {
-			return createEq().equalTo(fieldReference);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that compares two values and returns {@literal true} when the first
-		 * value is equal to the expression result.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public Eq equalTo(AggregationExpression expression) {
-			return createEq().equalTo(expression);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that compares two values and returns {@literal true} when the first
-		 * value is equal to the given value.
-		 *
-		 * @param value must not be {@literal null}.
-		 * @return
-		 */
-		public Eq equalToValue(Object value) {
-			return createEq().equalToValue(value);
-		}
-
-		private Eq createEq() {
-			return usesFieldRef() ? Eq.valueOf(fieldReference) : Eq.valueOf(expression);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that compares two values and returns {@literal true} when the first
-		 * value is greater than the value of the referenced field.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public Gt greaterThan(String fieldReference) {
-			return createGt().greaterThan(fieldReference);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that compares two values and returns {@literal true} when the first
-		 * value is greater than the expression result.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public Gt greaterThan(AggregationExpression expression) {
-			return createGt().greaterThan(expression);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that compares two values and returns {@literal true} when the first
-		 * value is greater than the given value.
-		 *
-		 * @param value must not be {@literal null}.
-		 * @return
-		 */
-		public Gt greaterThanValue(Object value) {
-			return createGt().greaterThanValue(value);
-		}
-
-		private Gt createGt() {
-			return usesFieldRef() ? Gt.valueOf(fieldReference) : Gt.valueOf(expression);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that compares two values and returns {@literal true} when the first
-		 * value is greater than or equivalent to the value of the referenced field.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public Gte greaterThanEqualTo(String fieldReference) {
-			return createGte().greaterThanEqualTo(fieldReference);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that compares two values and returns {@literal true} when the first
-		 * value is greater than or equivalent to the expression result.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public Gte greaterThanEqualTo(AggregationExpression expression) {
-			return createGte().greaterThanEqualTo(expression);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that compares two values and returns {@literal true} when the first
-		 * value is greater than or equivalent to the given value.
-		 *
-		 * @param value must not be {@literal null}.
-		 * @return
-		 */
-		public Gte greaterThanEqualToValue(Object value) {
-			return createGte().greaterThanEqualToValue(value);
-		}
-
-		private Gte createGte() {
-			return usesFieldRef() ? Gte.valueOf(fieldReference) : Gte.valueOf(expression);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that compares two values and returns {@literal true} when the first
-		 * value is less than the value of the referenced field.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public Lt lessThan(String fieldReference) {
-			return createLt().lessThan(fieldReference);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that compares two values and returns {@literal true} when the first
-		 * value is less than the expression result.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public Lt lessThan(AggregationExpression expression) {
-			return createLt().lessThan(expression);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that compares two values and returns {@literal true} when the first
-		 * value is less than to the given value.
-		 *
-		 * @param value must not be {@literal null}.
-		 * @return
-		 */
-		public Lt lessThanValue(Object value) {
-			return createLt().lessThanValue(value);
-		}
-
-		private Lt createLt() {
-			return usesFieldRef() ? Lt.valueOf(fieldReference) : Lt.valueOf(expression);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that compares two values and returns {@literal true} when the first
-		 * value is less than or equivalent to the value of the referenced field.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public Lte lessThanEqualTo(String fieldReference) {
-			return createLte().lessThanEqualTo(fieldReference);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that compares two values and returns {@literal true} when the first
-		 * value is less than or equivalent to the expression result.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public Lte lessThanEqualTo(AggregationExpression expression) {
-			return createLte().lessThanEqualTo(expression);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that compares two values and returns {@literal true} when the first
-		 * value is less than or equivalent to the given value.
-		 *
-		 * @param value
-		 * @return
-		 */
-		public Lte lessThanEqualToValue(Object value) {
-			return createLte().lessThanEqualToValue(value);
-		}
-
-		private Lte createLte() {
-			return usesFieldRef() ? Lte.valueOf(fieldReference) : Lte.valueOf(expression);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that compares two values and returns {@literal true} when the values
-		 * are not equivalent.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public Ne notEqualTo(String fieldReference) {
-			return createNe().notEqualTo(fieldReference);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that compares two values and returns {@literal true} when the values
-		 * are not equivalent.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public Ne notEqualTo(AggregationExpression expression) {
-			return createNe().notEqualTo(expression);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that compares two values and returns {@literal true} when the values
-		 * are not equivalent.
-		 *
-		 * @param value must not be {@literal null}.
-		 * @return
-		 */
-		public Ne notEqualToValue(Object value) {
-			return createNe().notEqualToValue(value);
-		}
-
-		private Ne createNe() {
-			return usesFieldRef() ? Ne.valueOf(fieldReference) : Ne.valueOf(expression);
-		}
-
-		private boolean usesFieldRef() {
-			return fieldReference != null;
-		}
-	}
-
-	/**
-	 * {@link AggregationExpression} for {@code $cmp}.
-	 *
-	 * @author Christoph Strobl
-	 */
-	public static class Cmp extends AbstractAggregationExpression {
-
-		private Cmp(List<?> value) {
-			super(value);
-		}
-
-		@Override
-		protected String getMongoMethod() {
-			return "$cmp";
-		}
-
-		/**
-		 * Creates new {@link Cmp}.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public static Cmp valueOf(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Cmp(asFields(fieldReference));
-		}
-
-		/**
-		 * Creates new {@link Cmp}.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public static Cmp valueOf(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Cmp(Collections.singletonList(expression));
-		}
-
-		/**
-		 * Creates new {@link Cmp} with all previously added arguments appending the given one.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public Cmp compareTo(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Cmp(append(Fields.field(fieldReference)));
-		}
-
-		/**
-		 * Creates new {@link Cmp} with all previously added arguments appending the given one.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public Cmp compareTo(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Cmp(append(expression));
-		}
-
-		/**
-		 * Creates new {@link Cmp} with all previously added arguments appending the given one.
-		 *
-		 * @param value must not be {@literal null}.
-		 * @return
-		 */
-		public Cmp compareToValue(Object value) {
-
-			Assert.notNull(value, "Value must not be null!");
-			return new Cmp(append(value));
-		}
-	}
-
-	/**
-	 * {@link AggregationExpression} for {@code $eq}.
-	 *
-	 * @author Christoph Strobl
-	 */
-	public static class Eq extends AbstractAggregationExpression {
-
-		private Eq(List<?> value) {
-			super(value);
-		}
-
-		@Override
-		protected String getMongoMethod() {
-			return "$eq";
-		}
-
-		/**
-		 * Creates new {@link Eq}.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public static Eq valueOf(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Eq(asFields(fieldReference));
-		}
-
-		/**
-		 * Creates new {@link Eq}.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public static Eq valueOf(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Eq(Collections.singletonList(expression));
-		}
-
-		/**
-		 * Creates new {@link Eq} with all previously added arguments appending the given one.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public Eq equalTo(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Eq(append(Fields.field(fieldReference)));
-		}
-
-		/**
-		 * Creates new {@link Eq} with all previously added arguments appending the given one.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public Eq equalTo(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Eq(append(expression));
-		}
-
-		/**
-		 * Creates new {@link Eq} with all previously added arguments appending the given one.
-		 *
-		 * @param value must not be {@literal null}.
-		 * @return
-		 */
-		public Eq equalToValue(Object value) {
-
-			Assert.notNull(value, "Value must not be null!");
-			return new Eq(append(value));
-		}
-	}
-
-	/**
-	 * {@link AggregationExpression} for {@code $gt}.
-	 *
-	 * @author Christoph Strobl
-	 */
-	public static class Gt extends AbstractAggregationExpression {
-
-		private Gt(List<?> value) {
-			super(value);
-		}
-
-		@Override
-		protected String getMongoMethod() {
-			return "$gt";
-		}
-
-		/**
-		 * Creates new {@link Gt}.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public static Gt valueOf(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Gt(asFields(fieldReference));
-		}
-
-		/**
-		 * Creates new {@link Gt}.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public static Gt valueOf(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Gt(Collections.singletonList(expression));
-		}
-
-		/**
-		 * Creates new {@link Gt} with all previously added arguments appending the given one.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public Gt greaterThan(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Gt(append(Fields.field(fieldReference)));
-		}
-
-		/**
-		 * Creates new {@link Gt} with all previously added arguments appending the given one.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public Gt greaterThan(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Gt(append(expression));
-		}
-
-		/**
-		 * Creates new {@link Gt} with all previously added arguments appending the given one.
-		 *
-		 * @param value must not be {@literal null}.
-		 * @return
-		 */
-		public Gt greaterThanValue(Object value) {
-
-			Assert.notNull(value, "Value must not be null!");
-			return new Gt(append(value));
-		}
-	}
-
-	/**
-	 * {@link AggregationExpression} for {@code $lt}.
-	 *
-	 * @author Christoph Strobl
-	 */
-	public static class Lt extends AbstractAggregationExpression {
-
-		private Lt(List<?> value) {
-			super(value);
-		}
-
-		@Override
-		protected String getMongoMethod() {
-			return "$lt";
-		}
-
-		/**
-		 * Creates new {@link Lt}.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public static Lt valueOf(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Lt(asFields(fieldReference));
-		}
-
-		/**
-		 * Creates new {@link Lt}.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public static Lt valueOf(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Lt(Collections.singletonList(expression));
-		}
-
-		/**
-		 * Creates new {@link Lt} with all previously added arguments appending the given one.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public Lt lessThan(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Lt(append(Fields.field(fieldReference)));
-		}
-
-		/**
-		 * Creates new {@link Lt} with all previously added arguments appending the given one.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public Lt lessThan(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Lt(append(expression));
-		}
-
-		/**
-		 * Creates new {@link Lt} with all previously added arguments appending the given one.
-		 *
-		 * @param value must not be {@literal null}.
-		 * @return
-		 */
-		public Lt lessThanValue(Object value) {
-
-			Assert.notNull(value, "Value must not be null!");
-			return new Lt(append(value));
-		}
-	}
-
-	/**
-	 * {@link AggregationExpression} for {@code $gte}.
-	 *
-	 * @author Christoph Strobl
-	 */
-	public static class Gte extends AbstractAggregationExpression {
-
-		private Gte(List<?> value) {
-			super(value);
-		}
-
-		@Override
-		protected String getMongoMethod() {
-			return "$gte";
-		}
-
-		/**
-		 * Creates new {@link Gte}.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public static Gte valueOf(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Gte(asFields(fieldReference));
-		}
-
-		/**
-		 * Creates new {@link Gte}.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public static Gte valueOf(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Gte(Collections.singletonList(expression));
-		}
-
-		/**
-		 * Creates new {@link Gte} with all previously added arguments appending the given one.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public Gte greaterThanEqualTo(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Gte(append(Fields.field(fieldReference)));
-		}
-
-		/**
-		 * Creates new {@link Gte} with all previously added arguments appending the given one.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public Gte greaterThanEqualTo(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Gte(append(expression));
-		}
-
-		/**
-		 * Creates new {@link Gte} with all previously added arguments appending the given one.
-		 *
-		 * @param value must not be {@literal null}.
-		 * @return
-		 */
-		public Gte greaterThanEqualToValue(Object value) {
-
-			Assert.notNull(value, "Value must not be null!");
-			return new Gte(append(value));
-		}
-	}
-
-	/**
-	 * {@link AggregationExpression} for {@code $lte}.
-	 *
-	 * @author Christoph Strobl
-	 */
-	public static class Lte extends AbstractAggregationExpression {
-
-		private Lte(List<?> value) {
-			super(value);
-		}
-
-		@Override
-		protected String getMongoMethod() {
-			return "$lte";
-		}
-
-		/**
-		 * Creates new {@link Lte}.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public static Lte valueOf(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Lte(asFields(fieldReference));
-		}
-
-		/**
-		 * Creates new {@link Lte}.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public static Lte valueOf(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Lte(Collections.singletonList(expression));
-		}
-
-		/**
-		 * Creates new {@link Lte} with all previously added arguments appending the given one.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public Lte lessThanEqualTo(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Lte(append(Fields.field(fieldReference)));
-		}
-
-		/**
-		 * Creates new {@link Lte} with all previously added arguments appending the given one.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public Lte lessThanEqualTo(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Lte(append(expression));
-		}
-
-		/**
-		 * Creates new {@link Lte} with all previously added arguments appending the given one.
-		 *
-		 * @param value must not be {@literal null}.
-		 * @return
-		 */
-		public Lte lessThanEqualToValue(Object value) {
-
-			Assert.notNull(value, "Value must not be null!");
-			return new Lte(append(value));
-		}
-	}
-
-	/**
-	 * {@link AggregationExpression} for {@code $ne}.
-	 *
-	 * @author Christoph Strobl
-	 */
-	public static class Ne extends AbstractAggregationExpression {
-
-		private Ne(List<?> value) {
-			super(value);
-		}
-
-		@Override
-		protected String getMongoMethod() {
-			return "$ne";
-		}
-
-		/**
-		 * Creates new {@link Ne}.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public static Ne valueOf(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Ne(asFields(fieldReference));
-		}
-
-		/**
-		 * Creates new {@link Ne}.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public static Ne valueOf(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Ne(Collections.singletonList(expression));
-		}
-
-		/**
-		 * Creates new {@link Ne} with all previously added arguments appending the given one.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public Ne notEqualTo(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Ne(append(Fields.field(fieldReference)));
-		}
-
-		/**
-		 * Creates new {@link Ne} with all previously added arguments appending the given one.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public Ne notEqualTo(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Ne(append(expression));
-		}
-
-		/**
-		 * Creates new {@link Eq} with all previously added arguments appending the given one.
-		 *
-		 * @param value must not be {@literal null}.
-		 * @return
-		 */
-		public Ne notEqualToValue(Object value) {
-
-			Assert.notNull(value, "Value must not be null!");
-			return new Ne(append(value));
-		}
-	}
-}

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

@@ -1,976 +0,0 @@
-/*
- * 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.core.aggregation;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.bson.Document;
-import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.OtherwiseBuilder;
-import org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.ThenBuilder;
-import org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Switch.CaseOperator;
-import org.springframework.data.mongodb.core.query.CriteriaDefinition;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-
-/**
- * Gateway to {@literal conditional expressions} that evaluate their argument expressions as booleans to a value.
- *
- * @author Mark Paluch
- * @since 1.10
- */
-public class ConditionalOperators {
-
-	/**
-	 * Take the field referenced by given {@literal fieldReference}.
-	 *
-	 * @param fieldReference must not be {@literal null}.
-	 * @return
-	 */
-	public static ConditionalOperatorFactory when(String fieldReference) {
-		return new ConditionalOperatorFactory(fieldReference);
-	}
-
-	/**
-	 * Take the value resulting from the given {@literal expression}.
-	 *
-	 * @param expression must not be {@literal null}.
-	 * @return
-	 */
-	public static ConditionalOperatorFactory when(AggregationExpression expression) {
-		return new ConditionalOperatorFactory(expression);
-	}
-
-	/**
-	 * Take the value resulting from the given {@literal criteriaDefinition}.
-	 *
-	 * @param criteriaDefinition must not be {@literal null}.
-	 * @return
-	 */
-	public static ConditionalOperatorFactory when(CriteriaDefinition criteriaDefinition) {
-		return new ConditionalOperatorFactory(criteriaDefinition);
-	}
-
-	/**
-	 * Creates new {@link AggregationExpression} that evaluates an expression and returns the value of the expression if
-	 * the expression evaluates to a non-null value. If the expression evaluates to a {@literal null} value, including
-	 * instances of undefined values or missing fields, returns the value of the replacement expression.
-	 *
-	 * @param fieldReference must not be {@literal null}.
-	 * @return
-	 */
-	public static IfNull.ThenBuilder ifNull(String fieldReference) {
-
-		Assert.notNull(fieldReference, "FieldReference must not be null!");
-		return IfNull.ifNull(fieldReference);
-	}
-
-	/**
-	 * Creates new {@link AggregationExpression} that evaluates an expression and returns the value of the expression if
-	 * the expression evaluates to a non-null value. If the expression evaluates to a {@literal null} value, including
-	 * instances of undefined values or missing fields, returns the value of the replacement expression.
-	 *
-	 * @param expression must not be {@literal null}.
-	 * @return
-	 */
-	public static IfNull.ThenBuilder ifNull(AggregationExpression expression) {
-
-		Assert.notNull(expression, "Expression must not be null!");
-		return IfNull.ifNull(expression);
-	}
-
-	/**
-	 * Creates new {@link AggregationExpression} that evaluates a series of {@link CaseOperator} expressions. When it
-	 * finds an expression which evaluates to {@literal true}, {@code $switch} executes a specified expression and breaks
-	 * out of the control flow.
-	 *
-	 * @param conditions must not be {@literal null}.
-	 * @return
-	 */
-	public static Switch switchCases(CaseOperator... conditions) {
-		return Switch.switchCases(conditions);
-	}
-
-	/**
-	 * Creates new {@link AggregationExpression} that evaluates a series of {@link CaseOperator} expressions. When it
-	 * finds an expression which evaluates to {@literal true}, {@code $switch} executes a specified expression and breaks
-	 * out of the control flow.
-	 *
-	 * @param conditions must not be {@literal null}.
-	 * @return
-	 */
-	public static Switch switchCases(List<CaseOperator> conditions) {
-		return Switch.switchCases(conditions);
-	}
-
-	public static class ConditionalOperatorFactory {
-
-		private final String fieldReference;
-		private final AggregationExpression expression;
-		private final CriteriaDefinition criteriaDefinition;
-
-		/**
-		 * Creates new {@link ConditionalOperatorFactory} for given {@literal fieldReference}.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 */
-		public ConditionalOperatorFactory(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-
-			this.fieldReference = fieldReference;
-			this.expression = null;
-			this.criteriaDefinition = null;
-		}
-
-		/**
-		 * Creates new {@link ConditionalOperatorFactory} for given {@link AggregationExpression}.
-		 *
-		 * @param expression must not be {@literal null}.
-		 */
-		public ConditionalOperatorFactory(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-
-			this.fieldReference = null;
-			this.expression = expression;
-			this.criteriaDefinition = null;
-		}
-
-		/**
-		 * Creates new {@link ConditionalOperatorFactory} for given {@link CriteriaDefinition}.
-		 *
-		 * @param criteriaDefinition must not be {@literal null}.
-		 */
-		public ConditionalOperatorFactory(CriteriaDefinition criteriaDefinition) {
-
-			Assert.notNull(criteriaDefinition, "CriteriaDefinition must not be null!");
-
-			this.fieldReference = null;
-			this.expression = null;
-			this.criteriaDefinition = criteriaDefinition;
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that evaluates a boolean expression to return one of the two specified
-		 * return expressions.
-		 *
-		 * @param value must not be {@literal null}.
-		 * @return
-		 */
-		public OtherwiseBuilder then(Object value) {
-
-			Assert.notNull(value, "Value must not be null!");
-			return createThenBuilder().then(value);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that evaluates a boolean expression to return one of the two specified
-		 * return expressions.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public OtherwiseBuilder thenValueOf(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return createThenBuilder().then(expression);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that evaluates a boolean expression to return one of the two specified
-		 * return expressions.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public OtherwiseBuilder thenValueOf(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return createThenBuilder().then(fieldReference);
-		}
-
-		private ThenBuilder createThenBuilder() {
-
-			if (usesFieldRef()) {
-				return Cond.newBuilder().when(fieldReference);
-			}
-
-			return usesCriteriaDefinition() ? Cond.newBuilder().when(criteriaDefinition) : Cond.newBuilder().when(expression);
-		}
-
-		private boolean usesFieldRef() {
-			return this.fieldReference != null;
-		}
-
-		private boolean usesCriteriaDefinition() {
-			return this.criteriaDefinition != null;
-		}
-	}
-
-	/**
-	 * Encapsulates the aggregation framework {@code $ifNull} operator. Replacement values can be either {@link Field
-	 * field references}, {@link AggregationExpression expressions}, values of simple MongoDB types or values that can be
-	 * converted to a simple MongoDB type.
-	 *
-	 * @see <a href=
-	 *      "https://docs.mongodb.com/manual/reference/operator/aggregation/ifNull/">https://docs.mongodb.com/manual/reference/operator/aggregation/ifNull/</a>
-	 * @author Mark Paluch
-	 */
-	public static class IfNull implements AggregationExpression {
-
-		private final Object condition;
-		private final Object value;
-
-		private IfNull(Object condition, Object value) {
-
-			this.condition = condition;
-			this.value = value;
-		}
-
-		/**
-		 * Creates new {@link IfNull}.
-		 *
-		 * @param fieldReference the field to check for a {@literal null} value, field reference must not be {@literal null}
-		 *          .
-		 * @return
-		 */
-		public static ThenBuilder ifNull(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new IfNullOperatorBuilder().ifNull(fieldReference);
-		}
-
-		/**
-		 * Creates new {@link IfNull}.
-		 *
-		 * @param expression the expression to check for a {@literal null} value, field reference must not be
-		 *          {@literal null}.
-		 * @return
-		 */
-		public static ThenBuilder ifNull(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new IfNullOperatorBuilder().ifNull(expression);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
-		@Override
-		public Document toDocument(AggregationOperationContext context) {
-
-			List<Object> list = new ArrayList<Object>();
-
-			if (condition instanceof Field) {
-				list.add(context.getReference((Field) condition).toString());
-			} else if (condition instanceof AggregationExpression) {
-				list.add(((AggregationExpression) condition).toDocument(context));
-			} else {
-				list.add(condition);
-			}
-
-			list.add(resolve(value, context));
-
-			return new Document("$ifNull", list);
-		}
-
-		private Object resolve(Object value, AggregationOperationContext context) {
-
-			if (value instanceof Field) {
-				return context.getReference((Field) value).toString();
-			} else if (value instanceof AggregationExpression) {
-				return ((AggregationExpression) value).toDocument(context);
-			} else if (value instanceof Document) {
-				return value;
-			}
-
-			return context.getMappedObject(new Document("$set", value)).get("$set");
-		}
-
-		/**
-		 * @author Mark Paluch
-		 */
-		public interface IfNullBuilder {
-
-			/**
-			 * @param fieldReference the field to check for a {@literal null} value, field reference must not be
-			 *          {@literal null}.
-			 * @return the {@link ThenBuilder}
-			 */
-			ThenBuilder ifNull(String fieldReference);
-
-			/**
-			 * @param expression the expression to check for a {@literal null} value, field name must not be {@literal null}
-			 *          or empty.
-			 * @return the {@link ThenBuilder}
-			 */
-			ThenBuilder ifNull(AggregationExpression expression);
-		}
-
-		/**
-		 * @author Mark Paluch
-		 */
-		public interface ThenBuilder {
-
-			/**
-			 * @param value the value to be used if the {@code $ifNull} condition evaluates {@literal true}. Can be a
-			 *          {@link Document}, a value that is supported by MongoDB or a value that can be converted to a MongoDB
-			 *          representation but must not be {@literal null}.
-			 * @return
-			 */
-			IfNull then(Object value);
-
-			/**
-			 * @param fieldReference the field holding the replacement value, must not be {@literal null}.
-			 * @return
-			 */
-			IfNull thenValueOf(String fieldReference);
-
-			/**
-			 * @param expression the expression yielding to the replacement value, must not be {@literal null}.
-			 * @return
-			 */
-			IfNull thenValueOf(AggregationExpression expression);
-		}
-
-		/**
-		 * Builder for fluent {@link IfNull} creation.
-		 *
-		 * @author Mark Paluch
-		 */
-		static final class IfNullOperatorBuilder implements IfNullBuilder, ThenBuilder {
-
-			private Object condition;
-
-			private IfNullOperatorBuilder() {}
-
-			/**
-			 * Creates a new builder for {@link IfNull}.
-			 *
-			 * @return never {@literal null}.
-			 */
-			public static IfNullOperatorBuilder newBuilder() {
-				return new IfNullOperatorBuilder();
-			}
-
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.IfNull.IfNullBuilder#ifNull(java.lang.String)
-			 */
-			public ThenBuilder ifNull(String fieldReference) {
-
-				Assert.hasText(fieldReference, "FieldReference name must not be null or empty!");
-				this.condition = Fields.field(fieldReference);
-				return this;
-			}
-
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.IfNull.IfNullBuilder#ifNull(org.springframework.data.mongodb.core.aggregation.AggregationExpression)
-			 */
-			@Override
-			public ThenBuilder ifNull(AggregationExpression expression) {
-
-				Assert.notNull(expression, "AggregationExpression name must not be null or empty!");
-				this.condition = expression;
-				return this;
-			}
-
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.IfNull.ThenBuilder#then(java.lang.Object)
-			 */
-			public IfNull then(Object value) {
-				return new IfNull(condition, value);
-			}
-
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.IfNull.ThenBuilder#thenValueOf(java.lang.String)
-			 */
-			public IfNull thenValueOf(String fieldReference) {
-
-				Assert.notNull(fieldReference, "FieldReference must not be null!");
-				return new IfNull(condition, Fields.field(fieldReference));
-			}
-
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.IfNull.ThenBuilder#thenValueOf(org.springframework.data.mongodb.core.aggregation.AggregationExpression)
-			 */
-			public IfNull thenValueOf(AggregationExpression expression) {
-
-				Assert.notNull(expression, "Expression must not be null!");
-				return new IfNull(condition, expression);
-			}
-		}
-	}
-
-	/**
-	 * {@link AggregationExpression} for {@code $switch}.
-	 *
-	 * @author Christoph Strobl
-	 */
-	public static class Switch extends AbstractAggregationExpression {
-
-		private Switch(java.util.Map<String, Object> values) {
-			super(values);
-		}
-
-		@Override
-		protected String getMongoMethod() {
-			return "$switch";
-		}
-
-		/**
-		 * Creates new {@link Switch}.
-		 *
-		 * @param conditions must not be {@literal null}.
-		 */
-		public static Switch switchCases(CaseOperator... conditions) {
-
-			Assert.notNull(conditions, "Conditions must not be null!");
-			return switchCases(Arrays.asList(conditions));
-		}
-
-		/**
-		 * Creates new {@link Switch}.
-		 *
-		 * @param conditions must not be {@literal null}.
-		 */
-		public static Switch switchCases(List<CaseOperator> conditions) {
-
-			Assert.notNull(conditions, "Conditions must not be null!");
-			return new Switch(Collections.<String, Object> singletonMap("branches", new ArrayList<CaseOperator>(conditions)));
-		}
-
-		public Switch defaultTo(Object value) {
-			return new Switch(append("default", value));
-		}
-
-		/**
-		 * Encapsulates the aggregation framework case document inside a {@code $switch}-operation.
-		 */
-		public static class CaseOperator implements AggregationExpression {
-
-			private final AggregationExpression when;
-			private final Object then;
-
-			private CaseOperator(AggregationExpression when, Object then) {
-
-				this.when = when;
-				this.then = then;
-			}
-
-			public static ThenBuilder when(final AggregationExpression condition) {
-
-				Assert.notNull(condition, "Condition must not be null!");
-
-				return new ThenBuilder() {
-
-					@Override
-					public CaseOperator then(Object value) {
-
-						Assert.notNull(value, "Value must not be null!");
-						return new CaseOperator(condition, value);
-					}
-				};
-			}
-
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-			 */
-			@Override
-			public Document toDocument(AggregationOperationContext context) {
-
-				Document dbo = new Document("case", when.toDocument(context));
-
-				if (then instanceof AggregationExpression) {
-					dbo.put("then", ((AggregationExpression) then).toDocument(context));
-				} else if (then instanceof Field) {
-					dbo.put("then", context.getReference((Field) then).toString());
-				} else {
-					dbo.put("then", then);
-				}
-
-				return dbo;
-			}
-
-			/**
-			 * @author Christoph Strobl
-			 */
-			public interface ThenBuilder {
-
-				/**
-				 * Set the then {@literal value}.
-				 *
-				 * @param value must not be {@literal null}.
-				 * @return
-				 */
-				CaseOperator then(Object value);
-			}
-		}
-	}
-
-	/**
-	 * Encapsulates the aggregation framework {@code $cond} operator. A {@link Cond} allows nested conditions
-	 * {@code if-then[if-then-else]-else} using {@link Field}, {@link CriteriaDefinition}, {@link AggregationExpression}
-	 * or a {@link Document custom} condition. Replacement values can be either {@link Field field references},
-	 * {@link AggregationExpression expressions}, values of simple MongoDB types or values that can be converted to a
-	 * simple MongoDB type.
-	 *
-	 * @see <a href=
-	 *      "https://docs.mongodb.com/manual/reference/operator/aggregation/cond/">https://docs.mongodb.com/manual/reference/operator/aggregation/cond/</a>
-	 * @author Mark Paluch
-	 * @author Christoph Strobl
-	 */
-	public static class Cond implements AggregationExpression {
-
-		private final Object condition;
-		private final Object thenValue;
-		private final Object otherwiseValue;
-
-		/**
-		 * Creates a new {@link Cond} for a given {@link Field} and {@code then}/{@code otherwise} values.
-		 *
-		 * @param condition must not be {@literal null}.
-		 * @param thenValue must not be {@literal null}.
-		 * @param otherwiseValue must not be {@literal null}.
-		 */
-		private Cond(Field condition, Object thenValue, Object otherwiseValue) {
-			this((Object) condition, thenValue, otherwiseValue);
-		}
-
-		/**
-		 * Creates a new {@link Cond} for a given {@link CriteriaDefinition} and {@code then}/{@code otherwise} values.
-		 *
-		 * @param condition must not be {@literal null}.
-		 * @param thenValue must not be {@literal null}.
-		 * @param otherwiseValue must not be {@literal null}.
-		 */
-		private Cond(CriteriaDefinition condition, Object thenValue, Object otherwiseValue) {
-			this((Object) condition, thenValue, otherwiseValue);
-		}
-
-		private Cond(Object condition, Object thenValue, Object otherwiseValue) {
-
-			Assert.notNull(condition, "Condition must not be null!");
-			Assert.notNull(thenValue, "Then value must not be null!");
-			Assert.notNull(otherwiseValue, "Otherwise value must not be null!");
-
-			assertNotBuilder(condition, "Condition");
-			assertNotBuilder(thenValue, "Then value");
-			assertNotBuilder(otherwiseValue, "Otherwise value");
-
-			this.condition = condition;
-			this.thenValue = thenValue;
-			this.otherwiseValue = otherwiseValue;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
-		@Override
-		public Document toDocument(AggregationOperationContext context) {
-
-			Document condObject = new Document();
-
-			condObject.append("if", resolveCriteria(context, condition));
-			condObject.append("then", resolveValue(context, thenValue));
-			condObject.append("else", resolveValue(context, otherwiseValue));
-
-			return new Document("$cond", condObject);
-		}
-
-		private Object resolveValue(AggregationOperationContext context, Object value) {
-
-			if (value instanceof Document || value instanceof Field) {
-				return resolve(context, value);
-			}
-
-			if (value instanceof AggregationExpression) {
-				return ((AggregationExpression) value).toDocument(context);
-			}
-
-			return context.getMappedObject(new Document("$set", value)).get("$set");
-		}
-
-		private Object resolveCriteria(AggregationOperationContext context, Object value) {
-
-			if (value instanceof Document || value instanceof Field) {
-				return resolve(context, value);
-			}
-
-			if (value instanceof AggregationExpression) {
-				return ((AggregationExpression) value).toDocument(context);
-			}
-
-			if (value instanceof CriteriaDefinition) {
-
-				Document mappedObject = context.getMappedObject(((CriteriaDefinition) value).getCriteriaObject());
-				List<Object> clauses = new ArrayList<Object>();
-
-				clauses.addAll(getClauses(context, mappedObject));
-
-				return clauses.size() == 1 ? clauses.get(0) : clauses;
-			}
-
-			throw new InvalidDataAccessApiUsageException(
-					String.format("Invalid value in condition. Supported: Document, Field references, Criteria, got: %s", value));
-		}
-
-		private List<Object> getClauses(AggregationOperationContext context, Document mappedObject) {
-
-			List<Object> clauses = new ArrayList<Object>();
-
-			for (String key : mappedObject.keySet()) {
-
-				Object predicate = mappedObject.get(key);
-				clauses.addAll(getClauses(context, key, predicate));
-			}
-
-			return clauses;
-		}
-
-		private List<Object> getClauses(AggregationOperationContext context, String key, Object predicate) {
-
-			List<Object> clauses = new ArrayList<Object>();
-
-			if (predicate instanceof List) {
-
-				List<Object> args = new ArrayList<Object>();
-				for (Object clause : (List<?>) predicate) {
-					if (clause instanceof Document) {
-						args.addAll(getClauses(context, (Document) clause));
-					}
-				}
-
-				clauses.add(new Document(key, args));
-
-			} else if (predicate instanceof Document) {
-
-				Document nested = (Document) predicate;
-
-				for (String s : nested.keySet()) {
-
-					if (!isKeyword(s)) {
-						continue;
-					}
-
-					List<Object> args = new ArrayList<Object>();
-					args.add("$" + key);
-					args.add(nested.get(s));
-					clauses.add(new Document(s, args));
-				}
-
-			} else if (!isKeyword(key)) {
-
-				List<Object> args = new ArrayList<Object>();
-				args.add("$" + key);
-				args.add(predicate);
-				clauses.add(new Document("$eq", args));
-			}
-
-			return clauses;
-		}
-
-		/**
-		 * Returns whether the given {@link String} is a MongoDB keyword.
-		 *
-		 * @param candidate
-		 * @return
-		 */
-		private boolean isKeyword(String candidate) {
-			return candidate.startsWith("$");
-		}
-
-		private Object resolve(AggregationOperationContext context, Object value) {
-
-			if (value instanceof Document) {
-				return context.getMappedObject((Document) value);
-			}
-
-			return context.getReference((Field) value).toString();
-		}
-
-		private void assertNotBuilder(Object toCheck, String name) {
-			Assert.isTrue(!ClassUtils.isAssignableValue(ConditionalExpressionBuilder.class, toCheck),
-					String.format("%s must not be of type %s", name, ConditionalExpressionBuilder.class.getSimpleName()));
-		}
-
-		/**
-		 * Get a builder that allows fluent creation of {@link Cond}.
-		 *
-		 * @return never {@literal null}.
-		 */
-		public static WhenBuilder newBuilder() {
-			return ConditionalExpressionBuilder.newBuilder();
-		}
-
-		/**
-		 * Start creating new {@link Cond} by providing the boolean expression used in {@code if}.
-		 *
-		 * @param booleanExpression must not be {@literal null}.
-		 * @return never {@literal null}.
-		 */
-		public static ThenBuilder when(Document booleanExpression) {
-			return ConditionalExpressionBuilder.newBuilder().when(booleanExpression);
-		}
-
-		/**
-		 * Start creating new {@link Cond} by providing the {@link AggregationExpression} used in {@code if}.
-		 *
-		 * @param expression expression that yields in a boolean result, must not be {@literal null}.
-		 * @return never {@literal null}.
-		 */
-		public static ThenBuilder when(AggregationExpression expression) {
-			return ConditionalExpressionBuilder.newBuilder().when(expression);
-		}
-
-		/**
-		 * Start creating new {@link Cond} by providing the field reference used in {@code if}.
-		 *
-		 * @param booleanField name of a field holding a boolean value, must not be {@literal null}.
-		 * @return never {@literal null}.
-		 */
-		public static ThenBuilder when(String booleanField) {
-			return ConditionalExpressionBuilder.newBuilder().when(booleanField);
-		}
-
-		/**
-		 * Start creating new {@link Cond} by providing the {@link CriteriaDefinition} used in {@code if}.
-		 *
-		 * @param criteria criteria to evaluate, must not be {@literal null}.
-		 * @return the {@link ThenBuilder}
-		 */
-		public static ThenBuilder when(CriteriaDefinition criteria) {
-			return ConditionalExpressionBuilder.newBuilder().when(criteria);
-		}
-
-		/**
-		 * @author Mark Paluch
-		 */
-		public interface WhenBuilder {
-
-			/**
-			 * @param booleanExpression expression that yields in a boolean result, must not be {@literal null}.
-			 * @return the {@link ThenBuilder}
-			 */
-			ThenBuilder when(Document booleanExpression);
-
-			/**
-			 * @param expression expression that yields in a boolean result, must not be {@literal null}.
-			 * @return the {@link ThenBuilder}
-			 */
-			ThenBuilder when(AggregationExpression expression);
-
-			/**
-			 * @param booleanField name of a field holding a boolean value, must not be {@literal null}.
-			 * @return the {@link ThenBuilder}
-			 */
-			ThenBuilder when(String booleanField);
-
-			/**
-			 * @param criteria criteria to evaluate, must not be {@literal null}.
-			 * @return the {@link ThenBuilder}
-			 */
-			ThenBuilder when(CriteriaDefinition criteria);
-		}
-
-		/**
-		 * @author Mark Paluch
-		 */
-		public interface ThenBuilder {
-
-			/**
-			 * @param value the value to be used if the condition evaluates {@literal true}. Can be a {@link Document}, a
-			 *          value that is supported by MongoDB or a value that can be converted to a MongoDB representation but
-			 *          must not be {@literal null}.
-			 * @return the {@link OtherwiseBuilder}
-			 */
-			OtherwiseBuilder then(Object value);
-
-			/**
-			 * @param fieldReference must not be {@literal null}.
-			 * @return the {@link OtherwiseBuilder}
-			 */
-			OtherwiseBuilder thenValueOf(String fieldReference);
-
-			/**
-			 * @param expression must not be {@literal null}.
-			 * @return the {@link OtherwiseBuilder}
-			 */
-			OtherwiseBuilder thenValueOf(AggregationExpression expression);
-		}
-
-		/**
-		 * @author Mark Paluch
-		 */
-		public interface OtherwiseBuilder {
-
-			/**
-			 * @param value the value to be used if the condition evaluates {@literal false}. Can be a {@link Document}, a
-			 *          value that is supported by MongoDB or a value that can be converted to a MongoDB representation but
-			 *          must not be {@literal null}.
-			 * @return the {@link Cond}
-			 */
-			Cond otherwise(Object value);
-
-			/**
-			 * @param fieldReference must not be {@literal null}.
-			 * @return the {@link Cond}
-			 */
-			Cond otherwiseValueOf(String fieldReference);
-
-			/**
-			 * @param expression must not be {@literal null}.
-			 * @return the {@link Cond}
-			 */
-			Cond otherwiseValueOf(AggregationExpression expression);
-		}
-
-		/**
-		 * Builder for fluent {@link Cond} creation.
-		 *
-		 * @author Mark Paluch
-		 */
-		static class ConditionalExpressionBuilder implements WhenBuilder, ThenBuilder, OtherwiseBuilder {
-
-			private Object condition;
-			private Object thenValue;
-
-			private ConditionalExpressionBuilder() {}
-
-			/**
-			 * Creates a new builder for {@link Cond}.
-			 *
-			 * @return never {@literal null}.
-			 */
-			public static ConditionalExpressionBuilder newBuilder() {
-				return new ConditionalExpressionBuilder();
-			}
-
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.WhenBuilder#when(org.bson.Document)
-			 */
-			@Override
-			public ConditionalExpressionBuilder when(Document booleanExpression) {
-
-				Assert.notNull(booleanExpression, "'Boolean expression' must not be null!");
-
-				this.condition = booleanExpression;
-				return this;
-			}
-
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.WhenBuilder#when(org.springframework.data.mongodb.core.query.CriteriaDefinition)
-			 */
-			@Override
-			public ThenBuilder when(CriteriaDefinition criteria) {
-
-				Assert.notNull(criteria, "Criteria must not be null!");
-				this.condition = criteria;
-				return this;
-			}
-
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.WhenBuilder#when(org.springframework.data.mongodb.core.aggregation.AggregationExpression)
-			 */
-			@Override
-			public ThenBuilder when(AggregationExpression expression) {
-
-				Assert.notNull(expression, "AggregationExpression field must not be null!");
-				this.condition = expression;
-				return this;
-			}
-
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.WhenBuilder#when(java.lang.String)
-			 */
-			@Override
-			public ThenBuilder when(String booleanField) {
-
-				Assert.hasText(booleanField, "Boolean field name must not be null or empty!");
-				this.condition = Fields.field(booleanField);
-				return this;
-			}
-
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.ThenBuilder#then(java.lang.Object)
-			 */
-			@Override
-			public OtherwiseBuilder then(Object thenValue) {
-
-				Assert.notNull(thenValue, "Then-value must not be null!");
-				this.thenValue = thenValue;
-				return this;
-			}
-
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.ThenBuilder#thenValueOf(java.lang.String)
-			 */
-			@Override
-			public OtherwiseBuilder thenValueOf(String fieldReference) {
-
-				Assert.notNull(fieldReference, "FieldReference must not be null!");
-				this.thenValue = Fields.field(fieldReference);
-				return this;
-			}
-
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.ThenBuilder#thenValueOf(org.springframework.data.mongodb.core.aggregation.AggregationExpression)
-			 */
-			@Override
-			public OtherwiseBuilder thenValueOf(AggregationExpression expression) {
-
-				Assert.notNull(expression, "AggregationExpression must not be null!");
-				this.thenValue = expression;
-				return this;
-			}
-
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.OtherwiseBuilder#otherwise(java.lang.Object)
-			 */
-			@Override
-			public Cond otherwise(Object otherwiseValue) {
-
-				Assert.notNull(otherwiseValue, "Value must not be null!");
-				return new Cond(condition, thenValue, otherwiseValue);
-			}
-
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.OtherwiseBuilder#otherwiseValueOf(java.lang.String)
-			 */
-			@Override
-			public Cond otherwiseValueOf(String fieldReference) {
-
-				Assert.notNull(fieldReference, "FieldReference must not be null!");
-				return new Cond(condition, thenValue, Fields.field(fieldReference));
-			}
-
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.OtherwiseBuilder#otherwiseValueOf(org.springframework.data.mongodb.core.aggregation.AggregationExpression)
-			 */
-			@Override
-			public Cond otherwiseValueOf(AggregationExpression expression) {
-
-				Assert.notNull(expression, "AggregationExpression must not be null!");
-				return new Cond(condition, thenValue, expression);
-			}
-		}
-	}
-}

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

@@ -1,80 +0,0 @@
-/*
- * 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.core.aggregation;
-
-import org.bson.Document;
-import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
-import org.springframework.util.Assert;
-
-/**
- * Encapsulates the aggregation framework {@code $count}-operation. <br />
- * We recommend to use the static factory method {@link Aggregation#count()} instead of creating instances of this class
- * directly.
- *
- * @see <a href=
- *      "https://docs.mongodb.com/manual/reference/operator/aggregation/count/#pipe._S_count">https://docs.mongodb.com/manual/reference/operator/aggregation/count/</a>
- * @author Mark Paluch
- * @since 1.10
- */
-public class CountOperation implements FieldsExposingAggregationOperation {
-
-	private final String fieldName;
-
-	/**
-	 * Creates a new {@link CountOperation} given the {@link fieldName} field name.
-	 *
-	 * @param asFieldName must not be {@literal null} or empty.
-	 */
-	public CountOperation(String fieldName) {
-
-		Assert.hasText(fieldName, "Field name must not be null or empty!");
-		this.fieldName = fieldName;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
-	@Override
-	public Document toDocument(AggregationOperationContext context) {
-		return new Document("$count", fieldName);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields()
-	 */
-	@Override
-	public ExposedFields getFields() {
-		return ExposedFields.from(new ExposedField(fieldName, true));
-	}
-
-	/**
-	 * Builder for {@link CountOperation}.
-	 *
-	 * @author Mark Paluch
-	 */
-	public static class CountOperationBuilder {
-
-		/**
-		 * Returns the finally to be applied {@link CountOperation} with the given alias.
-		 *
-		 * @param fieldName must not be {@literal null} or empty.
-		 * @return
-		 */
-		public CountOperation as(String fieldName) {
-			return new CountOperation(fieldName);
-		}
-	}
-}

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

@@ -1,67 +0,0 @@
-/*
- * 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.core.aggregation;
-
-import org.springframework.util.Assert;
-
-/**
- * Gateway to {@literal data type} expressions.
- *
- * @author Christoph Strobl
- * @since 1.10
- * @soundtrack Clawfinger - Catch Me
- */
-public class DataTypeOperators {
-
-	/**
-	 * Return the BSON data type of the given {@literal field}.
-	 *
-	 * @param fieldReference must not be {@literal null}.
-	 * @return
-	 */
-	public static Type typeOf(String fieldReference) {
-		return Type.typeOf(fieldReference);
-	}
-
-	/**
-	 * {@link AggregationExpression} for {@code $type}.
-	 *
-	 * @author Christoph Strobl
-	 */
-	public static class Type extends AbstractAggregationExpression {
-
-		private Type(Object value) {
-			super(value);
-		}
-
-		@Override
-		protected String getMongoMethod() {
-			return "$type";
-		}
-
-		/**
-		 * Creates new {@link Type}.
-		 *
-		 * @param field must not be {@literal null}.
-		 * @return
-		 */
-		public static Type typeOf(String field) {
-
-			Assert.notNull(field, "Field must not be null!");
-			return new Type(Fields.field(field));
-		}
-	}
-}