DATAMONGO-1669 - Release version 1.10.3 (Ingalls SR3).

We now consider the property's collection type after bulk-fetching DBRefs before returning the actual result value. The issue got only visible if bulk fetching is possible and constructor creation is used. Setting the property value on through an property accessor works fine because the property accessor checks all values for assignability and potentially converts values to their target type. That's different for constructor creation.

Original Pull Request: #457

.travis.yml

@@ -9,16 +9,21 @@ before_script:
 env:
   matrix:
     - PROFILE=ci
-    - PROFILE=mongo35-next
+    - PROFILE=mongo-next
+    - PROFILE=mongo3
+    - PROFILE=mongo3-next
+    - PROFILE=mongo31
+    - PROFILE=mongo32
+    - PROFILE=mongo33
+    - PROFILE=mongo34
+    - PROFILE=mongo34-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-upstart
-      - sourceline: 'deb [arch=amd64] http://repo.mongodb.org/apt/ubuntu precise/mongodb-org/3.4 multiverse'
-        key_url: 'https://www.mongodb.org/static/pgp/server-3.4.asc'
+    - mongodb-3.4-precise
     packages:
     - mongodb-org-server
     - mongodb-org-shell

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.M4</version>
+	<version>1.10.3.RELEASE</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.M4</version>
+		<version>1.9.3.RELEASE</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.M4</springdata.commons>
-		<mongo>3.4.2</mongo>
-		<mongo.reactivestreams>1.5.0</mongo.reactivestreams>
+		<springdata.commons>1.13.3.RELEASE</springdata.commons>
+		<mongo>2.14.3</mongo>
+		<mongo.osgi>2.13.0</mongo.osgi>
 	</properties>
 
 	<developers>
@@ -100,26 +100,14 @@
 			</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>mongo34-next</id>
+			<id>mongo-next</id>
 			<properties>
-				<mongo>3.4.3-SNAPSHOT</mongo>
+				<mongo>2.15.0-SNAPSHOT</mongo>
 			</properties>
 
 			<repositories>
@@ -133,9 +121,77 @@
 
 		<profile>
 
-			<id>mongo35-next</id>
+			<id>mongo3</id>
 			<properties>
-				<mongo>3.5.0-SNAPSHOT</mongo>
+				<mongo>3.0.4</mongo>
+			</properties>
+
+		</profile>
+
+		<profile>
+
+			<id>mongo3-next</id>
+			<properties>
+				<mongo>3.0.5-SNAPSHOT</mongo>
+			</properties>
+
+			<repositories>
+				<repository>
+					<id>mongo-snapshots</id>
+					<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+				</repository>
+			</repositories>
+
+		</profile>
+
+		<profile>
+
+			<id>mongo31</id>
+			<properties>
+				<mongo>3.1.1</mongo>
+			</properties>
+
+		</profile>
+
+		<profile>
+
+			<id>mongo32</id>
+			<properties>
+				<mongo>3.2.2</mongo>
+			</properties>
+
+		</profile>
+
+		<profile>
+
+			<id>mongo33</id>
+			<properties>
+				<mongo>3.3.0</mongo>
+			</properties>
+
+			<repositories>
+				<repository>
+					<id>mongo-snapshots</id>
+					<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+				</repository>
+			</repositories>
+
+		</profile>
+
+		<profile>
+
+			<id>mongo34</id>
+			<properties>
+				<mongo>3.4.0</mongo>
+			</properties>
+
+		</profile>
+
+		<profile>
+
+			<id>mongo34-next</id>
+			<properties>
+				<mongo>3.4.1-SNAPSHOT</mongo>
 			</properties>
 
 			<repositories>
@@ -173,8 +229,8 @@
 
 	<repositories>
 		<repository>
-			<id>spring-libs-milestone</id>
-			<url>https://repo.spring.io/libs-milestone</url>
+			<id>spring-libs-release</id>
+			<url>https://repo.spring.io/libs-release</url>
 		</repository>
 	</repositories>
 

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.M4</version>
+		<version>1.10.3.RELEASE</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>2.0.0</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.M4</version>
-		</dependency>
-
-		<!-- reactive -->
-		<dependency>
-		 	<groupId>io.projectreactor</groupId>
-			<artifactId>reactor-core</artifactId>
-			<version>${reactor}</version>
-			<optional>true</optional>
+			<version>1.10.3.RELEASE</version>
 		</dependency>
 
 		<dependency>
@@ -95,7 +87,7 @@
 		<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

@@ -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,10 +29,10 @@ 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
@@ -75,15 +74,15 @@ 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);
 		}
 		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);
@@ -144,31 +143,27 @@ 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);
 					}
 					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);
@@ -179,18 +174,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

@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>2.0.0.M4</version>
+		<version>1.10.3.RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-mongodb-log4j/README.md

@@ -1,7 +1,5 @@
 # MongoDB Log4J Appender
 
-:warning: Deprecated. About to be removed for 2.0.0.RC1.
-
 This module sets up a Log4J appender that puts logging events in MongoDB. It is fully configurable
 and connects directly to the MongoDB server using the driver. It has no dependency on any Spring package.
 

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.M4</version>
+		<version>1.10.3.RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

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

@@ -44,9 +44,7 @@ import com.mongodb.WriteConcern;
  * @author Oliver Gierke
  * @author Christoph Strobl
  * @author Ricardo Espirito Santo
- * @deprecated since 2.0.0.M4. About to be removed for 2.0.0.RC1.
  */
-@Deprecated
 public class MongoLog4jAppender extends AppenderSkeleton {
 
 	public static final String LEVEL = "level";

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

@@ -1,6 +1,5 @@
 /**
  * Infrastructure for to use MongoDB as a logging sink.
- *
- * @deprecated since 2.0.0.M4. About to be removed for 2.0.0.RC1.
  */
 package org.springframework.data.mongodb.log4j;
+

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/pom.xml

@@ -11,14 +11,13 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>2.0.0.M4</version>
+		<version>1.10.3.RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<properties>
 		<objenesis>1.3</objenesis>
 		<equalsverifier>1.5</equalsverifier>
-		<kotlin>1.1.2-5</kotlin>
 	</properties>
 
 	<dependencies>
@@ -79,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</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>
@@ -187,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>
 
@@ -232,117 +171,11 @@
 			<scope>test</scope>
 		</dependency>
 
-		<!-- Kotlin extension -->
-		<dependency>
-			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-stdlib</artifactId>
-			<version>${kotlin}</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-reflect</artifactId>
-			<version>${kotlin}</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-test</artifactId>
-			<version>${kotlin}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.nhaarman</groupId>
-			<artifactId>mockito-kotlin</artifactId>
-			<version>1.5.0</version>
-			<scope>test</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.jetbrains.kotlin</groupId>
-					<artifactId>kotlin-stdlib</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.jetbrains.kotlin</groupId>
-					<artifactId>kotlin-reflect</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.mockito</groupId>
-					<artifactId>mockito-core</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
 	</dependencies>
 
 	<build>
 		<plugins>
 
-			<plugin>
-				<artifactId>kotlin-maven-plugin</artifactId>
-				<groupId>org.jetbrains.kotlin</groupId>
-				<version>${kotlin}</version>
-				<configuration>
-					<jvmTarget>${source.level}</jvmTarget>
-				</configuration>
-				<executions>
-					<execution>
-						<id>compile</id>
-						<phase>compile</phase>
-						<goals>
-							<goal>compile</goal>
-						</goals>
-						<configuration>
-							<sourceDirs>
-								<sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
-								<sourceDir>${project.basedir}/src/main/java</sourceDir>
-							</sourceDirs>
-						</configuration>
-					</execution>
-					<execution>
-						<id>test-compile</id>
-						<phase>test-compile</phase>
-						<goals>
-							<goal>test-compile</goal>
-						</goals>
-						<configuration>
-							<sourceDirs>
-								<sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
-								<sourceDir>${project.basedir}/src/test/java</sourceDir>
-							</sourceDirs>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>default-compile</id>
-						<phase>none</phase>
-					</execution>
-					<execution>
-						<id>default-testCompile</id>
-						<phase>none</phase>
-					</execution>
-					<execution>
-						<id>java-compile</id>
-						<phase>compile</phase>
-						<goals>
-							<goal>compile</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>java-test-compile</id>
-						<phase>test-compile</phase>
-						<goals>
-							<goal>testCompile</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
 			<plugin>
 				<groupId>com.mysema.maven</groupId>
 				<artifactId>apt-maven-plugin</artifactId>
@@ -379,11 +212,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/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-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,45 +15,86 @@
  */
 package org.springframework.data.mongodb.config;
 
+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.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.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 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
+	 * Return the name of the database to connect to.
+	 * 
+	 * @return must not be {@literal null}.
 	 */
-	public abstract MongoClient mongoClient();
+	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
+	 * @deprecated since 1.7. {@link MongoClient} should hold authentication data within
+	 *             {@link MongoClient#getCredentialsList()}
+	 */
+	@Deprecated
+	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,16 +102,17 @@ 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());
 	}
 
 	/**
@@ -78,7 +120,7 @@ AbstractMongoConfiguration extends MongoConfigurationSupport {
 	 * class' (the concrete class, not this one here) by default. So if you have a {@code com.acme.AppConfig} extending
 	 * {@link AbstractMongoConfiguration} the base package will be considered {@code com.acme} unless the method is
 	 * overridden to implement alternate behavior.
-	 *
+	 * 
 	 * @return the base package to scan for mapped {@link Document} classes or {@literal null} to not enable scanning for
 	 *         entities.
 	 * @deprecated use {@link #getMappingBasePackages()} instead.
@@ -90,10 +132,78 @@ AbstractMongoConfiguration extends MongoConfigurationSupport {
 		return mappingBasePackage == null ? null : mappingBasePackage.getName();
 	}
 
+	/**
+	 * 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 AbstractMongoConfiguration} 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() {
+		return Collections.singleton(getMappingBasePackage());
+	}
+
+	/**
+	 * Return {@link UserCredentials} to be used when connecting to the MongoDB instance or {@literal null} if none shall
+	 * be used.
+	 * 
+	 * @return
+	 * @deprecated since 1.7. {@link MongoClient} should hold authentication data within
+	 *             {@link MongoClient#getCredentialsList()}
+	 */
+	@Deprecated
+	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 +219,79 @@ AbstractMongoConfiguration extends MongoConfigurationSupport {
 
 		return converter;
 	}
+
+	/**
+	 * 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(), 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

@@ -53,9 +53,8 @@ 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.MongoCustomConversions;
-import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.index.MongoPersistentEntityIndexCreator;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
@@ -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,36 +120,27 @@ 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(), INDEX_HELPER_BEAN_NAME));
+			parserContext.registerBeanComponent(new BeanComponentDefinition(indexHelperBuilder.getBeanDefinition(),
+					INDEX_HELPER_BEAN_NAME));
 		}
 
 		BeanDefinition validatingMongoEventListener = potentiallyCreateValidatingMongoEventListener(element, parserContext);
 
 		if (validatingMongoEventListener != null) {
-			parserContext.registerBeanComponent(
-					new BeanComponentDefinition(validatingMongoEventListener, VALIDATING_EVENT_LISTENER_BEAN_NAME));
+			parserContext.registerBeanComponent(new BeanComponentDefinition(validatingMongoEventListener,
+					VALIDATING_EVENT_LISTENER_BEAN_NAME));
 		}
 
 		parserContext.registerBeanComponent(new BeanComponentDefinition(converterBuilder.getBeanDefinition(), id));
@@ -290,7 +279,7 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 				}
 			}
 
-			BeanDefinitionBuilder conversionsBuilder = BeanDefinitionBuilder.rootBeanDefinition(MongoCustomConversions.class);
+			BeanDefinitionBuilder conversionsBuilder = BeanDefinitionBuilder.rootBeanDefinition(CustomConversions.class);
 			conversionsBuilder.addConstructorArgValue(converterBeans);
 
 			AbstractBeanDefinition conversionsBean = conversionsBuilder.getBeanDefinition();
@@ -338,8 +327,8 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 			return beanDef;
 		}
 
-		parserContext.getReaderContext()
-				.error("Element <converter> must specify 'ref' or contain a bean definition for the converter", element);
+		parserContext.getReaderContext().error(
+				"Element <converter> must specify 'ref' or contain a bean definition for the converter", element);
 		return null;
 	}
 
@@ -351,15 +340,15 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 		mappingContextStrategyFactoryBuilder.addConstructorArgReference(mappingContextRef);
 
 		BeanComponentDefinitionBuilder builder = new BeanComponentDefinitionBuilder(element, context);
-		context.registerBeanComponent(
-				builder.getComponent(mappingContextStrategyFactoryBuilder, IS_NEW_STRATEGY_FACTORY_BEAN_NAME));
+		context.registerBeanComponent(builder.getComponent(mappingContextStrategyFactoryBuilder,
+				IS_NEW_STRATEGY_FACTORY_BEAN_NAME));
 
 		return IS_NEW_STRATEGY_FACTORY_BEAN_NAME;
 	}
 
 	/**
 	 * {@link TypeFilter} that returns {@literal false} in case any of the given delegates matches.
-	 *
+	 * 
 	 * @author Oliver Gierke
 	 */
 	private static class NegatingFilter implements TypeFilter {
@@ -368,7 +357,7 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 
 		/**
 		 * Creates a new {@link NegatingFilter} with the given delegates.
-		 *
+		 * 
 		 * @param filters
 		 */
 		public NegatingFilter(TypeFilter... filters) {
@@ -382,8 +371,7 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 		 * (non-Javadoc)
 		 * @see org.springframework.core.type.filter.TypeFilter#match(org.springframework.core.type.classreading.MetadataReader, org.springframework.core.type.classreading.MetadataReaderFactory)
 		 */
-		public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory)
-				throws IOException {
+		public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory) throws IOException {
 
 			for (TypeFilter delegate : delegates) {
 				if (delegate.match(metadataReader, metadataReaderFactory)) {

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

@@ -1,193 +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.convert.CustomConversions;
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.mapping.context.MappingContextIsNewStrategyFactory;
-import org.springframework.data.mapping.context.PersistentEntities;
-import org.springframework.data.mapping.model.CamelCaseAbbreviatingFieldNamingStrategy;
-import org.springframework.data.mapping.model.FieldNamingStrategy;
-import org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy;
-import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
-import org.springframework.data.mongodb.core.mapping.Document;
-import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
-import org.springframework.data.support.CachingIsNewStrategyFactory;
-import org.springframework.data.support.IsNewStrategyFactory;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.StringUtils;
-
-/**
- * Base class for Spring Data MongoDB to be extended for JavaConfiguration usage.
- *
- * @author Mark Paluch
- * @since 2.0
- */
-public abstract class MongoConfigurationSupport {
-
-	/**
-	 * Return the name of the database to connect to.
-	 *
-	 * @return must not be {@literal null}.
-	 */
-	protected abstract String getDatabaseName();
-
-	/**
-	 * Returns the base packages to scan for MongoDB mapped entities at startup. Will return the package name of the
-	 * configuration class' (the concrete class, not this one here) by default. So if you have a
-	 * {@code com.acme.AppConfig} extending {@link MongoConfigurationSupport} the base package will be considered
-	 * {@code com.acme} unless the method is overridden to implement alternate behavior.
-	 *
-	 * @return the base packages to scan for mapped {@link Document} classes or an empty collection to not enable scanning
-	 *         for entities.
-	 * @since 1.10
-	 */
-	protected Collection<String> getMappingBasePackages() {
-
-		Package mappingBasePackage = getClass().getPackage();
-		return Collections.singleton(mappingBasePackage == null ? null : mappingBasePackage.getName());
-	}
-
-	/**
-	 * Creates a {@link MongoMappingContext} equipped with entity classes scanned from the mapping base package.
-	 *
-	 * @see #getMappingBasePackages()
-	 * @return
-	 * @throws ClassNotFoundException
-	 */
-	@Bean
-	public MongoMappingContext mongoMappingContext() throws ClassNotFoundException {
-
-		MongoMappingContext mappingContext = new MongoMappingContext();
-		mappingContext.setInitialEntitySet(getInitialEntitySet());
-		mappingContext.setSimpleTypeHolder(customConversions().getSimpleTypeHolder());
-		mappingContext.setFieldNamingStrategy(fieldNamingStrategy());
-
-		return mappingContext;
-	}
-
-	/**
-	 * Returns a {@link MappingContextIsNewStrategyFactory} wrapped into a {@link CachingIsNewStrategyFactory}.
-	 *
-	 * @return
-	 * @throws ClassNotFoundException
-	 */
-	@Bean
-	public IsNewStrategyFactory isNewStrategyFactory() throws ClassNotFoundException {
-
-		return new CachingIsNewStrategyFactory(new MappingContextIsNewStrategyFactory(
-				new PersistentEntities(Arrays.<MappingContext<?, ?>> asList(new MappingContext[] { mongoMappingContext() }))));
-	}
-
-	/**
-	 * Register custom {@link Converter}s in a {@link CustomConversions} object if required. These
-	 * {@link CustomConversions} will be registered with the {@link #mappingMongoConverter()} and
-	 * {@link #mongoMappingContext()}. Returns an empty {@link MongoCustomConversions} instance by default.
-	 *
-	 * @return must not be {@literal null}.
-	 */
-	@Bean
-	public CustomConversions customConversions() {
-		return new MongoCustomConversions(Collections.emptyList());
-	}
-
-	/**
-	 * Scans the mapping base package for classes annotated with {@link Document}. By default, it scans for entities in
-	 * all packages returned by {@link #getMappingBasePackages()}.
-	 *
-	 * @see #getMappingBasePackages()
-	 * @return
-	 * @throws ClassNotFoundException
-	 */
-	protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
-
-		Set<Class<?>> initialEntitySet = new HashSet<Class<?>>();
-
-		for (String basePackage : getMappingBasePackages()) {
-			initialEntitySet.addAll(scanForEntities(basePackage));
-		}
-
-		return initialEntitySet;
-	}
-
-	/**
-	 * Scans the given base package for entities, i.e. MongoDB specific types annotated with {@link Document} and
-	 * {@link Persistent}.
-	 *
-	 * @param basePackage must not be {@literal null}.
-	 * @return
-	 * @throws ClassNotFoundException
-	 * @since 1.10
-	 */
-	protected Set<Class<?>> scanForEntities(String basePackage) throws ClassNotFoundException {
-
-		if (!StringUtils.hasText(basePackage)) {
-			return Collections.emptySet();
-		}
-
-		Set<Class<?>> initialEntitySet = new HashSet<Class<?>>();
-
-		if (StringUtils.hasText(basePackage)) {
-
-			ClassPathScanningCandidateComponentProvider componentProvider = new ClassPathScanningCandidateComponentProvider(
-					false);
-			componentProvider.addIncludeFilter(new AnnotationTypeFilter(Document.class));
-			componentProvider.addIncludeFilter(new AnnotationTypeFilter(Persistent.class));
-
-			for (BeanDefinition candidate : componentProvider.findCandidateComponents(basePackage)) {
-
-				initialEntitySet
-						.add(ClassUtils.forName(candidate.getBeanClassName(), MongoConfigurationSupport.class.getClassLoader()));
-			}
-		}
-
-		return initialEntitySet;
-	}
-
-	/**
-	 * Configures whether to abbreviate field names for domain objects by configuring a
-	 * {@link CamelCaseAbbreviatingFieldNamingStrategy} on the {@link MongoMappingContext} instance created. For advanced
-	 * customization needs, consider overriding {@link #mappingMongoConverter()}.
-	 *
-	 * @return
-	 */
-	protected boolean abbreviateFieldNames() {
-		return false;
-	}
-
-	/**
-	 * Configures a {@link FieldNamingStrategy} on the {@link MongoMappingContext} instance created.
-	 *
-	 * @return
-	 * @since 1.5
-	 */
-	protected FieldNamingStrategy fieldNamingStrategy() {
-		return abbreviateFieldNames() ? new CamelCaseAbbreviatingFieldNamingStrategy()
-				: PropertyNameFieldNamingStrategy.INSTANCE;
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 by the original author(s).
+ * Copyright 2011-2015 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.
@@ -30,8 +30,9 @@ 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;
@@ -98,6 +99,8 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 		String mongoRef = element.getAttribute("mongo-ref");
 		String dbname = element.getAttribute("dbname");
 
+		BeanDefinition userCredentials = getUserCredentialsBeanDefinition(element, parserContext);
+
 		// Defaulting
 		if (StringUtils.hasText(mongoRef)) {
 			dbFactoryBuilder.addConstructorArgReference(mongoRef);
@@ -106,6 +109,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,13 +131,35 @@ 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");
 
 		return getSourceBeanDefinition(mongoBuilder, parserContext, element);
 	}
 
+	/**
+	 * Returns a {@link BeanDefinition} for a {@link UserCredentials} object.
+	 * 
+	 * @param element
+	 * @return the {@link BeanDefinition} or {@literal null} if neither username nor password given.
+	 */
+	private BeanDefinition getUserCredentialsBeanDefinition(Element element, ParserContext context) {
+
+		String username = element.getAttribute("username");
+		String password = element.getAttribute("password");
+
+		if (!StringUtils.hasText(username) && !StringUtils.hasText(password)) {
+			return null;
+		}
+
+		BeanDefinitionBuilder userCredentialsBuilder = BeanDefinitionBuilder.genericBeanDefinition(UserCredentials.class);
+		userCredentialsBuilder.addConstructorArgValue(StringUtils.hasText(username) ? username : null);
+		userCredentialsBuilder.addConstructorArgValue(StringUtils.hasText(password) ? password : null);
+
+		return getSourceBeanDefinition(userCredentialsBuilder, context, element);
+	}
+
 	/**
 	 * Creates a {@link BeanDefinition} for a {@link MongoURI} or {@link MongoClientURI} depending on configured
 	 * attributes. <br />
@@ -166,7 +193,7 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 					parserContext.extractSource(element));
 		}
 
-		Class<?> type = MongoClientURI.class;
+		Class<?> type = hasClientUri ? MongoClientURI.class : MongoURI.class;
 		String uri = hasClientUri ? element.getAttribute("client-uri") : element.getAttribute("uri");
 
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(type);

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-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.
@@ -33,6 +33,7 @@ public class MongoNamespaceHandler extends NamespaceHandlerSupport {
 	public void init() {
 
 		registerBeanDefinitionParser("mapping-converter", new MappingMongoConverterParser());
+		registerBeanDefinitionParser("mongo", new MongoParser());
 		registerBeanDefinitionParser("mongo-client", new MongoClientParser());
 		registerBeanDefinitionParser("db-factory", new MongoDbFactoryParser());
 		registerBeanDefinitionParser("jmx", new MongoJmxParser());

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

@@ -0,0 +1,76 @@
+/*
+ * 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
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.config;
+
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.parsing.BeanComponentDefinition;
+import org.springframework.beans.factory.parsing.CompositeComponentDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.BeanDefinitionParser;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.data.config.BeanComponentDefinitionBuilder;
+import org.springframework.data.config.ParsingUtils;
+import org.springframework.data.mongodb.core.MongoFactoryBean;
+import org.springframework.util.StringUtils;
+import org.w3c.dom.Element;
+
+/**
+ * Parser for <mongo;gt; definitions.
+ * 
+ * @author Mark Pollack
+ * @author Oliver Gierke
+ * @author Christoph Strobl
+ */
+public class MongoParser implements BeanDefinitionParser {
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.xml.BeanDefinitionParser#parse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext)
+	 */
+	public BeanDefinition parse(Element element, ParserContext parserContext) {
+
+		Object source = parserContext.extractSource(element);
+		String id = element.getAttribute("id");
+
+		BeanComponentDefinitionBuilder helper = new BeanComponentDefinitionBuilder(element, parserContext);
+
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MongoFactoryBean.class);
+		ParsingUtils.setPropertyValue(builder, element, "port", "port");
+		ParsingUtils.setPropertyValue(builder, element, "host", "host");
+		ParsingUtils.setPropertyValue(builder, element, "write-concern", "writeConcern");
+
+		MongoParsingUtils.parseMongoOptions(element, builder);
+		MongoParsingUtils.parseReplicaSet(element, builder);
+
+		String defaultedId = StringUtils.hasText(id) ? id : BeanNames.MONGO_BEAN_NAME;
+
+		parserContext.pushContainingComponent(new CompositeComponentDefinition("Mongo", source));
+
+		BeanComponentDefinition mongoComponent = helper.getComponent(builder, defaultedId);
+		parserContext.registerBeanComponent(mongoComponent);
+		BeanComponentDefinition serverAddressPropertyEditor = helper.getComponent(MongoParsingUtils
+				.getServerAddressPropertyEditorBuilder());
+		parserContext.registerBeanComponent(serverAddressPropertyEditor);
+		BeanComponentDefinition writeConcernPropertyEditor = helper.getComponent(MongoParsingUtils
+				.getWriteConcernPropertyEditorBuilder());
+		parserContext.registerBeanComponent(writeConcernPropertyEditor);
+
+		parserContext.popAndRegisterContainingComponent();
+
+		return mongoComponent.getBeanDefinition();
+	}
+
+}

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

@@ -25,6 +25,7 @@ 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;
 
@@ -53,6 +54,42 @@ abstract class MongoParsingUtils {
 		setPropertyValue(mongoBuilder, element, "replica-set", "replicaSetSeeds");
 	}
 
+	/**
+	 * Parses the {@code mongo:options} sub-element. Populates the given attribute factory with the proper attributes.
+	 * 
+	 * @return true if parsing actually occured, {@literal false} otherwise
+	 */
+	static boolean parseMongoOptions(Element element, BeanDefinitionBuilder mongoBuilder) {
+
+		Element optionsElement = DomUtils.getChildElementByTagName(element, "options");
+
+		if (optionsElement == null) {
+			return false;
+		}
+
+		BeanDefinitionBuilder optionsDefBuilder = BeanDefinitionBuilder
+				.genericBeanDefinition(MongoOptionsFactoryBean.class);
+
+		setPropertyValue(optionsDefBuilder, optionsElement, "connections-per-host", "connectionsPerHost");
+		setPropertyValue(optionsDefBuilder, optionsElement, "threads-allowed-to-block-for-connection-multiplier",
+				"threadsAllowedToBlockForConnectionMultiplier");
+		setPropertyValue(optionsDefBuilder, optionsElement, "max-wait-time", "maxWaitTime");
+		setPropertyValue(optionsDefBuilder, optionsElement, "connect-timeout", "connectTimeout");
+		setPropertyValue(optionsDefBuilder, optionsElement, "socket-timeout", "socketTimeout");
+		setPropertyValue(optionsDefBuilder, optionsElement, "socket-keep-alive", "socketKeepAlive");
+		setPropertyValue(optionsDefBuilder, optionsElement, "auto-connect-retry", "autoConnectRetry");
+		setPropertyValue(optionsDefBuilder, optionsElement, "max-auto-connect-retry-time", "maxAutoConnectRetryTime");
+		setPropertyValue(optionsDefBuilder, optionsElement, "write-number", "writeNumber");
+		setPropertyValue(optionsDefBuilder, optionsElement, "write-timeout", "writeTimeout");
+		setPropertyValue(optionsDefBuilder, optionsElement, "write-fsync", "writeFsync");
+		setPropertyValue(optionsDefBuilder, optionsElement, "slave-ok", "slaveOk");
+		setPropertyValue(optionsDefBuilder, optionsElement, "ssl", "ssl");
+		setPropertyReference(optionsDefBuilder, optionsElement, "ssl-socket-factory-ref", "sslSocketFactory");
+
+		mongoBuilder.addPropertyValue("mongoOptions", optionsDefBuilder.getBeanDefinition());
+		return true;
+	}
+
 	/**
 	 * Parses the {@code mongo:client-options} sub-element. Populates the given attribute factory with the proper
 	 * attributes.

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

@@ -21,7 +21,7 @@ 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;
+import com.mongodb.BulkWriteResult;
 
 /**
  * Bulk operations for insert/update/remove actions on a collection. These bulks operation are available since MongoDB
@@ -38,7 +38,7 @@ public interface BulkOperations {
 	/**
 	 * Mode for bulk operation.
 	 **/
-	enum BulkMode {
+	public enum BulkMode {
 
 		/** Perform bulk operations in sequence. The first error will cancel processing. */
 		ORDERED,

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

@@ -1,835 +0,0 @@
-/*
- * Copyright 2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-import java.util.Locale;
-import java.util.Optional;
-
-import org.bson.Document;
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
-import com.mongodb.client.model.Collation.Builder;
-import com.mongodb.client.model.CollationAlternate;
-import com.mongodb.client.model.CollationCaseFirst;
-import com.mongodb.client.model.CollationMaxVariable;
-import com.mongodb.client.model.CollationStrength;
-
-/**
- * Central abstraction for MongoDB collation support. <br />
- * Allows fluent creation of a collation {@link Document} that can be used for creating collections & indexes as well as
- * querying data.
- * <p />
- * <strong>NOTE:</strong> Please keep in mind that queries will only make use of an index with collation settings if the
- * query itself specifies the same collation.
- *
- * @author Christoph Strobl
- * @author Mark Paluch
- * @since 2.0
- * @see <a href="https://docs.mongodb.com/manual/reference/collation/">MongoDB Reference - Collation</a>
- */
-public class Collation {
-
-	private static final Collation SIMPLE = of("simple");
-
-	private final CollationLocale locale;
-
-	private Optional<ComparisonLevel> strength = Optional.empty();
-	private Optional<Boolean> numericOrdering = Optional.empty();
-	private Optional<Alternate> alternate = Optional.empty();
-	private Optional<Boolean> backwards = Optional.empty();
-	private Optional<Boolean> normalization = Optional.empty();
-	private Optional<String> version = Optional.empty();
-
-	private Collation(CollationLocale locale) {
-
-		Assert.notNull(locale, "ICULocale must not be null!");
-		this.locale = locale;
-	}
-
-	/**
-	 * Create a {@link Collation} using {@literal simple} binary comparison.
-	 *
-	 * @return a {@link Collation} for {@literal simple} binary comparison.
-	 */
-	public static Collation simple() {
-		return SIMPLE;
-	}
-
-	/**
-	 * Create new {@link Collation} with locale set to {{@link java.util.Locale#getLanguage()}} and
-	 * {@link java.util.Locale#getVariant()}.
-	 *
-	 * @param locale must not be {@literal null}.
-	 * @return
-	 */
-	public static Collation of(Locale locale) {
-
-		Assert.notNull(locale, "Locale must not be null!");
-
-		String format;
-
-		if (StringUtils.hasText(locale.getCountry())) {
-			format = String.format("%s_%s", locale.getLanguage(), locale.getCountry());
-		} else {
-			format = locale.getLanguage();
-		}
-
-		return of(CollationLocale.of(format).variant(locale.getVariant()));
-	}
-
-	/**
-	 * Create new {@link Collation} with locale set to the given ICU language.
-	 *
-	 * @param language must not be {@literal null}.
-	 * @return
-	 */
-	public static Collation of(String language) {
-		return of(CollationLocale.of(language));
-	}
-
-	/**
-	 * Create new {@link Collation} with locale set to the given {@link CollationLocale}.
-	 *
-	 * @param locale must not be {@literal null}.
-	 * @return
-	 */
-	public static Collation of(CollationLocale locale) {
-		return new Collation(locale);
-	}
-
-	/**
-	 * Create new {@link Collation} from values in {@link Document}.
-	 *
-	 * @param source must not be {@literal null}.
-	 * @return
-	 * @see <a href="https://docs.mongodb.com/manual/reference/collation/#collation-document">MongoDB Reference -
-	 *      Collation Document</a>
-	 */
-	public static Collation from(Document source) {
-
-		Assert.notNull(source, "Source must not be null!");
-
-		Collation collation = Collation.of(source.getString("locale"));
-		if (source.containsKey("strength")) {
-			collation = collation.strength(source.getInteger("strength"));
-		}
-		if (source.containsKey("caseLevel")) {
-			collation = collation.caseLevel(source.getBoolean("caseLevel"));
-		}
-		if (source.containsKey("caseFirst")) {
-			collation = collation.caseFirst(source.getString("caseFirst"));
-		}
-		if (source.containsKey("numericOrdering")) {
-			collation = collation.numericOrdering(source.getBoolean("numericOrdering"));
-		}
-		if (source.containsKey("alternate")) {
-			collation = collation.alternate(source.getString("alternate"));
-		}
-		if (source.containsKey("maxVariable")) {
-			collation = collation.maxVariable(source.getString("maxVariable"));
-		}
-		if (source.containsKey("backwards")) {
-			collation = collation.backwards(source.getBoolean("backwards"));
-		}
-		if (source.containsKey("normalization")) {
-			collation = collation.normalization(source.getBoolean("normalization"));
-		}
-		if (source.containsKey("version")) {
-			collation.version = Optional.of(source.get("version").toString());
-		}
-		return collation;
-	}
-
-	/**
-	 * Set the level of comparison to perform.
-	 *
-	 * @param strength
-	 * @return new {@link Collation}.
-	 */
-	public Collation strength(int strength) {
-
-		ComparisonLevel current = this.strength.orElseGet(() -> new ICUComparisonLevel(strength));
-		return strength(new ICUComparisonLevel(strength, current.getCaseFirst(), current.getCaseLevel()));
-	}
-
-	/**
-	 * Set the level of comparison to perform.
-	 *
-	 * @param comparisonLevel must not be {@literal null}.
-	 * @return new {@link Collation}
-	 */
-	public Collation strength(ComparisonLevel comparisonLevel) {
-
-		Collation newInstance = copy();
-		newInstance.strength = Optional.of(comparisonLevel);
-		return newInstance;
-	}
-
-	/**
-	 * Set whether to include {@code caseLevel} comparison. <br />
-	 *
-	 * @param caseLevel
-	 * @return new {@link Collation}.
-	 */
-	public Collation caseLevel(boolean caseLevel) {
-
-		ComparisonLevel strengthValue = strength.orElseGet(ComparisonLevel::primary);
-		return strength(
-				new ICUComparisonLevel(strengthValue.getLevel(), strengthValue.getCaseFirst(), Optional.of(caseLevel)));
-	}
-
-	/**
-	 * Set the flag that determines sort order of case differences during tertiary level comparisons.
-	 *
-	 * @param caseFirst must not be {@literal null}.
-	 * @return
-	 */
-	public Collation caseFirst(String caseFirst) {
-		return caseFirst(new CaseFirst(caseFirst));
-	}
-
-	/**
-	 * Set the flag that determines sort order of case differences during tertiary level comparisons.
-	 *
-	 * @param caseFirst must not be {@literal null}.
-	 * @return
-	 */
-	public Collation caseFirst(CaseFirst sort) {
-
-		ComparisonLevel strengthValue = strength.orElseGet(ComparisonLevel::tertiary);
-		return strength(new ICUComparisonLevel(strengthValue.getLevel(), Optional.of(sort), strengthValue.getCaseLevel()));
-	}
-
-	/**
-	 * Treat numeric strings as numbers for comparison.
-	 *
-	 * @return new {@link Collation}.
-	 */
-	public Collation numericOrderingEnabled() {
-		return numericOrdering(true);
-	}
-
-	/**
-	 * Treat numeric strings as string for comparison.
-	 *
-	 * @return new {@link Collation}.
-	 */
-	public Collation numericOrderingDisabled() {
-		return numericOrdering(false);
-	}
-
-	/**
-	 * Set the flag that determines whether to compare numeric strings as numbers or as strings.
-	 *
-	 * @return new {@link Collation}.
-	 */
-	public Collation numericOrdering(boolean flag) {
-
-		Collation newInstance = copy();
-		newInstance.numericOrdering = Optional.of(flag);
-		return newInstance;
-	}
-
-	/**
-	 * Set the Field that determines whether collation should consider whitespace and punctuation as base characters for
-	 * purposes of comparison.
-	 *
-	 * @param alternate must not be {@literal null}.
-	 * @return new {@link Collation}.
-	 */
-	public Collation alternate(String alternate) {
-
-		Alternate instance = this.alternate.orElseGet(() -> new Alternate(alternate, Optional.empty()));
-		return alternate(new Alternate(alternate, instance.maxVariable));
-	}
-
-	/**
-	 * Set the Field that determines whether collation should consider whitespace and punctuation as base characters for
-	 * purposes of comparison.
-	 *
-	 * @param alternate must not be {@literal null}.
-	 * @return new {@link Collation}.
-	 */
-	public Collation alternate(Alternate alternate) {
-
-		Collation newInstance = copy();
-		newInstance.alternate = Optional.ofNullable(alternate);
-		return newInstance;
-	}
-
-	/**
-	 * Sort string with diacritics sort from back of the string.
-	 *
-	 * @return new {@link Collation}.
-	 */
-	public Collation backwardDiacriticSort() {
-		return backwards(true);
-	}
-
-	/**
-	 * Do not sort string with diacritics sort from back of the string.
-	 *
-	 * @return new {@link Collation}.
-	 */
-	public Collation forwardDiacriticSort() {
-		return backwards(false);
-	}
-
-	/**
-	 * Set the flag that determines whether strings with diacritics sort from back of the string.
-	 *
-	 * @param backwards must not be {@literal null}.
-	 * @return new {@link Collation}.
-	 */
-	public Collation backwards(Boolean backwards) {
-
-		Collation newInstance = copy();
-		newInstance.backwards = Optional.ofNullable(backwards);
-		return newInstance;
-	}
-
-	/**
-	 * Enable text normalization.
-	 *
-	 * @return new {@link Collation}.
-	 */
-	public Collation normalizationEnabled() {
-		return normalization(true);
-	}
-
-	/**
-	 * Disable text normalization.
-	 *
-	 * @return new {@link Collation}.
-	 */
-	public Collation normalizationDisabled() {
-		return normalization(false);
-	}
-
-	/**
-	 * Set the flag that determines whether to check if text require normalization and to perform normalization.
-	 *
-	 * @param normalization must not be {@literal null}.
-	 * @return new {@link Collation}.
-	 */
-	public Collation normalization(Boolean normalization) {
-
-		Collation newInstance = copy();
-		newInstance.normalization = Optional.ofNullable(normalization);
-		return newInstance;
-	}
-
-	/**
-	 * Set the field that determines up to which characters are considered ignorable when alternate is {@code shifted}.
-	 *
-	 * @param maxVariable must not be {@literal null}.
-	 * @return new {@link Collation}.
-	 */
-	public Collation maxVariable(String maxVariable) {
-
-		Alternate alternateValue = alternate.orElseGet(Alternate::shifted);
-		return alternate(new AlternateWithMaxVariable(alternateValue.alternate, maxVariable));
-	}
-
-	/**
-	 * Get the {@link Document} representation of the {@link Collation}.
-	 *
-	 * @return
-	 */
-	public Document toDocument() {
-		return map(toMongoDocumentConverter());
-	}
-
-	/**
-	 * Get the {@link com.mongodb.client.model.Collation} representation of the {@link Collation}.
-	 *
-	 * @return
-	 */
-	public com.mongodb.client.model.Collation toMongoCollation() {
-		return map(toMongoCollationConverter());
-	}
-
-	/**
-	 * Transform {@code this} {@link Collation} by applying a {@link Converter}.
-	 *
-	 * @param mapper
-	 * @param <R>
-	 * @return
-	 */
-	public <R> R map(Converter<? super Collation, ? extends R> mapper) {
-		return mapper.convert(this);
-	}
-
-	@Override
-	public String toString() {
-		return toDocument().toJson();
-	}
-
-	private Collation copy() {
-
-		Collation collation = new Collation(locale);
-		collation.strength = this.strength;
-		collation.normalization = this.normalization;
-		collation.numericOrdering = this.numericOrdering;
-		collation.alternate = this.alternate;
-		collation.backwards = this.backwards;
-		return collation;
-	}
-
-	/**
-	 * Abstraction for the ICU Comparison Levels.
-	 *
-	 * @since 2.0
-	 */
-	public interface ComparisonLevel {
-
-		/**
-		 * Primary level of comparison. Collation performs comparisons of the base characters only, ignoring other
-		 * differences such as diacritics and case. <br />
-		 * The {@code caseLevel} can be set via {@link PrimaryICUComparisonLevel#includeCase()} and
-		 * {@link PrimaryICUComparisonLevel#excludeCase()}.
-		 *
-		 * @return new {@link SecondaryICUComparisonLevel}.
-		 */
-		static PrimaryICUComparisonLevel primary() {
-			return PrimaryICUComparisonLevel.DEFAULT;
-		}
-
-		/**
-		 * Secondary level of comparison. Collation performs comparisons up to secondary differences, such as
-		 * diacritics.<br />
-		 * The {@code caseLevel} can be set via {@link SecondaryICUComparisonLevel#includeCase()} and
-		 * {@link SecondaryICUComparisonLevel#excludeCase()}.
-		 *
-		 * @return new {@link SecondaryICUComparisonLevel}.
-		 */
-		static SecondaryICUComparisonLevel secondary() {
-			return SecondaryICUComparisonLevel.DEFAULT;
-		}
-
-		/**
-		 * Tertiary level of comparison. Collation performs comparisons up to tertiary differences, such as case and letter
-		 * variants. <br />
-		 * The {@code caseLevel} cannot be set for {@link ICUComparisonLevel} above {@code secondary}.
-		 *
-		 * @return new {@link ICUComparisonLevel}.
-		 */
-		static TertiaryICUComparisonLevel tertiary() {
-			return TertiaryICUComparisonLevel.DEFAULT;
-		}
-
-		/**
-		 * Quaternary Level. Limited for specific use case to consider punctuation. <br />
-		 * The {@code caseLevel} cannot be set for {@link ICUComparisonLevel} above {@code secondary}.
-		 *
-		 * @return new {@link ComparisonLevel}.
-		 */
-		static ComparisonLevel quaternary() {
-			return ComparisonLevels.QUATERNARY;
-		}
-
-		/**
-		 * Identical Level. Limited for specific use case of tie breaker. <br />
-		 * The {@code caseLevel} cannot be set for {@link ICUComparisonLevel} above {@code secondary}.
-		 *
-		 * @return new {@link ComparisonLevel}.
-		 */
-		static ComparisonLevel identical() {
-			return ComparisonLevels.IDENTICAL;
-		}
-
-		/**
-		 * @return collation strength, {@literal 1} for primary, {@literal 2} for secondary and so on.
-		 */
-		int getLevel();
-
-		default Optional<CaseFirst> getCaseFirst() {
-			return Optional.empty();
-		}
-
-		default Optional<Boolean> getCaseLevel() {
-			return Optional.empty();
-		}
-	}
-
-	/**
-	 * Abstraction for the ICU Comparison Levels.
-	 *
-	 * @since 2.0
-	 */
-	@AllArgsConstructor(access = AccessLevel.PACKAGE)
-	@Getter
-	static class ICUComparisonLevel implements ComparisonLevel {
-
-		private final int level;
-		private final Optional<CaseFirst> caseFirst;
-		private final Optional<Boolean> caseLevel;
-
-		ICUComparisonLevel(int level) {
-			this(level, Optional.empty(), Optional.empty());
-		}
-	}
-
-	/**
-	 * Simple comparison levels.
-	 */
-	enum ComparisonLevels implements ComparisonLevel {
-
-		QUATERNARY(4), IDENTICAL(5);
-
-		private final int level;
-
-		ComparisonLevels(int level) {
-			this.level = level;
-		}
-
-		@Override
-		public int getLevel() {
-			return level;
-		}
-	}
-
-	/**
-	 * Primary-strength {@link ICUComparisonLevel}.
-	 */
-	public static class PrimaryICUComparisonLevel extends ICUComparisonLevel {
-
-		static final PrimaryICUComparisonLevel DEFAULT = new PrimaryICUComparisonLevel();
-		static final PrimaryICUComparisonLevel WITH_CASE_LEVEL = new PrimaryICUComparisonLevel(true);
-		static final PrimaryICUComparisonLevel WITHOUT_CASE_LEVEL = new PrimaryICUComparisonLevel(false);
-
-		private PrimaryICUComparisonLevel() {
-			super(1);
-		}
-
-		private PrimaryICUComparisonLevel(boolean caseLevel) {
-			super(1, Optional.empty(), Optional.of(caseLevel));
-		}
-
-		/**
-		 * Include case comparison.
-		 *
-		 * @return new {@link ICUComparisonLevel}
-		 */
-		public ComparisonLevel includeCase() {
-			return WITH_CASE_LEVEL;
-		}
-
-		/**
-		 * Exclude case comparison.
-		 *
-		 * @return new {@link ICUComparisonLevel}
-		 */
-		public ComparisonLevel excludeCase() {
-			return WITHOUT_CASE_LEVEL;
-		}
-	}
-
-	/**
-	 * Secondary-strength {@link ICUComparisonLevel}.
-	 */
-	public static class SecondaryICUComparisonLevel extends ICUComparisonLevel {
-
-		static final SecondaryICUComparisonLevel DEFAULT = new SecondaryICUComparisonLevel();
-		static final SecondaryICUComparisonLevel WITH_CASE_LEVEL = new SecondaryICUComparisonLevel(true);
-		static final SecondaryICUComparisonLevel WITHOUT_CASE_LEVEL = new SecondaryICUComparisonLevel(false);
-
-		private SecondaryICUComparisonLevel() {
-			super(2);
-		}
-
-		private SecondaryICUComparisonLevel(boolean caseLevel) {
-			super(2, Optional.empty(), Optional.of(caseLevel));
-		}
-
-		/**
-		 * Include case comparison.
-		 *
-		 * @return new {@link SecondaryICUComparisonLevel}
-		 */
-		public ComparisonLevel includeCase() {
-			return WITH_CASE_LEVEL;
-		}
-
-		/**
-		 * Exclude case comparison.
-		 *
-		 * @return new {@link SecondaryICUComparisonLevel}
-		 */
-		public ComparisonLevel excludeCase() {
-			return WITHOUT_CASE_LEVEL;
-		}
-	}
-
-	/**
-	 * Tertiary-strength {@link ICUComparisonLevel}.
-	 */
-	public static class TertiaryICUComparisonLevel extends ICUComparisonLevel {
-
-		static final TertiaryICUComparisonLevel DEFAULT = new TertiaryICUComparisonLevel();
-
-		private TertiaryICUComparisonLevel() {
-			super(3);
-		}
-
-		private TertiaryICUComparisonLevel(CaseFirst caseFirst) {
-			super(3, Optional.of(caseFirst), Optional.empty());
-		}
-
-		/**
-		 * Set the flag that determines sort order of case differences.
-		 *
-		 * @param caseFirst must not be {@literal null}.
-		 * @return new {@link ICUComparisonLevel}
-		 */
-		public ComparisonLevel caseFirst(CaseFirst caseFirst) {
-
-			Assert.notNull(caseFirst, "CaseFirst must not be null!");
-			return new TertiaryICUComparisonLevel(caseFirst);
-		}
-	}
-
-	/**
-	 * @since 2.0
-	 */
-	@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
-	public static class CaseFirst {
-
-		private static final CaseFirst UPPER = new CaseFirst("upper");
-		private static final CaseFirst LOWER = new CaseFirst("lower");
-		private static final CaseFirst OFF = new CaseFirst("off");
-
-		private final String state;
-
-		/**
-		 * Sort uppercase before lowercase.
-		 *
-		 * @return new {@link CaseFirst}.
-		 */
-		public static CaseFirst upper() {
-			return UPPER;
-		}
-
-		/**
-		 * Sort lowercase before uppercase.
-		 *
-		 * @return new {@link CaseFirst}.
-		 */
-		public static CaseFirst lower() {
-			return LOWER;
-		}
-
-		/**
-		 * Use the default.
-		 *
-		 * @return new {@link CaseFirst}.
-		 */
-		public static CaseFirst off() {
-			return OFF;
-		}
-	}
-
-	/**
-	 * @since 2.0
-	 */
-	@RequiredArgsConstructor(access = AccessLevel.PACKAGE)
-	public static class Alternate {
-
-		private static final Alternate NON_IGNORABLE = new Alternate("non-ignorable", Optional.empty());
-
-		final String alternate;
-		final Optional<String> maxVariable;
-
-		/**
-		 * Consider Whitespace and punctuation as base characters.
-		 *
-		 * @return new {@link Alternate}.
-		 */
-		public static Alternate nonIgnorable() {
-			return NON_IGNORABLE;
-		}
-
-		/**
-		 * Whitespace and punctuation are <strong>not</strong> considered base characters and are only distinguished at
-		 * strength. <br />
-		 * <strong>NOTE:</strong> Only works for {@link ICUComparisonLevel} above {@link ComparisonLevel#tertiary()}.
-		 *
-		 * @return new {@link AlternateWithMaxVariable}.
-		 */
-		public static AlternateWithMaxVariable shifted() {
-			return AlternateWithMaxVariable.DEFAULT;
-		}
-	}
-
-	/**
-	 * @since 2.0
-	 */
-	public static class AlternateWithMaxVariable extends Alternate {
-
-		static final AlternateWithMaxVariable DEFAULT = new AlternateWithMaxVariable("shifted");
-		static final Alternate SHIFTED_PUNCT = new AlternateWithMaxVariable("shifted", "punct");
-		static final Alternate SHIFTED_SPACE = new AlternateWithMaxVariable("shifted", "space");
-
-		private AlternateWithMaxVariable(String alternate) {
-			super(alternate, Optional.empty());
-		}
-
-		private AlternateWithMaxVariable(String alternate, String maxVariable) {
-			super(alternate, Optional.of(maxVariable));
-		}
-
-		/**
-		 * Consider both whitespaces and punctuation as ignorable.
-		 *
-		 * @return new {@link AlternateWithMaxVariable}.
-		 */
-		public Alternate punct() {
-			return SHIFTED_PUNCT;
-		}
-
-		/**
-		 * Only consider whitespaces as ignorable.
-		 *
-		 * @return new {@link AlternateWithMaxVariable}.
-		 */
-		public Alternate space() {
-			return SHIFTED_SPACE;
-		}
-	}
-
-	/**
-	 * ICU locale abstraction for usage with MongoDB {@link Collation}.
-	 *
-	 * @since 2.0
-	 * @see <a href="http://site.icu-project.org">ICU - International Components for Unicode</a>
-	 */
-	@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
-	public static class CollationLocale {
-
-		private final String language;
-		private final Optional<String> variant;
-
-		/**
-		 * Create new {@link CollationLocale} for given language.
-		 *
-		 * @param language must not be {@literal null}.
-		 * @return
-		 */
-		public static CollationLocale of(String language) {
-
-			Assert.notNull(language, "Code must not be null!");
-			return new CollationLocale(language, Optional.empty());
-		}
-
-		/**
-		 * Define language variant.
-		 *
-		 * @param variant must not be {@literal null}.
-		 * @return new {@link CollationLocale}.
-		 */
-		public CollationLocale variant(String variant) {
-
-			Assert.notNull(variant, "Variant must not be null!");
-			return new CollationLocale(language, Optional.of(variant));
-		}
-
-		/**
-		 * Get the string representation.
-		 *
-		 * @return
-		 */
-		public String asString() {
-
-			StringBuilder sb = new StringBuilder(language);
-
-			variant.filter(it -> !it.isEmpty()).ifPresent(val -> {
-
-				// Mongo requires variant rendered as ICU keyword (@key=value;key=value…)
-				sb.append("@collation=").append(val);
-			});
-
-			return sb.toString();
-		}
-	}
-
-	private static Converter<Collation, Document> toMongoDocumentConverter() {
-
-		return source -> {
-
-			Document document = new Document();
-			document.append("locale", source.locale.asString());
-
-			source.strength.ifPresent(strength -> {
-
-				document.append("strength", strength.getLevel());
-
-				strength.getCaseLevel().ifPresent(it -> document.append("caseLevel", it));
-				strength.getCaseFirst().ifPresent(it -> document.append("caseFirst", it.state));
-			});
-
-			source.numericOrdering.ifPresent(val -> document.append("numericOrdering", val));
-			source.alternate.ifPresent(it -> {
-
-				document.append("alternate", it.alternate);
-				it.maxVariable.ifPresent(maxVariable -> document.append("maxVariable", maxVariable));
-			});
-
-			source.backwards.ifPresent(it -> document.append("backwards", it));
-			source.normalization.ifPresent(it -> document.append("normalization", it));
-			source.version.ifPresent(it -> document.append("version", it));
-
-			return document;
-		};
-	}
-
-	private static Converter<Collation, com.mongodb.client.model.Collation> toMongoCollationConverter() {
-
-		return source -> {
-
-			Builder builder = com.mongodb.client.model.Collation.builder();
-
-			builder.locale(source.locale.asString());
-
-			source.strength.ifPresent(strength -> {
-
-				builder.collationStrength(CollationStrength.fromInt(strength.getLevel()));
-
-				strength.getCaseLevel().ifPresent(builder::caseLevel);
-				strength.getCaseFirst().ifPresent(it -> builder.collationCaseFirst(CollationCaseFirst.fromString(it.state)));
-			});
-
-			source.numericOrdering.ifPresent(builder::numericOrdering);
-			source.alternate.ifPresent(it -> {
-
-				builder.collationAlternate(CollationAlternate.fromString(it.alternate));
-				it.maxVariable
-						.ifPresent(maxVariable -> builder.collationMaxVariable(CollationMaxVariable.fromString(maxVariable)));
-			});
-
-			source.backwards.ifPresent(builder::backwards);
-			source.normalization.ifPresent(builder::normalization);
-
-			return builder.build();
-		};
-	}
-}

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/CollectionOptions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2017 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,149 +15,56 @@
  */
 package org.springframework.data.mongodb.core;
 
-import java.util.Optional;
-
-import org.springframework.util.Assert;
-
 /**
  * Provides a simple wrapper to encapsulate the variety of settings you can use when creating a collection.
- *
+ * 
  * @author Thomas Risberg
- * @author Christoph Strobl
- * @author Mark Paluch
  */
 public class CollectionOptions {
 
-	private Long maxDocuments;
-	private Long size;
+	private Integer maxDocuments;
+
+	private Integer size;
+
 	private Boolean capped;
-	private Collation collation;
 
 	/**
 	 * Constructs a new <code>CollectionOptions</code> instance.
-	 *
-	 * @param size the collection size in bytes, this data space is preallocated.
+	 * 
+	 * @param size the collection size in bytes, this data space is preallocated
 	 * @param maxDocuments the maximum number of documents in the collection.
 	 * @param capped true to created a "capped" collection (fixed size with auto-FIFO behavior based on insertion order),
 	 *          false otherwise.
-	 * @deprecated since 2.0 please use {@link CollectionOptions#empty()} as entry point.
 	 */
-	@Deprecated
-	public CollectionOptions(Long size, Long maxDocuments, Boolean capped) {
-		this(size, maxDocuments, capped, null);
-	}
-
-	private CollectionOptions(Long size, Long maxDocuments, Boolean capped, Collation collation) {
-
+	public CollectionOptions(Integer size, Integer maxDocuments, Boolean capped) {
+		super();
 		this.maxDocuments = maxDocuments;
 		this.size = size;
 		this.capped = capped;
-		this.collation = collation;
 	}
 
-	/**
-	 * Create new {@link CollectionOptions} by just providing the {@link Collation} to use.
-	 *
-	 * @param collation must not be {@literal null}.
-	 * @return new {@link CollectionOptions}.
-	 * @since 2.0
-	 */
-	public static CollectionOptions just(Collation collation) {
-
-		Assert.notNull(collation, "Collation must not be null!");
-
-		return new CollectionOptions(null, null, null, collation);
+	public Integer getMaxDocuments() {
+		return maxDocuments;
 	}
 
-	/**
-	 * Create new empty {@link CollectionOptions}.
-	 *
-	 * @return new {@link CollectionOptions}.
-	 * @since 2.0
-	 */
-	public static CollectionOptions empty() {
-		return new CollectionOptions(null, null, null, null);
+	public void setMaxDocuments(Integer maxDocuments) {
+		this.maxDocuments = maxDocuments;
 	}
 
-	/**
-	 * Create new {@link CollectionOptions} with already given settings and capped set to {@literal true}. <br />
-	 * <strong>NOTE</strong> Using capped collections requires defining {@link #size(int)}.
-	 *
-	 * @return new {@link CollectionOptions}.
-	 * @since 2.0
-	 */
-	public CollectionOptions capped() {
-		return new CollectionOptions(size, maxDocuments, true, collation);
+	public Integer getSize() {
+		return size;
 	}
 
-	/**
-	 * Create new {@link CollectionOptions} with already given settings and {@code maxDocuments} set to given value.
-	 *
-	 * @param maxDocuments can be {@literal null}.
-	 * @return new {@link CollectionOptions}.
-	 * @since 2.0
-	 */
-	public CollectionOptions maxDocuments(long maxDocuments) {
-		return new CollectionOptions(size, maxDocuments, capped, collation);
+	public void setSize(Integer size) {
+		this.size = size;
 	}
 
-	/**
-	 * Create new {@link CollectionOptions} with already given settings and {@code size} set to given value.
-	 *
-	 * @param size can be {@literal null}.
-	 * @return new {@link CollectionOptions}.
-	 * @since 2.0
-	 */
-	public CollectionOptions size(long size) {
-		return new CollectionOptions(size, maxDocuments, capped, collation);
+	public Boolean getCapped() {
+		return capped;
 	}
 
-	/**
-	 * Create new {@link CollectionOptions} with already given settings and {@code collation} set to given value.
-	 *
-	 * @param collation can be {@literal null}.
-	 * @return new {@link CollectionOptions}.
-	 * @since 2.0
-	 */
-	public CollectionOptions collation(Collation collation) {
-		return new CollectionOptions(size, maxDocuments, capped, collation);
+	public void setCapped(Boolean capped) {
+		this.capped = capped;
 	}
 
-	/**
-	 * Get the max number of documents the collection should be limited to.
-	 *
-	 * @return {@link Optional#empty()} if not set.
-	 */
-	public Optional<Long> getMaxDocuments() {
-		return Optional.ofNullable(maxDocuments);
-	}
-
-	/**
-	 * Get the {@literal size} in bytes the collection should be limited to.
-	 *
-	 * @return {@link Optional#empty()} if not set.
-	 */
-	public Optional<Long> getSize() {
-		return Optional.ofNullable(size);
-	}
-
-	/**
-	 * Get if the collection should be capped.
-	 *
-	 * @return {@link Optional#empty()} if not set.
-	 * @since 2.0
-	 */
-	public Optional<Boolean> getCapped() {
-		return Optional.ofNullable(capped);
-	}
-
-	/**
-	 * Get the {@link Collation} settings.
-	 *
-	 * @return {@link Optional#empty()} if not set.
-	 * @since 2.0
-	 */
-	public Optional<Collation> getCollation() {
-		return Optional.ofNullable(collation);
-	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-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,5 +1,5 @@
 /*
- * Copyright 2015-2017 the original author or authors.
+ * 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.
@@ -15,12 +15,9 @@
  */
 package org.springframework.data.mongodb.core;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import com.mongodb.client.model.DeleteOptions;
-import org.bson.Document;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.mongodb.core.query.Query;
@@ -28,16 +25,14 @@ import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.data.util.Pair;
 import org.springframework.util.Assert;
 
+import com.mongodb.BasicDBObject;
 import com.mongodb.BulkWriteException;
+import com.mongodb.BulkWriteOperation;
+import com.mongodb.BulkWriteRequestBuilder;
+import com.mongodb.BulkWriteResult;
+import com.mongodb.DBCollection;
+import com.mongodb.DBObject;
 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}.
@@ -52,19 +47,18 @@ class DefaultBulkOperations implements BulkOperations {
 	private final MongoOperations mongoOperations;
 	private final BulkMode bulkMode;
 	private final String collectionName;
+	private final Class<?> entityType;
 
 	private PersistenceExceptionTranslator exceptionTranslator;
 	private WriteConcernResolver writeConcernResolver;
 	private WriteConcern defaultWriteConcern;
 
-	private BulkWriteOptions bulkOptions;
-
-	List<WriteModel<Document>> models = new ArrayList<>();
+	private BulkWriteOperation bulk;
 
 	/**
 	 * 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.
@@ -80,16 +74,17 @@ class DefaultBulkOperations implements BulkOperations {
 		this.mongoOperations = mongoOperations;
 		this.bulkMode = bulkMode;
 		this.collectionName = collectionName;
+		this.entityType = entityType;
 
 		this.exceptionTranslator = new MongoExceptionTranslator();
 		this.writeConcernResolver = DefaultWriteConcernResolver.INSTANCE;
 
-		this.bulkOptions = initBulkOperation();
+		this.bulk = initBulkOperation();
 	}
 
 	/**
 	 * Configures the {@link PersistenceExceptionTranslator} to be used. Defaults to {@link MongoExceptionTranslator}.
-	 *
+	 * 
 	 * @param exceptionTranslator can be {@literal null}.
 	 */
 	public void setExceptionTranslator(PersistenceExceptionTranslator exceptionTranslator) {
@@ -98,7 +93,7 @@ class DefaultBulkOperations implements BulkOperations {
 
 	/**
 	 * Configures the {@link WriteConcernResolver} to be used. Defaults to {@link DefaultWriteConcernResolver}.
-	 *
+	 * 
 	 * @param writeConcernResolver can be {@literal null}.
 	 */
 	public void setWriteConcernResolver(WriteConcernResolver writeConcernResolver) {
@@ -108,7 +103,7 @@ class DefaultBulkOperations implements BulkOperations {
 
 	/**
 	 * Configures the default {@link WriteConcern} to be used. Defaults to {@literal null}.
-	 *
+	 * 
 	 * @param defaultWriteConcern can be {@literal null}.
 	 */
 	public void setDefaultWriteConcern(WriteConcern defaultWriteConcern) {
@@ -124,16 +119,15 @@ class DefaultBulkOperations implements BulkOperations {
 
 		Assert.notNull(document, "Document must not be null!");
 
-		if (document instanceof Document) {
+		if (document instanceof DBObject) {
 
-			models.add(new InsertOneModel<>((Document) document));
+			bulk.insert((DBObject) document);
 			return this;
 		}
 
-		Document sink = new Document();
+		DBObject sink = new BasicDBObject();
 		mongoOperations.getConverter().write(document, sink);
-
-		models.add(new InsertOneModel<>(sink));
+		bulk.insert(sink);
 		return this;
 	}
 
@@ -245,10 +239,8 @@ class DefaultBulkOperations implements BulkOperations {
 
 		Assert.notNull(query, "Query must not be null!");
 
-		DeleteOptions deleteOptions = new DeleteOptions();
-		query.getCollation().map(Collation::toMongoCollation).ifPresent(deleteOptions::collation);
+		bulk.find(query.getQueryObject()).remove();
 
-		models.add(new DeleteManyModel(query.getQueryObject(), deleteOptions));
 		return this;
 	}
 
@@ -273,16 +265,15 @@ class DefaultBulkOperations implements BulkOperations {
 	 * @see org.springframework.data.mongodb.core.BulkOperations#executeBulk()
 	 */
 	@Override
-	public com.mongodb.bulk.BulkWriteResult execute() {
+	public BulkWriteResult execute() {
+
+		MongoAction action = new MongoAction(defaultWriteConcern, MongoActionOperation.BULK, collectionName, entityType,
+				null, null);
+		WriteConcern writeConcern = writeConcernResolver.resolve(action);
 
 		try {
 
-			MongoCollection<Document> collection = mongoOperations.getCollection(collectionName);
-			if (defaultWriteConcern != null) {
-				collection = collection.withWriteConcern(defaultWriteConcern);
-			}
-
-			return collection.bulkWrite(models, bulkOptions);
+			return writeConcern == null ? bulk.execute() : bulk.execute(writeConcern);
 
 		} catch (BulkWriteException o_O) {
 
@@ -290,7 +281,7 @@ class DefaultBulkOperations implements BulkOperations {
 			throw toThrow == null ? o_O : toThrow;
 
 		} finally {
-			this.bulkOptions = initBulkOperation();
+			this.bulk = initBulkOperation();
 		}
 	}
 
@@ -308,27 +299,39 @@ class DefaultBulkOperations implements BulkOperations {
 		Assert.notNull(query, "Query must not be null!");
 		Assert.notNull(update, "Update must not be null!");
 
-		UpdateOptions options = new UpdateOptions();
-		options.upsert(upsert);
-		query.getCollation().map(Collation::toMongoCollation).ifPresent(options::collation);
+		BulkWriteRequestBuilder builder = bulk.find(query.getQueryObject());
+
+		if (upsert) {
+
+			if (multi) {
+				builder.upsert().update(update.getUpdateObject());
+			} else {
+				builder.upsert().updateOne(update.getUpdateObject());
+			}
 
-		if (multi) {
-			models.add(new UpdateManyModel<>(query.getQueryObject(), update.getUpdateObject(), options));
 		} else {
-			models.add(new UpdateOneModel<>(query.getQueryObject(), update.getUpdateObject(), options));
+
+			if (multi) {
+				builder.update(update.getUpdateObject());
+			} else {
+				builder.updateOne(update.getUpdateObject());
+			}
 		}
+
 		return this;
 	}
 
-	private final BulkWriteOptions initBulkOperation() {
+	private final BulkWriteOperation initBulkOperation() {
+
+		DBCollection collection = mongoOperations.getCollection(collectionName);
 
-		BulkWriteOptions options = new BulkWriteOptions();
 		switch (bulkMode) {
 			case ORDERED:
-				return options.ordered(true);
+				return collection.initializeOrderedBulkOperation();
 			case UNORDERED:
-				return options.ordered(false);
+				return collection.initializeUnorderedBulkOperation();
 		}
+
 		throw new IllegalStateException("BulkMode was null!");
 	}
 }

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

@@ -15,25 +15,20 @@
  */
 package org.springframework.data.mongodb.core;
 
-import static org.springframework.data.mongodb.core.MongoTemplate.*;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import org.bson.Document;
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.mongodb.core.convert.QueryMapper;
-import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.index.IndexDefinition;
 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}.
@@ -42,13 +37,12 @@ import com.mongodb.client.model.IndexOptions;
  * @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 final MongoDbFactory mongoDbFactory;
+	private final MongoOperations mongoOperations;
 	private final String collectionName;
 	private final QueryMapper mapper;
 	private final Class<?> type;
@@ -56,34 +50,29 @@ public class DefaultIndexOperations implements IndexOperations {
 	/**
 	 * 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) {
-
-		this(mongoDbFactory, collectionName, queryMapper, null);
+	public DefaultIndexOperations(MongoOperations mongoOperations, String collectionName) {
+		this(mongoOperations, collectionName, null);
 	}
 
 	/**
 	 * 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}.
 	 * @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) {
+	public DefaultIndexOperations(MongoOperations mongoOperations, String collectionName, 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.mapper = new QueryMapper(mongoOperations.getConverter());
 		this.type = type;
 	}
 
@@ -91,47 +80,47 @@ public class DefaultIndexOperations implements IndexOperations {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.IndexOperations#ensureIndex(org.springframework.data.mongodb.core.index.IndexDefinition)
 	 */
-	public String ensureIndex(final IndexDefinition indexDefinition) {
+	public void ensureIndex(final IndexDefinition indexDefinition) {
 
-		return execute(collection -> {
+		mongoOperations.execute(collectionName, new CollectionCallback<Object>() {
+			public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+				DBObject indexOptions = indexDefinition.getIndexOptions();
 
-			Document indexOptions = indexDefinition.getIndexOptions();
+				if (indexOptions != null && indexOptions.containsField(PARTIAL_FILTER_EXPRESSION_KEY)) {
 
-			if (indexOptions != null) {
+					Assert.isInstanceOf(DBObject.class, indexOptions.get(PARTIAL_FILTER_EXPRESSION_KEY));
 
-				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)));
+					indexOptions.put(PARTIAL_FILTER_EXPRESSION_KEY,
+							mapper.getMappedObject((DBObject) indexOptions.get(PARTIAL_FILTER_EXPRESSION_KEY),
+									lookupPersistentEntity(type, collectionName)));
 				}
 
-				return collection.createIndex(indexDefinition.getIndexKeys(), ops);
+				if (indexOptions != null) {
+					collection.createIndex(indexDefinition.getIndexKeys(), indexOptions);
+				} else {
+					collection.createIndex(indexDefinition.getIndexKeys());
+				}
+				return null;
 			}
-			return collection.createIndex(indexDefinition.getIndexKeys());
-		}
 
-		);
-	}
+			private MongoPersistentEntity<?> lookupPersistentEntity(Class<?> entityType, String collection) {
 
-	private MongoPersistentEntity<?> lookupPersistentEntity(Class<?> entityType, String collection) {
+				if (entityType != null) {
+					return mongoOperations.getConverter().getMappingContext().getPersistentEntity(entityType);
+				}
 
-		if (entityType != null) {
-			return mapper.getMappingContext().getRequiredPersistentEntity(entityType);
-		}
+				Collection<? extends MongoPersistentEntity<?>> entities = mongoOperations.getConverter().getMappingContext()
+						.getPersistentEntities();
 
-		Collection<? extends MongoPersistentEntity<?>> entities = mapper.getMappingContext().getPersistentEntities();
+				for (MongoPersistentEntity<?> entity : entities) {
+					if (entity.getCollection().equals(collection)) {
+						return entity;
+					}
+				}
 
-		for (MongoPersistentEntity<?> entity : entities) {
-			if (entity.getCollection().equals(collection)) {
-				return entity;
+				return null;
 			}
-		}
-
-		return null;
+		});
 	}
 
 	/*
@@ -139,10 +128,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 +145,45 @@ public class DefaultIndexOperations implements IndexOperations {
 		dropIndex("*");
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.IndexOperations#resetIndexCache()
+	 */
+	@Deprecated
+	public void resetIndexCache() {
+		mongoOperations.execute(collectionName, new CollectionCallback<Void>() {
+			public Void doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+
+				ReflectiveDBCollectionInvoker.resetIndexCache(collection);
+				return null;
+			}
+		});
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.IndexOperations#getIndexInfo()
 	 */
 	public List<IndexInfo> getIndexInfo() {
 
-		return execute(new CollectionCallback<List<IndexInfo>>() {
+		return mongoOperations.execute(collectionName, new CollectionCallback<List<IndexInfo>>() {
 
-			public List<IndexInfo> doInCollection(MongoCollection<Document> collection)
-					throws MongoException, DataAccessException {
+			public List<IndexInfo> doInCollection(DBCollection collection) throws MongoException, DataAccessException {
 
-				MongoCursor<Document> cursor = collection.listIndexes(Document.class).iterator();
-				return getIndexData(cursor);
+				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()) {
-
-					Document ix = cursor.next();
-					IndexInfo indexInfo = IndexConverters.documentToIndexInfoConverter().convert(ix);
-					indexInfoList.add(indexInfo);
+				for (DBObject ix : dbObjectList) {
+					indexInfoList.add(IndexInfo.indexInfoOf(ix));
 				}
 
 				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

@@ -20,13 +20,11 @@ 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;
@@ -36,9 +34,8 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
-import com.mongodb.BasicDBList;
+import com.mongodb.DB;
 import com.mongodb.MongoException;
-import com.mongodb.client.MongoDatabase;
 
 /**
  * Default implementation of {@link ScriptOperations} capable of saving and executing {@link ServerSideJavaScript}.
@@ -100,13 +97,8 @@ class DefaultScriptOperations implements ScriptOperations {
 		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");
+			public Object doInDB(DB db) throws MongoException, DataAccessException {
+				return db.eval(script.getCode(), convertScriptArgs(false, args));
 			}
 		});
 	}
@@ -123,10 +115,8 @@ class DefaultScriptOperations implements ScriptOperations {
 		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");
+			public Object doInDB(DB db) throws MongoException, DataAccessException {
+				return db.eval(String.format("%s(%s)", scriptName, convertAndJoinScriptArgs(args)));
 			}
 		});
 	}

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/ExecutableAggregationOperation.java

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

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

@@ -1,115 +0,0 @@
-/*
- * Copyright 2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import lombok.RequiredArgsConstructor;
-
-import org.springframework.data.mongodb.core.aggregation.Aggregation;
-import org.springframework.data.mongodb.core.aggregation.AggregationResults;
-import org.springframework.data.mongodb.core.aggregation.TypedAggregation;
-import org.springframework.data.util.CloseableIterator;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
-/**
- * Implementation of {@link ExecutableAggregationOperation} operating directly on {@link MongoTemplate}.
- *
- * @author Christoph Strobl
- * @since 2.0
- */
-class ExecutableAggregationOperationSupport implements ExecutableAggregationOperation {
-
-	private final MongoTemplate template;
-
-	/**
-	 * Create new instance of {@link ExecutableAggregationOperationSupport}.
-	 *
-	 * @param template must not be {@literal null}.
-	 * @throws IllegalArgumentException if template is {@literal null}.
-	 */
-	ExecutableAggregationOperationSupport(MongoTemplate template) {
-
-		Assert.notNull(template, "Template must not be null!");
-
-		this.template = template;
-	}
-
-	@Override
-	public <T> AggregationOperation<T> aggregateAndReturn(Class<T> domainType) {
-
-		Assert.notNull(domainType, "DomainType must not be null!");
-
-		return new AggregationOperationSupport<>(template, null, domainType, null);
-	}
-
-	/**
-	 * @author Christoph Strobl
-	 * @since 2.0
-	 */
-	@RequiredArgsConstructor
-	static class AggregationOperationSupport<T>
-			implements AggregationOperationWithAggregation<T>, AggregationOperation<T>, TerminatingAggregationOperation<T> {
-
-		private final MongoTemplate template;
-		private final Aggregation aggregation;
-		private final Class<T> domainType;
-		private final String collection;
-
-		@Override
-		public AggregationOperationWithAggregation<T> inCollection(String collection) {
-
-			Assert.hasText(collection, "Collection must not be null nor empty!");
-
-			return new AggregationOperationSupport<>(template, aggregation, domainType, collection);
-		}
-
-		@Override
-		public TerminatingAggregationOperation<T> by(Aggregation aggregation) {
-
-			Assert.notNull(aggregation, "Aggregation must not be null!");
-
-			return new AggregationOperationSupport<>(template, aggregation, domainType, collection);
-		}
-
-		@Override
-		public AggregationResults<T> all() {
-			return template.aggregate(aggregation, getCollectionName(aggregation), domainType);
-		}
-
-		@Override
-		public CloseableIterator<T> stream() {
-			return template.aggregateStream(aggregation, getCollectionName(aggregation), domainType);
-		}
-
-		private String getCollectionName(Aggregation aggregation) {
-
-			if (StringUtils.hasText(collection)) {
-				return collection;
-			}
-
-			if (aggregation instanceof TypedAggregation) {
-
-				TypedAggregation<?> typedAggregation = (TypedAggregation<?>) aggregation;
-
-				if (typedAggregation.getInputType() != null) {
-					return template.determineCollectionName(typedAggregation.getInputType());
-				}
-			}
-
-			return template.determineCollectionName(domainType);
-		}
-	}
-}

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

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

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

@@ -1,200 +0,0 @@
-/*
- * Copyright 2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import lombok.RequiredArgsConstructor;
-
-import java.util.List;
-import java.util.Optional;
-
-import org.bson.Document;
-import org.springframework.dao.IncorrectResultSizeDataAccessException;
-import org.springframework.data.mongodb.core.query.BasicQuery;
-import org.springframework.data.mongodb.core.query.NearQuery;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.mongodb.core.query.SerializationUtils;
-import org.springframework.data.util.CloseableIterator;
-import org.springframework.util.Assert;
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
-
-import com.mongodb.client.FindIterable;
-
-/**
- * Implementation of {@link ExecutableFindOperation}.
- *
- * @author Christoph Strobl
- * @since 2.0
- */
-class ExecutableFindOperationSupport implements ExecutableFindOperation {
-
-	private final MongoTemplate template;
-
-	/**
-	 * Create new {@link ExecutableFindOperationSupport}.
-	 *
-	 * @param template must not be {@literal null}.
-	 * @throws IllegalArgumentException if template is {@literal null}.
-	 */
-	ExecutableFindOperationSupport(MongoTemplate template) {
-
-		Assert.notNull(template, "Template must not be null!");
-
-		this.template = template;
-	}
-
-	@Override
-	public <T> FindOperation<T> query(Class<T> domainType) {
-
-		Assert.notNull(domainType, "DomainType must not be null!");
-
-		return new FindOperationSupport<>(template, domainType, domainType, null, null);
-	}
-
-	/**
-	 * @param <T>
-	 * @author Christoph Strobl
-	 * @since 2.0
-	 */
-	@RequiredArgsConstructor
-	static class FindOperationSupport<T> implements FindOperation<T>, FindOperationWithCollection<T>,
-			FindOperationWithProjection<T>, FindOperationWithQuery<T> {
-
-		private final MongoTemplate template;
-		private final Class<?> domainType;
-		private final Class<T> returnType;
-		private final String collection;
-		private final Query query;
-
-		@Override
-		public FindOperationWithProjection<T> inCollection(String collection) {
-
-			Assert.hasText(collection, "Collection name must not be null nor empty!");
-
-			return new FindOperationSupport<>(template, domainType, returnType, collection, query);
-		}
-
-		@Override
-		public <T1> FindOperationWithQuery<T1> as(Class<T1> returnType) {
-
-			Assert.notNull(returnType, "ReturnType must not be null!");
-
-			return new FindOperationSupport<>(template, domainType, returnType, collection, query);
-		}
-
-		@Override
-		public TerminatingFindOperation<T> matching(Query query) {
-
-			Assert.notNull(query, "Query must not be null!");
-
-			return new FindOperationSupport<>(template, domainType, returnType, collection, query);
-		}
-
-		@Override
-		public Optional<T> one() {
-
-			List<T> result = doFind(new DelegatingQueryCursorPreparer(getCursorPreparer(query, null)).limit(2));
-
-			if (ObjectUtils.isEmpty(result)) {
-				return Optional.empty();
-			}
-
-			if (result.size() > 1) {
-				throw new IncorrectResultSizeDataAccessException("Query " + asString() + " returned non unique result.", 1);
-			}
-
-			return Optional.of(result.iterator().next());
-		}
-
-		@Override
-		public Optional<T> first() {
-
-			List<T> result = doFind(new DelegatingQueryCursorPreparer(getCursorPreparer(query, null)).limit(1));
-
-			return ObjectUtils.isEmpty(result) ? Optional.empty() : Optional.of(result.iterator().next());
-		}
-
-		@Override
-		public List<T> all() {
-			return doFind(null);
-		}
-
-		@Override
-		public CloseableIterator<T> stream() {
-			return doStream();
-		}
-
-		@Override
-		public TerminatingFindNearOperation<T> near(NearQuery nearQuery) {
-			return () -> template.geoNear(nearQuery, domainType, getCollectionName(), returnType);
-		}
-
-		private List<T> doFind(CursorPreparer preparer) {
-
-			Document queryObject = query != null ? query.getQueryObject() : new Document();
-			Document fieldsObject = query != null ? query.getFieldsObject() : new Document();
-
-			return template.doFind(getCollectionName(), queryObject, fieldsObject, domainType, returnType,
-					getCursorPreparer(query, preparer));
-		}
-
-		private CloseableIterator<T> doStream() {
-
-			return template.doStream(query != null ? query : new BasicQuery(new Document()), domainType, getCollectionName(),
-					returnType);
-		}
-
-		private CursorPreparer getCursorPreparer(Query query, CursorPreparer preparer) {
-			return query == null || preparer != null ? preparer : template.new QueryCursorPreparer(query, domainType);
-		}
-
-		private String getCollectionName() {
-			return StringUtils.hasText(collection) ? collection : template.determineCollectionName(domainType);
-		}
-
-		private String asString() {
-			return SerializationUtils.serializeToJsonSafely(query);
-		}
-	}
-
-	/**
-	 * @author Christoph Strobl
-	 * @since 2.0
-	 */
-	static class DelegatingQueryCursorPreparer implements CursorPreparer {
-
-		private final CursorPreparer delegate;
-		private Optional<Integer> limit = Optional.empty();
-
-		DelegatingQueryCursorPreparer(CursorPreparer delegate) {
-			this.delegate = delegate;
-		}
-
-		@Override
-		public FindIterable<Document> prepare(FindIterable<Document> cursor) {
-
-			FindIterable<Document> target = delegate.prepare(cursor);
-
-			return limit.map(target::limit).orElse(target);
-		}
-
-		CursorPreparer limit(int limit) {
-
-			this.limit = Optional.of(limit);
-			return this;
-		}
-	}
-}

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

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

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

@@ -1,117 +0,0 @@
-/*
- * Copyright 2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import lombok.RequiredArgsConstructor;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.springframework.data.mongodb.core.BulkOperations.BulkMode;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
-import com.mongodb.bulk.BulkWriteResult;
-
-/**
- * Implementation of {@link ExecutableInsertOperation}.
- *
- * @author Christoph Strobl
- * @since 2.0
- */
-class ExecutableInsertOperationSupport implements ExecutableInsertOperation {
-
-	private final MongoTemplate template;
-
-	/**
-	 * Create new {@link ExecutableInsertOperationSupport}.
-	 *
-	 * @param template must not be {@literal null}.
-	 * @throws IllegalArgumentException if template is {@literal null}.
-	 */
-	ExecutableInsertOperationSupport(MongoTemplate template) {
-
-		Assert.notNull(template, "Template must not be null!");
-
-		this.template = template;
-	}
-
-	@Override
-	public <T> InsertOperation<T> insert(Class<T> domainType) {
-
-		Assert.notNull(domainType, "DomainType must not be null!");
-
-		return new InsertOperationSupport<>(template, domainType, null, null);
-	}
-
-	/**
-	 * @author Christoph Strobl
-	 * @since 2.0
-	 */
-	@RequiredArgsConstructor
-	static class InsertOperationSupport<T> implements InsertOperation<T> {
-
-		private final MongoTemplate template;
-		private final Class<T> domainType;
-		private final String collection;
-		private final BulkMode bulkMode;
-
-		@Override
-		public void one(T object) {
-
-			Assert.notNull(object, "Object must not be null!");
-
-			template.insert(object, getCollectionName());
-		}
-
-		@Override
-		public void all(Collection<? extends T> objects) {
-
-			Assert.notNull(objects, "Objects must not be null!");
-
-			template.insert(objects, getCollectionName());
-		}
-
-		@Override
-		public BulkWriteResult bulk(Collection<? extends T> objects) {
-
-			Assert.notNull(objects, "Objects must not be null!");
-
-			return template.bulkOps(bulkMode != null ? bulkMode : BulkMode.ORDERED, domainType, getCollectionName())
-					.insert(new ArrayList<>(objects)).execute();
-		}
-
-		@Override
-		public InsertOperationWithBulkMode<T> inCollection(String collection) {
-
-			Assert.hasText(collection, "Collection must not be null nor empty.");
-
-			return new InsertOperationSupport<>(template, domainType, collection, bulkMode);
-		}
-
-		@Override
-		public TerminatingBulkInsertOperation<T> withBulkMode(BulkMode bulkMode) {
-
-			Assert.notNull(bulkMode, "BulkMode must not be null!");
-
-			return new InsertOperationSupport<>(template, domainType, collection, bulkMode);
-		}
-
-		private String getCollectionName() {
-			return StringUtils.hasText(collection) ? collection : template.determineCollectionName(domainType);
-		}
-	}
-}

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

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

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

@@ -1,113 +0,0 @@
-/*
- * Copyright 2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import lombok.RequiredArgsConstructor;
-
-import java.util.List;
-
-import org.bson.Document;
-import org.springframework.data.mongodb.core.query.BasicQuery;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
-import com.mongodb.client.result.DeleteResult;
-
-/**
- * Implementation of {@link ExecutableRemoveOperation}.
- *
- * @author Christoph Strobl
- * @since 2.0
- */
-class ExecutableRemoveOperationSupport implements ExecutableRemoveOperation {
-
-	private final MongoTemplate tempate;
-
-	/**
-	 * Create new {@link ExecutableRemoveOperationSupport}.
-	 *
-	 * @param template must not be {@literal null}.
-	 * @throws IllegalArgumentException if template is {@literal null}.
-	 */
-	ExecutableRemoveOperationSupport(MongoTemplate template) {
-
-		Assert.notNull(template, "Template must not be null!");
-
-		this.tempate = template;
-	}
-
-	@Override
-	public <T> RemoveOperation<T> remove(Class<T> domainType) {
-
-		Assert.notNull(domainType, "DomainType must not be null!");
-
-		return new RemoveOperationSupport<>(tempate, null, domainType, null);
-	}
-
-	/**
-	 * @author Christoph Strobl
-	 * @since 2.0
-	 */
-	@RequiredArgsConstructor
-	static class RemoveOperationSupport<T> implements RemoveOperation<T>, RemoveOperationWithCollection<T> {
-
-		private final MongoTemplate template;
-		private final Query query;
-		private final Class<T> domainType;
-		private final String collection;
-
-		@Override
-		public RemoveOperationWithQuery<T> inCollection(String collection) {
-
-			Assert.hasText(collection, "Collection must not be null nor empty!");
-
-			return new RemoveOperationSupport<>(template, query, domainType, collection);
-		}
-
-		@Override
-		public TerminatingRemoveOperation<T> matching(Query query) {
-
-			Assert.notNull(query, "Query must not be null!");
-
-			return new RemoveOperationSupport<>(template, query, domainType, collection);
-		}
-
-		@Override
-		public DeleteResult all() {
-
-			String collectionName = getCollectionName();
-
-			return template.doRemove(collectionName, getQuery(), domainType);
-		}
-
-		@Override
-		public List<T> findAndRemove() {
-
-			String collectionName = getCollectionName();
-
-			return template.doFindAndDelete(collectionName, getQuery(), domainType);
-		}
-
-		private String getCollectionName() {
-			return StringUtils.hasText(collection) ? collection : template.determineCollectionName(domainType);
-		}
-
-		private Query getQuery() {
-			return query != null ? query : new BasicQuery(new Document());
-		}
-	}
-}

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

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

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

@@ -1,145 +0,0 @@
-/*
- * Copyright 2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import lombok.RequiredArgsConstructor;
-
-import java.util.Optional;
-
-import org.bson.Document;
-import org.springframework.data.mongodb.core.query.BasicQuery;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.mongodb.core.query.Update;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
-import com.mongodb.client.result.UpdateResult;
-
-/**
- * Implementation of {@link ExecutableUpdateOperation}.
- *
- * @author Christoph Strobl
- * @since 2.0
- */
-class ExecutableUpdateOperationSupport implements ExecutableUpdateOperation {
-
-	private final MongoTemplate template;
-
-	/**
-	 * Creates new {@link ExecutableUpdateOperationSupport}.
-	 *
-	 * @param template must not be {@literal null}.
-	 */
-	ExecutableUpdateOperationSupport(MongoTemplate template) {
-
-		Assert.notNull(template, "Template must not be null!");
-
-		this.template = template;
-	}
-
-	@Override
-	public <T> UpdateOperation<T> update(Class<T> domainType) {
-
-		Assert.notNull(domainType, "DomainType must not be null!");
-
-		return new UpdateOperationSupport<>(template, null, domainType, null, null, null);
-	}
-
-	/**
-	 * @author Christoph Strobl
-	 * @since 2.0
-	 */
-	@RequiredArgsConstructor
-	static class UpdateOperationSupport<T> implements UpdateOperation<T>, UpdateOperationWithCollection<T>,
-			UpdateOperationWithQuery<T>, TerminatingUpdateOperation<T> {
-
-		private final MongoTemplate template;
-		private final Query query;
-		private final Class<T> domainType;
-		private final Update update;
-		private final String collection;
-		private final FindAndModifyOptions options;
-
-		@Override
-		public TerminatingUpdateOperation<T> apply(Update update) {
-
-			Assert.notNull(update, "Update must not be null!");
-
-			return new UpdateOperationSupport<>(template, query, domainType, update, collection, options);
-		}
-
-		@Override
-		public UpdateOperationWithQuery<T> inCollection(String collection) {
-
-			Assert.hasText(collection, "Collection must not be null nor empty!");
-
-			return new UpdateOperationSupport<>(template, query, domainType, update, collection, options);
-		}
-
-		@Override
-		public UpdateResult first() {
-			return doUpdate(false, false);
-		}
-
-		@Override
-		public UpdateResult upsert() {
-			return doUpdate(true, true);
-		}
-
-		@Override
-		public Optional<T> findAndModify() {
-
-			String collectionName = getCollectionName();
-
-			return Optional.ofNullable(template.findAndModify(query != null ? query : new BasicQuery(new Document()), update,
-					options, domainType, collectionName));
-		}
-
-		@Override
-		public UpdateOperationWithUpdate<T> matching(Query query) {
-
-			Assert.notNull(query, "Query must not be null!");
-
-			return new UpdateOperationSupport<>(template, query, domainType, update, collection, options);
-		}
-
-		@Override
-		public UpdateResult all() {
-			return doUpdate(true, false);
-		}
-
-		@Override
-		public TerminatingFindAndModifyOperation<T> withOptions(FindAndModifyOptions options) {
-
-			Assert.notNull(options, "Options must not be null!");
-
-			return new UpdateOperationSupport<>(template, query, domainType, update, collection, options);
-		}
-
-		private UpdateResult doUpdate(boolean multi, boolean upsert) {
-
-			String collectionName = getCollectionName();
-
-			Query query = this.query != null ? this.query : new BasicQuery(new Document());
-
-			return template.doUpdate(collectionName, query, update, domainType, upsert, multi);
-		}
-
-		private String getCollectionName() {
-			return StringUtils.hasText(collection) ? collection : template.determineCollectionName(domainType);
-		}
-	}
-}

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

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

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

@@ -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/FluentMongoOperations.java

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

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

@@ -15,29 +15,29 @@
  */
 package org.springframework.data.mongodb.core;
 
-import org.bson.Document;
 import org.springframework.util.Assert;
 
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
 /**
  * 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 static final GeoCommandStatistics NONE = new GeoCommandStatistics(new BasicDBObject());
 
-	private final Document source;
+	private final DBObject source;
 
 	/**
 	 * Creates a new {@link GeoCommandStatistics} instance with the given source document.
 	 * 
 	 * @param source must not be {@literal null}.
 	 */
-	private GeoCommandStatistics(Document source) {
+	private GeoCommandStatistics(DBObject source) {
 
 		Assert.notNull(source, "Source document must not be null!");
 		this.source = source;
@@ -49,12 +49,12 @@ class GeoCommandStatistics {
 	 * @param commandResult must not be {@literal null}.
 	 * @return
 	 */
-	public static GeoCommandStatistics from(Document commandResult) {
+	public static GeoCommandStatistics from(DBObject commandResult) {
 
 		Assert.notNull(commandResult, "Command result must not be null!");
 
 		Object stats = commandResult.get("stats");
-		return stats == null ? NONE : new GeoCommandStatistics((Document) stats);
+		return stats == null ? NONE : new GeoCommandStatistics((DBObject) stats);
 	}
 
 	/**

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

@@ -1,135 +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.concurrent.TimeUnit;
-
-import org.bson.Document;
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.data.mongodb.core.index.IndexDefinition;
-import org.springframework.data.mongodb.core.index.IndexInfo;
-import org.springframework.util.ObjectUtils;
-
-import com.mongodb.client.model.Collation;
-import com.mongodb.client.model.IndexOptions;
-
-/**
- * {@link Converter Converters} for index-related MongoDB documents/types.
- *
- * @author Mark Paluch
- * @author Christoph Strobl
- * @since 2.0
- */
-abstract class IndexConverters {
-
-	private static final Converter<IndexDefinition, IndexOptions> DEFINITION_TO_MONGO_INDEX_OPTIONS;
-	private static final Converter<Document, IndexInfo> DOCUMENT_INDEX_INFO;
-
-	static {
-
-		DEFINITION_TO_MONGO_INDEX_OPTIONS = getIndexDefinitionIndexOptionsConverter();
-		DOCUMENT_INDEX_INFO = getDocumentIndexInfoConverter();
-	}
-
-	private IndexConverters() {
-
-	}
-
-	static Converter<IndexDefinition, IndexOptions> indexDefinitionToIndexOptionsConverter() {
-		return DEFINITION_TO_MONGO_INDEX_OPTIONS;
-	}
-
-	static Converter<Document, IndexInfo> documentToIndexInfoConverter() {
-		return DOCUMENT_INDEX_INFO;
-	}
-
-	private static Converter<IndexDefinition, IndexOptions> getIndexDefinitionIndexOptionsConverter() {
-
-		return indexDefinition -> {
-
-			Document indexOptions = indexDefinition.getIndexOptions();
-			IndexOptions ops = new IndexOptions();
-
-			if (indexOptions.containsKey("name")) {
-				ops = ops.name(indexOptions.get("name").toString());
-			}
-			if (indexOptions.containsKey("unique")) {
-				ops = ops.unique((Boolean) indexOptions.get("unique"));
-			}
-			if (indexOptions.containsKey("sparse")) {
-				ops = ops.sparse((Boolean) indexOptions.get("sparse"));
-			}
-			if (indexOptions.containsKey("background")) {
-				ops = ops.background((Boolean) indexOptions.get("background"));
-			}
-			if (indexOptions.containsKey("expireAfterSeconds")) {
-				ops = ops.expireAfter((Long) indexOptions.get("expireAfterSeconds"), TimeUnit.SECONDS);
-			}
-			if (indexOptions.containsKey("min")) {
-				ops = ops.min(((Number) indexOptions.get("min")).doubleValue());
-			}
-			if (indexOptions.containsKey("max")) {
-				ops = ops.max(((Number) indexOptions.get("max")).doubleValue());
-			}
-			if (indexOptions.containsKey("bits")) {
-				ops = ops.bits((Integer) indexOptions.get("bits"));
-			}
-			if (indexOptions.containsKey("bucketSize")) {
-				ops = ops.bucketSize(((Number) indexOptions.get("bucketSize")).doubleValue());
-			}
-			if (indexOptions.containsKey("default_language")) {
-				ops = ops.defaultLanguage(indexOptions.get("default_language").toString());
-			}
-			if (indexOptions.containsKey("language_override")) {
-				ops = ops.languageOverride(indexOptions.get("language_override").toString());
-			}
-			if (indexOptions.containsKey("weights")) {
-				ops = ops.weights((org.bson.Document) indexOptions.get("weights"));
-			}
-
-			for (String key : indexOptions.keySet()) {
-				if (ObjectUtils.nullSafeEquals("2dsphere", indexOptions.get(key))) {
-					ops = ops.sphereVersion(2);
-				}
-			}
-
-			if (indexOptions.containsKey("partialFilterExpression")) {
-				ops = ops.partialFilterExpression((org.bson.Document) indexOptions.get("partialFilterExpression"));
-			}
-
-			if (indexOptions.containsKey("collation")) {
-				ops = ops.collation(fromDocument(indexOptions.get("collation", Document.class)));
-			}
-
-			return ops;
-		};
-	}
-
-	public static Collation fromDocument(Document source) {
-
-		if (source == null) {
-			return null;
-		}
-
-		return org.springframework.data.mongodb.core.Collation.from(source).toMongoCollation();
-	}
-
-	private static Converter<Document, IndexInfo> getDocumentIndexInfoConverter() {
-		return IndexInfo::indexInfoOf;
-	}
-
-}

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-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.
@@ -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,15 @@ public interface IndexOperations {
 	 */
 	void dropAllIndexes();
 
+	/**
+	 * Clears all indices that have not yet been applied to this collection.
+	 * 
+	 * @deprecated since 1.7. The MongoDB Java driver version 3.0 does no longer support reseting the index cache.
+	 * @throws {@link UnsupportedOperationException} when used with MongoDB Java driver version 3.0.
+	 */
+	@Deprecated
+	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/MongoAdmin.java

@@ -15,30 +15,33 @@
  */
 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
  */
 @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) {
+	public MongoAdmin(Mongo mongo) {
 
-		Assert.notNull(mongoClient, "MongoClient must not be null!");
-		this.mongoClient = mongoClient;
+		Assert.notNull(mongo, "Mongo must not be null!");
+		this.mongo = mongo;
 	}
 
 	/* (non-Javadoc)
@@ -46,7 +49,7 @@ public class MongoAdmin implements MongoAdminOperations {
 	  */
 	@ManagedOperation
 	public void dropDatabase(String databaseName) {
-		getDB(databaseName).drop();
+		getDB(databaseName).dropDatabase();
 	}
 
 	/* (non-Javadoc)
@@ -62,16 +65,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,5 +1,5 @@
 /*
- * Copyright 2015-2017 the original author or authors.
+ * Copyright 2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@ import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
+import com.mongodb.Mongo;
 import com.mongodb.MongoClient;
 import com.mongodb.MongoClientOptions;
 import com.mongodb.MongoCredential;
@@ -37,7 +38,7 @@ import com.mongodb.ServerAddress;
  * @author Christoph Strobl
  * @since 1.7
  */
-public class MongoClientFactoryBean extends AbstractFactoryBean<MongoClient> implements PersistenceExceptionTranslator {
+public class MongoClientFactoryBean extends AbstractFactoryBean<Mongo> implements PersistenceExceptionTranslator {
 
 	private static final PersistenceExceptionTranslator DEFAULT_EXCEPTION_TRANSLATOR = new MongoExceptionTranslator();
 
@@ -107,8 +108,8 @@ public class MongoClientFactoryBean extends AbstractFactoryBean<MongoClient> imp
 	 * (non-Javadoc)
 	 * @see org.springframework.beans.factory.FactoryBean#getObjectType()
 	 */
-	public Class<? extends MongoClient> getObjectType() {
-		return MongoClient.class;
+	public Class<? extends Mongo> getObjectType() {
+		return Mongo.class;
 	}
 
 	/*
@@ -124,7 +125,7 @@ public class MongoClientFactoryBean extends AbstractFactoryBean<MongoClient> imp
 	 * @see org.springframework.beans.factory.config.AbstractFactoryBean#createInstance()
 	 */
 	@Override
-	protected MongoClient createInstance() throws Exception {
+	protected Mongo createInstance() throws Exception {
 
 		if (mongoClientOptions == null) {
 			mongoClientOptions = MongoClientOptions.builder().build();
@@ -142,7 +143,7 @@ public class MongoClientFactoryBean extends AbstractFactoryBean<MongoClient> imp
 	 * @see org.springframework.beans.factory.config.AbstractFactoryBean#destroyInstance(java.lang.Object)
 	 */
 	@Override
-	protected void destroyInstance(MongoClient instance) throws Exception {
+	protected void destroyInstance(Mongo instance) throws Exception {
 		instance.close();
 	}
 

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

@@ -18,8 +18,10 @@ package org.springframework.data.mongodb.core;
 import javax.net.SocketFactory;
 import javax.net.ssl.SSLSocketFactory;
 
+import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.config.AbstractFactoryBean;
 import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.util.MongoClientVersion;
 
 import com.mongodb.DBDecoderFactory;
 import com.mongodb.DBEncoderFactory;
@@ -33,7 +35,6 @@ import com.mongodb.WriteConcern;
  *
  * @author Christoph Strobl
  * @author Oliver Gierke
- * @author Mark Paluch
  * @since 1.7
  */
 public class MongoClientOptionsFactoryBean extends AbstractFactoryBean<MongoClientOptions> {
@@ -63,7 +64,7 @@ public class MongoClientOptionsFactoryBean extends AbstractFactoryBean<MongoClie
 	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 int serverSelectionTimeout = Integer.MIN_VALUE;
 
 	private boolean ssl;
 	private SSLSocketFactory sslSocketFactory;
@@ -249,9 +250,7 @@ public class MongoClientOptionsFactoryBean extends AbstractFactoryBean<MongoClie
 	 * @param sslSocketFactory
 	 */
 	public void setSslSocketFactory(SSLSocketFactory sslSocketFactory) {
-
 		this.sslSocketFactory = sslSocketFactory;
-		this.ssl = sslSocketFactory != null;
 	}
 
 	/**
@@ -275,7 +274,13 @@ public class MongoClientOptionsFactoryBean extends AbstractFactoryBean<MongoClie
 		SocketFactory socketFactoryToUse = ssl
 				? (sslSocketFactory != null ? sslSocketFactory : SSLSocketFactory.getDefault()) : this.socketFactory;
 
-		return MongoClientOptions.builder() //
+		MongoClientOptions.Builder builder = MongoClientOptions.builder();
+
+		if (MongoClientVersion.isMongo3Driver() && serverSelectionTimeout != Integer.MIN_VALUE) {
+			new DirectFieldAccessor(builder).setPropertyValue("serverSelectionTimeout", serverSelectionTimeout);
+		}
+
+		return builder //
 				.alwaysUseMBeans(this.alwaysUseMBeans) //
 				.connectionsPerHost(this.connectionsPerHost) //
 				.connectTimeout(connectTimeout) //
@@ -293,7 +298,6 @@ public class MongoClientOptionsFactoryBean extends AbstractFactoryBean<MongoClie
 				.minHeartbeatFrequency(minHeartbeatFrequency) //
 				.readPreference(readPreference) //
 				.requiredReplicaSetName(requiredReplicaSetName) //
-				.serverSelectionTimeout(serverSelectionTimeout) //
 				.socketFactory(socketFactoryToUse) //
 				.socketKeepAlive(socketKeepAlive) //
 				.socketTimeout(socketTimeout) //

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

@@ -0,0 +1,216 @@
+/*
+ * Copyright 2010-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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.data.authentication.UserCredentials;
+import org.springframework.data.mongodb.util.MongoClientVersion;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
+import org.springframework.util.Assert;
+
+import com.mongodb.DB;
+import com.mongodb.Mongo;
+import com.mongodb.MongoClient;
+
+/**
+ * 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
+ * @author Christoph Strobl
+ * @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
+	 * @deprecated since 1.7. The {@link MongoClient} itself should hold credentials within
+	 *             {@link MongoClient#getCredentialsList()}.
+	 */
+	@Deprecated
+	public static DB getDB(Mongo mongo, String databaseName, UserCredentials credentials) {
+		return getDB(mongo, databaseName, credentials, databaseName);
+	}
+
+	/**
+	 * @param mongo
+	 * @param databaseName
+	 * @param credentials
+	 * @param authenticationDatabaseName
+	 * @return
+	 * @deprecated since 1.7. The {@link MongoClient} itself should hold credentials within
+	 *             {@link MongoClient#getCredentialsList()}.
+	 */
+	@Deprecated
+	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);
+
+		if (!(mongo instanceof MongoClient) && requiresAuthDbAuthentication(credentials)) {
+			ReflectiveDbInvoker.authenticate(mongo, db, credentials, authenticationDatabaseName);
+		}
+
+		// 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>)
+	 * @deprecated since 1.7. The main use case for this method is to ensure that applications can read their own
+	 *             unacknowledged writes, but this is no longer so prevalent since the MongoDB Java driver version 3
+	 *             started defaulting to acknowledged writes.
+	 */
+	@Deprecated
+	public static void closeDB(DB db) {
+
+		if (db != null) {
+			LOGGER.debug("Closing Mongo DB object");
+			try {
+				ReflectiveDbInvoker.requestDone(db);
+			} catch (Throwable ex) {
+				LOGGER.debug("Unexpected exception on closing Mongo DB object", ex);
+			}
+		}
+	}
+
+	/**
+	 * Check if credentials present. In case we're using a mongo-java-driver version 3 or above we do not have the need
+	 * for authentication as the auth data has to be provided within the MongoClient
+	 * 
+	 * @param credentials
+	 * @return
+	 */
+	private static boolean requiresAuthDbAuthentication(UserCredentials credentials) {
+
+		if (credentials == null || !credentials.hasUsername()) {
+			return false;
+		}
+
+		return !MongoClientVersion.isMongo3Driver();
+	}
+}

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-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.
@@ -19,7 +19,6 @@ 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;
@@ -34,10 +33,7 @@ import org.springframework.data.mongodb.util.MongoDbErrorCodes;
 import org.springframework.util.ClassUtils;
 
 import com.mongodb.BulkWriteException;
-import com.mongodb.MongoBulkWriteException;
 import com.mongodb.MongoException;
-import com.mongodb.MongoServerException;
-import com.mongodb.bulk.BulkWriteError;
 
 /**
  * Simple {@link PersistenceExceptionTranslator} for Mongo. Convert the given runtime exception to an appropriate
@@ -61,7 +57,7 @@ public class MongoExceptionTranslator implements PersistenceExceptionTranslator
 			Arrays.asList("MongoInternalException"));
 
 	private static final Set<String> DATA_INTEGRETY_EXCEPTIONS = new HashSet<String>(
-			Arrays.asList("WriteConcernException", "MongoWriteException", "MongoBulkWriteException"));
+			Arrays.asList("WriteConcernException"));
 
 	/*
 	 * (non-Javadoc)
@@ -71,10 +67,6 @@ 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)) {
@@ -90,20 +82,6 @@ public class MongoExceptionTranslator implements PersistenceExceptionTranslator
 		}
 
 		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);
 		}
 

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

@@ -0,0 +1,199 @@
+/*
+ * Copyright 2010-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.ArrayList;
+import java.util.Collection;
+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.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
+ * @author Christoph Strobl
+ * @since 1.0
+ * @deprecated since 1.7. Please use {@link MongoClientFactoryBean} instead.
+ */
+@Deprecated
+public class MongoFactoryBean extends AbstractFactoryBean<Mongo> implements PersistenceExceptionTranslator {
+
+	private static final PersistenceExceptionTranslator DEFAULT_EXCEPTION_TRANSLATOR = new MongoExceptionTranslator();
+
+	private MongoOptions mongoOptions;
+	private String host;
+	private Integer port;
+	private WriteConcern writeConcern;
+	private List<ServerAddress> replicaSetSeeds;
+	private List<ServerAddress> replicaPair;
+	private PersistenceExceptionTranslator exceptionTranslator = DEFAULT_EXCEPTION_TRANSLATOR;
+
+	/**
+	 * @param mongoOptions
+	 */
+	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);
+	}
+
+	/**
+	 * 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;
+	}
+
+	/**
+	 * 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;
+	}
+
+	/**
+	 * Configures the {@link PersistenceExceptionTranslator} to use.
+	 * 
+	 * @param exceptionTranslator can be {@literal null}.
+	 */
+	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 Mongo> getObjectType() {
+		return Mongo.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 Mongo createInstance() 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);
+		}
+
+		return mongo;
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.config.AbstractFactoryBean#destroyInstance(java.lang.Object)
+	 */
+	@Override
+	protected void destroyInstance(Mongo mongo) throws Exception {
+		mongo.close();
+	}
+
+	private static boolean isNullOrEmpty(Collection<?> elements) {
+		return elements == null || elements.isEmpty();
+	}
+
+	/**
+	 * Returns the given array as {@link List} with all {@literal null} elements removed.
+	 * 
+	 * @param elements the elements to filter <T>
+	 * @return a new unmodifiable {@link List#} from the given elements without nulls
+	 */
+	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/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,11 +19,9 @@ 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;
@@ -38,17 +36,19 @@ 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.CommandResult;
 import com.mongodb.Cursor;
+import com.mongodb.DB;
+import com.mongodb.DBCollection;
+import com.mongodb.DBObject;
 import com.mongodb.ReadPreference;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.result.DeleteResult;
-import com.mongodb.client.result.UpdateResult;
+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 +56,12 @@ import com.mongodb.client.result.UpdateResult;
  * @author Chuong Ngo
  * @author Christoph Strobl
  * @author Thomas Darimont
- * @author Maninder Singh
  */
-public interface MongoOperations extends FluentMongoOperations {
+public interface MongoOperations {
 
 	/**
 	 * The collection name used for the specified class by this template.
-	 *
+	 * 
 	 * @param entityClass must not be {@literal null}.
 	 * @return
 	 */
@@ -70,35 +69,47 @@ public interface MongoOperations extends FluentMongoOperations {
 
 	/**
 	 * 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 DAO
+	 * exception hierarchy.
+	 * 
+	 * @param command a MongoDB command
+	 * @param options query options to use
+	 * @deprecated since 1.7. Please use {@link #executeCommand(DBObject, ReadPreference)}, as the MongoDB Java driver
+	 *             version 3 no longer supports this operation.
+	 */
+	@Deprecated
+	CommandResult executeCommand(DBObject command, int options);
 
 	/**
 	 * 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
 	 */
-	Document executeCommand(Document command, ReadPreference readPreference);
+	CommandResult executeCommand(DBObject command, ReadPreference readPreference);
 
 	/**
 	 * 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 +121,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * 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 +132,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * 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 +144,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * 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.
@@ -141,12 +152,28 @@ public interface MongoOperations extends FluentMongoOperations {
 	 */
 	<T> T execute(String collectionName, CollectionCallback<T> action);
 
+	/**
+	 * 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>
+	 * @deprecated since 1.7 as the MongoDB Java driver version 3 does not longer support request boundaries via
+	 *             {@link DB#requestStart()} and {@link DB#requestDone()}.
+	 */
+	@Deprecated
+	<T> T executeInSession(DbCallback<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}.
@@ -160,7 +187,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * 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}.
@@ -172,41 +199,41 @@ public interface MongoOperations extends FluentMongoOperations {
 
 	/**
 	 * 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.
-	 *
+	 * 
 	 * @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.
-	 *
+	 * 
 	 * @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 +242,17 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * 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 +262,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * 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 +272,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * 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,28 +281,28 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * 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
 	 */
@@ -283,7 +310,7 @@ public interface MongoOperations extends FluentMongoOperations {
 
 	/**
 	 * 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
@@ -292,7 +319,7 @@ public interface MongoOperations extends FluentMongoOperations {
 
 	/**
 	 * 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.
@@ -301,7 +328,7 @@ public interface MongoOperations extends FluentMongoOperations {
 
 	/**
 	 * 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.
@@ -317,7 +344,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * <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 +358,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * <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 +368,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	/**
 	 * 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 +383,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * 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 +397,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	/**
 	 * 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 +410,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	/**
 	 * 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 +421,7 @@ public interface MongoOperations extends FluentMongoOperations {
 
 	/**
 	 * 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 +434,7 @@ public interface MongoOperations extends FluentMongoOperations {
 
 	/**
 	 * 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 +445,9 @@ public interface MongoOperations extends FluentMongoOperations {
 	 */
 	<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 +460,7 @@ public interface MongoOperations extends FluentMongoOperations {
 
 	/**
 	 * 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 +474,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	/**
 	 * 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 +488,7 @@ public interface MongoOperations extends FluentMongoOperations {
 
 	/**
 	 * 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 +505,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * 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 +516,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * 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 +534,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * <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 +551,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * <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 +562,7 @@ public interface MongoOperations extends FluentMongoOperations {
 
 	/**
 	 * 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 +571,7 @@ public interface MongoOperations extends FluentMongoOperations {
 
 	/**
 	 * 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 +580,7 @@ public interface MongoOperations extends FluentMongoOperations {
 
 	/**
 	 * 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 +596,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * <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 +612,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * <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 +624,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	/**
 	 * 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 +634,7 @@ public interface MongoOperations extends FluentMongoOperations {
 
 	/**
 	 * 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 +644,9 @@ public interface MongoOperations extends FluentMongoOperations {
 	<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/>
-	 * to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query}.
-	 *
+	 * 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 +656,9 @@ public interface MongoOperations extends FluentMongoOperations {
 	<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/>
-	 * to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query}.
-	 *
+	 * 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 +669,10 @@ public interface MongoOperations extends FluentMongoOperations {
 	<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/>
-	 * to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query} taking
+	 * 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 +683,10 @@ public interface MongoOperations extends FluentMongoOperations {
 	<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/>
-	 * to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query} taking
+	 * 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 +707,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * <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 +724,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * <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 +735,7 @@ public interface MongoOperations extends FluentMongoOperations {
 
 	/**
 	 * 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
@@ -794,7 +746,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * 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
@@ -805,7 +757,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	/**
 	 * 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.
@@ -826,7 +778,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * <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 +790,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * 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 +798,7 @@ public interface MongoOperations extends FluentMongoOperations {
 
 	/**
 	 * 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 +806,7 @@ public interface MongoOperations extends FluentMongoOperations {
 
 	/**
 	 * 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 +815,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	/**
 	 * 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);
@@ -880,7 +832,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * 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 +849,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * 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 +858,66 @@ public interface MongoOperations extends FluentMongoOperations {
 	/**
 	 * 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 +925,36 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * @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 +962,54 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * @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 +1019,7 @@ public interface MongoOperations extends FluentMongoOperations {
 
 	/**
 	 * Returns and removes all documents matching the given query form the collection used to store the entityClass.
-	 *
+	 * 
 	 * @param query
 	 * @param entityClass
 	 * @return
@@ -1079,7 +1031,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * 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 +1042,7 @@ public interface MongoOperations extends FluentMongoOperations {
 
 	/**
 	 * Returns the underlying {@link MongoConverter}.
-	 *
+	 * 
 	 * @return
 	 */
 	MongoConverter getConverter();

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

@@ -0,0 +1,255 @@
+/*
+ * Copyright 2010-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 javax.net.ssl.SSLSocketFactory;
+
+import org.springframework.beans.factory.config.AbstractFactoryBean;
+import org.springframework.data.mongodb.util.MongoClientVersion;
+
+import com.mongodb.MongoOptions;
+
+/**
+ * A factory bean for construction of a {@link MongoOptions} instance. In case used with MongoDB Java driver version 3
+ * porperties not suppprted by the driver will be ignored.
+ *
+ * @author Graeme Rocher
+ * @author Mark Pollack
+ * @author Mike Saavedra
+ * @author Thomas Darimont
+ * @author Christoph Strobl
+ * @deprecated since 1.7. Please use {@link MongoClientOptionsFactoryBean} instead.
+ */
+@Deprecated
+public class MongoOptionsFactoryBean extends AbstractFactoryBean<MongoOptions> {
+
+	private static final MongoOptions DEFAULT_MONGO_OPTIONS = new MongoOptions();
+
+	private int connectionsPerHost = DEFAULT_MONGO_OPTIONS.getConnectionsPerHost();
+	private int threadsAllowedToBlockForConnectionMultiplier = DEFAULT_MONGO_OPTIONS
+			.getThreadsAllowedToBlockForConnectionMultiplier();
+	private int maxWaitTime = DEFAULT_MONGO_OPTIONS.getMaxWaitTime();
+	private int connectTimeout = DEFAULT_MONGO_OPTIONS.getConnectTimeout();
+	private int socketTimeout = DEFAULT_MONGO_OPTIONS.getSocketTimeout();
+	private boolean socketKeepAlive = DEFAULT_MONGO_OPTIONS.isSocketKeepAlive();
+	private int writeNumber = DEFAULT_MONGO_OPTIONS.getW();
+	private int writeTimeout = DEFAULT_MONGO_OPTIONS.getWtimeout();
+	private boolean writeFsync = DEFAULT_MONGO_OPTIONS.isFsync();
+
+	private boolean autoConnectRetry = !MongoClientVersion.isMongo3Driver() ? ReflectiveMongoOptionsInvoker
+			.getAutoConnectRetry(DEFAULT_MONGO_OPTIONS) : false;
+	private long maxAutoConnectRetryTime = !MongoClientVersion.isMongo3Driver() ? ReflectiveMongoOptionsInvoker
+			.getMaxAutoConnectRetryTime(DEFAULT_MONGO_OPTIONS) : -1;
+	private boolean slaveOk = !MongoClientVersion.isMongo3Driver() ? ReflectiveMongoOptionsInvoker
+			.getSlaveOk(DEFAULT_MONGO_OPTIONS) : false;
+
+	private boolean ssl;
+	private SSLSocketFactory sslSocketFactory;
+
+	/**
+	 * 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}.
+	 * 
+	 * @deprecated since 1.7.
+	 */
+	@Deprecated
+	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
+	 * @deprecated since 1.7
+	 */
+	@Deprecated
+	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.
+	 * @deprecated since 1.7
+	 */
+	@Deprecated
+	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.config.AbstractFactoryBean#createInstance()
+	 */
+	@Override
+	protected MongoOptions createInstance() throws Exception {
+
+		if (MongoClientVersion.isMongo3Driver()) {
+			throw new IllegalArgumentException(
+					String
+							.format("Usage of 'mongo-options' is no longer supported for MongoDB Java driver version 3 and above. Please use 'mongo-client-options' and refer to chapter 'MongoDB 3.0 Support' for details."));
+		}
+
+		MongoOptions options = new MongoOptions();
+
+		options.setConnectionsPerHost(connectionsPerHost);
+		options.setThreadsAllowedToBlockForConnectionMultiplier(threadsAllowedToBlockForConnectionMultiplier);
+		options.setMaxWaitTime(maxWaitTime);
+		options.setConnectTimeout(connectTimeout);
+		options.setSocketTimeout(socketTimeout);
+		options.setSocketKeepAlive(socketKeepAlive);
+
+		options.setW(writeNumber);
+		options.setWtimeout(writeTimeout);
+		options.setFsync(writeFsync);
+
+		if (ssl) {
+			options.setSocketFactory(sslSocketFactory != null ? sslSocketFactory : SSLSocketFactory.getDefault());
+		}
+
+		ReflectiveMongoOptionsInvoker.setAutoConnectRetry(options, autoConnectRetry);
+		ReflectiveMongoOptionsInvoker.setMaxAutoConnectRetryTime(options, maxAutoConnectRetryTime);
+		ReflectiveMongoOptionsInvoker.setSlaveOk(options, slaveOk);
+
+		return options;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.FactoryBean#getObjectType()
+	 */
+	public Class<?> getObjectType() {
+		return MongoOptions.class;
+	}
+}

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/ReflectiveDBCollectionInvoker.java

@@ -0,0 +1,109 @@
+/*
+ * Copyright 2015 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import static org.springframework.data.mongodb.util.MongoClientVersion.*;
+import static org.springframework.util.ReflectionUtils.*;
+
+import java.lang.reflect.Method;
+
+import org.springframework.data.mongodb.util.MongoClientVersion;
+
+import com.mongodb.DBCollection;
+import com.mongodb.DBObject;
+
+/**
+ * {@link ReflectiveDBCollectionInvoker} provides reflective access to {@link DBCollection} API that is not consistently
+ * available for various driver versions.
+ * 
+ * @author Christoph Strobl
+ * @author Oliver Gierke
+ * @since 1.7
+ */
+class ReflectiveDBCollectionInvoker {
+
+	private static final Method GEN_INDEX_NAME_METHOD;
+	private static final Method RESET_INDEX_CHACHE_METHOD;
+
+	static {
+
+		GEN_INDEX_NAME_METHOD = findMethod(DBCollection.class, "genIndexName", DBObject.class);
+		RESET_INDEX_CHACHE_METHOD = findMethod(DBCollection.class, "resetIndexCache");
+	}
+
+	private ReflectiveDBCollectionInvoker() {}
+
+	/**
+	 * Convenience method to generate an index name from the set of fields it is over. Will fall back to a MongoDB Java
+	 * driver version 2 compatible way of generating index name in case of {@link MongoClientVersion#isMongo3Driver()}.
+	 * 
+	 * @param keys the names of the fields used in this index
+	 * @return
+	 */
+	public static String generateIndexName(DBObject keys) {
+
+		if (isMongo3Driver()) {
+			return genIndexName(keys);
+		}
+		return (String) invokeMethod(GEN_INDEX_NAME_METHOD, null, keys);
+	}
+
+	/**
+	 * In case of MongoDB Java driver version 2 all indices that have not yet been applied to this collection will be
+	 * cleared. Since this method is not available for the MongoDB Java driver version 3 the operation will throw
+	 * {@link UnsupportedOperationException}.
+	 * 
+	 * @param dbCollection
+	 * @throws UnsupportedOperationException
+	 */
+	public static void resetIndexCache(DBCollection dbCollection) {
+
+		if (isMongo3Driver()) {
+			throw new UnsupportedOperationException("The mongo java driver 3 does no loger support resetIndexCache!");
+		}
+
+		invokeMethod(RESET_INDEX_CHACHE_METHOD, dbCollection);
+	}
+
+	/**
+	 * Borrowed from MongoDB Java driver version 2. See <a
+	 * href="http://github.com/mongodb/mongo-java-driver/blob/r2.13.0/src/main/com/mongodb/DBCollection.java#L754"
+	 * >http://github.com/mongodb/mongo-java-driver/blob/r2.13.0/src/main/com/mongodb/DBCollection.java#L754</a>
+	 * 
+	 * @param keys
+	 * @return
+	 */
+	private static String genIndexName(DBObject keys) {
+
+		StringBuilder name = new StringBuilder();
+
+		for (String s : keys.keySet()) {
+
+			if (name.length() > 0) {
+				name.append('_');
+			}
+
+			name.append(s).append('_');
+			Object val = keys.get(s);
+
+			if (val instanceof Number || val instanceof String) {
+				name.append(val.toString().replace(' ', '_'));
+			}
+		}
+
+		return name.toString();
+	}
+}

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

@@ -0,0 +1,134 @@
+/*
+ * Copyright 2015 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import static org.springframework.data.mongodb.util.MongoClientVersion.*;
+import static org.springframework.util.ReflectionUtils.*;
+
+import java.lang.reflect.Method;
+
+import org.springframework.data.authentication.UserCredentials;
+import org.springframework.data.mongodb.CannotGetMongoDbConnectionException;
+import org.springframework.data.mongodb.util.MongoClientVersion;
+
+import com.mongodb.DB;
+import com.mongodb.Mongo;
+
+/**
+ * {@link ReflectiveDbInvoker} provides reflective access to {@link DB} API that is not consistently available for
+ * various driver versions.
+ *
+ * @author Christoph Strobl
+ * @author Oliver Gierke
+ * @since 1.7
+ */
+final class ReflectiveDbInvoker {
+
+	private static final Method DB_IS_AUTHENTICATED_METHOD;
+	private static final Method DB_AUTHENTICATE_METHOD;
+	private static final Method DB_REQUEST_DONE_METHOD;
+	private static final Method DB_ADD_USER_METHOD;
+	private static final Method DB_REQUEST_START_METHOD;
+
+	static {
+
+		DB_IS_AUTHENTICATED_METHOD = findMethod(DB.class, "isAuthenticated");
+		DB_AUTHENTICATE_METHOD = findMethod(DB.class, "authenticate", String.class, char[].class);
+		DB_REQUEST_DONE_METHOD = findMethod(DB.class, "requestDone");
+		DB_ADD_USER_METHOD = findMethod(DB.class, "addUser", String.class, char[].class);
+		DB_REQUEST_START_METHOD = findMethod(DB.class, "requestStart");
+	}
+
+	private ReflectiveDbInvoker() {}
+
+	/**
+	 * Authenticate against database using provided credentials in case of a MongoDB Java driver version 2.
+	 *
+	 * @param mongo must not be {@literal null}.
+	 * @param db must not be {@literal null}.
+	 * @param credentials must not be {@literal null}.
+	 * @param authenticationDatabaseName
+	 */
+	public static void authenticate(Mongo mongo, DB db, UserCredentials credentials, String authenticationDatabaseName) {
+
+		String databaseName = db.getName();
+
+		DB authDb = databaseName.equals(authenticationDatabaseName) ? db : mongo.getDB(authenticationDatabaseName);
+
+		synchronized (authDb) {
+
+			Boolean isAuthenticated = (Boolean) invokeMethod(DB_IS_AUTHENTICATED_METHOD, authDb);
+			if (!isAuthenticated) {
+
+				String username = credentials.getUsername();
+				String password = credentials.hasPassword() ? credentials.getPassword() : null;
+
+				Boolean authenticated = (Boolean) invokeMethod(DB_AUTHENTICATE_METHOD, authDb, username,
+						password == null ? null : password.toCharArray());
+				if (!authenticated) {
+					throw new CannotGetMongoDbConnectionException("Failed to authenticate to database [" + databaseName + "], "
+							+ credentials.toString(), databaseName, credentials);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Starts a new 'consistent request' in case of MongoDB Java driver version 2. Will do nothing for MongoDB Java driver
+	 * version 3 since the operation is no longer available.
+	 *
+	 * @param db
+	 */
+	public static void requestStart(DB db) {
+
+		if (isMongo3Driver()) {
+			return;
+		}
+
+		invokeMethod(DB_REQUEST_START_METHOD, db);
+	}
+
+	/**
+	 * Ends the current 'consistent request'. a new 'consistent request' in case of MongoDB Java driver version 2. Will do
+	 * nothing for MongoDB Java driver version 3 since the operation is no longer available
+	 *
+	 * @param db
+	 */
+	public static void requestDone(DB db) {
+
+		if (MongoClientVersion.isMongo3Driver()) {
+			return;
+		}
+
+		invokeMethod(DB_REQUEST_DONE_METHOD, db);
+	}
+
+	/**
+	 * @param db
+	 * @param username
+	 * @param password
+	 * @throws UnsupportedOperationException
+	 */
+	public static void addUser(DB db, String username, char[] password) {
+
+		if (isMongo3Driver()) {
+			throw new UnsupportedOperationException(
+					"Please use DB.command(…) to call either the createUser or updateUser command!");
+		}
+
+		invokeMethod(DB_ADD_USER_METHOD, db, username, password);
+	}
+}

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

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2015 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import static org.springframework.data.mongodb.util.MongoClientVersion.*;
+import static org.springframework.util.ReflectionUtils.*;
+
+import java.lang.reflect.Method;
+
+import org.springframework.util.Assert;
+
+import com.mongodb.MapReduceCommand;
+
+/**
+ * {@link ReflectiveMapReduceInvoker} provides reflective access to {@link MapReduceCommand} API that is not
+ * consistently available for various driver versions.
+ * 
+ * @author Christoph Strobl
+ * @author Oliver Gierke
+ * @since 1.7
+ */
+final class ReflectiveMapReduceInvoker {
+
+	private static final Method ADD_EXTRA_OPTION_METHOD;
+
+	static {
+
+		ADD_EXTRA_OPTION_METHOD = findMethod(MapReduceCommand.class, "addExtraOption", String.class, Object.class);
+	}
+
+	private ReflectiveMapReduceInvoker() {}
+
+	/**
+	 * Sets the extra option for MongoDB Java driver version 2. Will do nothing for MongoDB Java driver version 2.
+	 * 
+	 * @param cmd can be {@literal null} for MongoDB Java driver version 2.
+	 * @param key
+	 * @param value
+	 */
+	public static void addExtraOption(MapReduceCommand cmd, String key, Object value) {
+
+		if (isMongo3Driver()) {
+			return;
+		}
+
+		Assert.notNull(cmd, "MapReduceCommand must not be null!");
+		invokeMethod(ADD_EXTRA_OPTION_METHOD, cmd, key, value);
+	}
+}

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

@@ -0,0 +1,158 @@
+/*
+ * Copyright 2015 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import static org.springframework.data.mongodb.util.MongoClientVersion.*;
+import static org.springframework.util.ReflectionUtils.*;
+
+import java.lang.reflect.Method;
+
+import org.springframework.beans.DirectFieldAccessor;
+import org.springframework.util.ReflectionUtils;
+
+import com.mongodb.MongoOptions;
+
+/**
+ * {@link ReflectiveMongoOptionsInvoker} provides reflective access to {@link MongoOptions} API that is not consistently
+ * available for various driver versions.
+ * 
+ * @author Christoph Strobl
+ * @author Oliver Gierke
+ * @since 1.7
+ */
+@SuppressWarnings("deprecation")
+class ReflectiveMongoOptionsInvoker {
+
+	private static final Method GET_AUTO_CONNECT_RETRY_METHOD;
+	private static final Method SET_AUTO_CONNECT_RETRY_METHOD;
+	private static final Method GET_MAX_AUTO_CONNECT_RETRY_TIME_METHOD;
+	private static final Method SET_MAX_AUTO_CONNECT_RETRY_TIME_METHOD;
+
+	static {
+
+		SET_AUTO_CONNECT_RETRY_METHOD = ReflectionUtils
+				.findMethod(MongoOptions.class, "setAutoConnectRetry", boolean.class);
+		GET_AUTO_CONNECT_RETRY_METHOD = ReflectionUtils.findMethod(MongoOptions.class, "isAutoConnectRetry");
+		SET_MAX_AUTO_CONNECT_RETRY_TIME_METHOD = ReflectionUtils.findMethod(MongoOptions.class,
+				"setMaxAutoConnectRetryTime", long.class);
+		GET_MAX_AUTO_CONNECT_RETRY_TIME_METHOD = ReflectionUtils.findMethod(MongoOptions.class,
+				"getMaxAutoConnectRetryTime");
+	}
+
+	private ReflectiveMongoOptionsInvoker() {}
+
+	/**
+	 * Sets the retry connection flag for MongoDB Java driver version 2. Will do nothing for MongoDB Java driver version 3
+	 * since the method has been removed.
+	 * 
+	 * @param options can be {@literal null} for MongoDB Java driver version 3.
+	 * @param autoConnectRetry
+	 */
+	public static void setAutoConnectRetry(MongoOptions options, boolean autoConnectRetry) {
+
+		if (isMongo3Driver()) {
+			return;
+		}
+
+		invokeMethod(SET_AUTO_CONNECT_RETRY_METHOD, options, autoConnectRetry);
+	}
+
+	/**
+	 * Sets the maxAutoConnectRetryTime attribute for MongoDB Java driver version 2. Will do nothing for MongoDB Java
+	 * driver version 3 since the method has been removed.
+	 * 
+	 * @param options can be {@literal null} for MongoDB Java driver version 3.
+	 * @param maxAutoConnectRetryTime
+	 */
+	public static void setMaxAutoConnectRetryTime(MongoOptions options, long maxAutoConnectRetryTime) {
+
+		if (isMongo3Driver()) {
+			return;
+		}
+
+		invokeMethod(SET_MAX_AUTO_CONNECT_RETRY_TIME_METHOD, options, maxAutoConnectRetryTime);
+	}
+
+	/**
+	 * Sets the slaveOk attribute for MongoDB Java driver version 2. Will do nothing for MongoDB Java driver version 3
+	 * since the method has been removed.
+	 * 
+	 * @param options can be {@literal null} for MongoDB Java driver version 3.
+	 * @param slaveOk
+	 */
+	public static void setSlaveOk(MongoOptions options, boolean slaveOk) {
+
+		if (isMongo3Driver()) {
+			return;
+		}
+
+		new DirectFieldAccessor(options).setPropertyValue("slaveOk", slaveOk);
+	}
+
+	/**
+	 * Gets the slaveOk attribute for MongoDB Java driver version 2. Throws {@link UnsupportedOperationException} for
+	 * MongoDB Java driver version 3 since the method has been removed.
+	 * 
+	 * @param options can be {@literal null} for MongoDB Java driver version 3.
+	 * @return
+	 * @throws UnsupportedOperationException
+	 */
+	public static boolean getSlaveOk(MongoOptions options) {
+
+		if (isMongo3Driver()) {
+			throw new UnsupportedOperationException(
+					"Cannot get value for autoConnectRetry which has been removed in MongoDB Java driver version 3.");
+		}
+
+		return ((Boolean) new DirectFieldAccessor(options).getPropertyValue("slaveOk")).booleanValue();
+	}
+
+	/**
+	 * Gets the autoConnectRetry attribute for MongoDB Java driver version 2. Throws {@link UnsupportedOperationException}
+	 * for MongoDB Java driver version 3 since the method has been removed.
+	 * 
+	 * @param options can be {@literal null} for MongoDB Java driver version 3.
+	 * @return
+	 * @throws UnsupportedOperationException
+	 */
+	public static boolean getAutoConnectRetry(MongoOptions options) {
+
+		if (isMongo3Driver()) {
+			throw new UnsupportedOperationException(
+					"Cannot get value for autoConnectRetry which has been removed in MongoDB Java driver version 3.");
+		}
+
+		return ((Boolean) invokeMethod(GET_AUTO_CONNECT_RETRY_METHOD, options)).booleanValue();
+	}
+
+	/**
+	 * Gets the maxAutoConnectRetryTime attribute for MongoDB Java driver version 2. Throws
+	 * {@link UnsupportedOperationException} for MongoDB Java driver version 3 since the method has been removed.
+	 * 
+	 * @param options can be {@literal null} for MongoDB Java driver version 3.
+	 * @return
+	 * @throws UnsupportedOperationException
+	 */
+	public static long getMaxAutoConnectRetryTime(MongoOptions options) {
+
+		if (isMongo3Driver()) {
+			throw new UnsupportedOperationException(
+					"Cannot get value for maxAutoConnectRetryTime which has been removed in MongoDB Java driver version 3.");
+		}
+
+		return ((Long) invokeMethod(GET_MAX_AUTO_CONNECT_RETRY_TIME_METHOD, options)).longValue();
+	}
+}

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

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2015 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import static org.springframework.data.mongodb.util.MongoClientVersion.*;
+
+import org.springframework.beans.DirectFieldAccessor;
+
+import com.mongodb.WriteConcern;
+
+/**
+ * {@link ReflectiveWriteConcernInvoker} provides reflective access to {@link WriteConcern} API that is not consistently
+ * available for various driver versions.
+ * 
+ * @author Christoph Strobl
+ * @author Oliver Gierke
+ * @since 1.7
+ */
+class ReflectiveWriteConcernInvoker {
+
+	private static final WriteConcern NONE_OR_UNACKNOWLEDGED;
+
+	static {
+
+		NONE_OR_UNACKNOWLEDGED = isMongo3Driver() ? WriteConcern.UNACKNOWLEDGED : (WriteConcern) new DirectFieldAccessor(
+				new WriteConcern()).getPropertyValue("NONE");
+	}
+
+	/**
+	 * @return {@link WriteConcern#NONE} for MongoDB Java driver version 2, otherwise {@link WriteConcern#UNACKNOWLEDGED}.
+	 */
+	public static WriteConcern noneOrUnacknowledged() {
+		return NONE_OR_UNACKNOWLEDGED;
+	}
+}

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

@@ -0,0 +1,67 @@
+/*
+ * Copyright 2015 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import static org.springframework.data.mongodb.util.MongoClientVersion.*;
+import static org.springframework.util.ReflectionUtils.*;
+
+import java.lang.reflect.Method;
+
+import com.mongodb.MongoException;
+import com.mongodb.WriteResult;
+
+/**
+ * {@link ReflectiveWriteResultInvoker} provides reflective access to {@link WriteResult} API that is not consistently
+ * available for various driver versions.
+ * 
+ * @author Christoph Strobl
+ * @author Oliver Gierke
+ * @since 1.7
+ */
+final class ReflectiveWriteResultInvoker {
+
+	private static final Method GET_ERROR_METHOD;
+	private static final Method WAS_ACKNOWLEDGED_METHOD;
+
+	private ReflectiveWriteResultInvoker() {}
+
+	static {
+
+		GET_ERROR_METHOD = findMethod(WriteResult.class, "getError");
+		WAS_ACKNOWLEDGED_METHOD = findMethod(WriteResult.class, "wasAcknowledged");
+	}
+
+	/**
+	 * @param writeResult can be {@literal null} for MongoDB Java driver version 3.
+	 * @return null in case of MongoDB Java driver version 3 since errors are thrown as {@link MongoException}.
+	 */
+	public static String getError(WriteResult writeResult) {
+
+		if (isMongo3Driver()) {
+			return null;
+		}
+
+		return (String) invokeMethod(GET_ERROR_METHOD, writeResult);
+	}
+
+	/**
+	 * @param writeResult
+	 * @return return in case of MongoDB Java driver version 2.
+	 */
+	public static boolean wasAcknowledged(WriteResult writeResult) {
+		return isMongo3Driver() ? ((Boolean) invokeMethod(WAS_ACKNOWLEDGED_METHOD, writeResult)).booleanValue() : true;
+	}
+}

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-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.
@@ -19,18 +19,23 @@ import java.net.UnknownHostException;
 
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.dao.DataAccessException;
+import org.springframework.dao.InvalidDataAccessApiUsageException;
 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.Mongo;
 import com.mongodb.MongoClient;
 import com.mongodb.MongoClientURI;
+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
@@ -39,13 +44,70 @@ import com.mongodb.client.MongoDatabase;
  */
 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;
 
+	/**
+	 * 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.
+	 * @deprecated since 1.7. Please use {@link #SimpleMongoDbFactory(MongoClient, String)}.
+	 */
+	@Deprecated
+	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.
+	 * @deprecated since 1.7. The credentials used should be provided by {@link MongoClient#getCredentialsList()}.
+	 */
+	@Deprecated
+	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
+	 * @deprecated since 1.7. The credentials used should be provided by {@link MongoClient#getCredentialsList()}.
+	 */
+	@Deprecated
+	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
+	 * @see MongoURI
+	 * @deprecated since 1.7. Please use {@link #SimpleMongoDbFactory(MongoClientURI)} instead.
+	 */
+	@Deprecated
+	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 MongoClientURI}.
 	 * 
@@ -53,7 +115,7 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	 * @throws UnknownHostException
 	 * @since 1.7
 	 */
-	public SimpleMongoDbFactory(MongoClientURI uri) {
+	public SimpleMongoDbFactory(MongoClientURI uri) throws UnknownHostException {
 		this(new MongoClient(uri), uri.getDatabase(), true);
 	}
 
@@ -68,23 +130,48 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 		this(mongoClient, databaseName, false);
 	}
 
+	private SimpleMongoDbFactory(Mongo mongo, String databaseName, UserCredentials credentials,
+			boolean mongoInstanceCreated, String authenticationDatabaseName) {
+
+		if (mongo instanceof MongoClient && (credentials != null && !UserCredentials.NO_CREDENTIALS.equals(credentials))) {
+			throw new InvalidDataAccessApiUsageException(
+					"Usage of 'UserCredentials' with 'MongoClient' is no longer supported. Please use 'MongoCredential' for 'MongoClient' or just 'Mongo'.");
+		}
+
+		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.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!");
+	}
+
 	/**
 	 * @param client
 	 * @param databaseName
 	 * @param mongoInstanceCreated
 	 * @since 1.7
 	 */
-	private SimpleMongoDbFactory(MongoClient mongoClient, String databaseName, boolean mongoInstanceCreated) {
+	private SimpleMongoDbFactory(MongoClient client, String databaseName, boolean mongoInstanceCreated) {
 
-		Assert.notNull(mongoClient, "MongoClient must not be null!");
+		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.mongoClient = mongoClient;
+		this.mongo = client;
 		this.databaseName = databaseName;
 		this.mongoInstanceCreated = mongoInstanceCreated;
 		this.exceptionTranslator = new MongoExceptionTranslator();
+		this.credentials = UserCredentials.NO_CREDENTIALS;
+		this.authenticationDatabaseName = databaseName;
 	}
 
 	/**
@@ -100,7 +187,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 +195,18 @@ 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 {
+	@SuppressWarnings("deprecation")
+	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 +216,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 +232,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

@@ -21,9 +21,11 @@ import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 
-import org.bson.Document;
 import org.springframework.util.ObjectUtils;
 
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
 /**
  * @author Christoph Strobl
  * @since 1.10
@@ -37,15 +39,15 @@ abstract class AbstractAggregationExpression implements AggregationExpression {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDbObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 	 */
 	@Override
-	public Document toDocument(AggregationOperationContext context) {
-		return toDocument(this.value, context);
+	public DBObject toDbObject(AggregationOperationContext context) {
+		return toDbObject(this.value, context);
 	}
 
 	@SuppressWarnings("unchecked")
-	public Document toDocument(Object value, AggregationOperationContext context) {
+	public DBObject toDbObject(Object value, AggregationOperationContext context) {
 
 		Object valueToUse;
 		if (value instanceof List) {
@@ -59,7 +61,7 @@ abstract class AbstractAggregationExpression implements AggregationExpression {
 			valueToUse = args;
 		} else if (value instanceof java.util.Map) {
 
-			Document dbo = new Document();
+			DBObject dbo = new BasicDBObject();
 			for (java.util.Map.Entry<String, Object> entry : ((java.util.Map<String, Object>) value).entrySet()) {
 				dbo.put(entry.getKey(), unpack(entry.getValue(), context));
 			}
@@ -68,7 +70,7 @@ abstract class AbstractAggregationExpression implements AggregationExpression {
 			valueToUse = unpack(value, context);
 		}
 
-		return new Document(getMongoMethod(), valueToUse);
+		return new BasicDBObject(getMongoMethod(), valueToUse);
 	}
 
 	protected static List<Field> asFields(String... fieldRefs) {
@@ -84,7 +86,7 @@ abstract class AbstractAggregationExpression implements AggregationExpression {
 	private Object unpack(Object value, AggregationOperationContext context) {
 
 		if (value instanceof AggregationExpression) {
-			return ((AggregationExpression) value).toDocument(context);
+			return ((AggregationExpression) value).toDbObject(context);
 		}
 
 		if (value instanceof Field) {

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

@@ -18,9 +18,10 @@ package org.springframework.data.mongodb.core.aggregation;
 import java.util.Collections;
 import java.util.List;
 
-import org.bson.Document;
 import org.springframework.util.Assert;
 
+import com.mongodb.DBObject;
+
 /**
  * Gateway to {@literal accumulator} aggregation operations.
  *
@@ -214,19 +215,19 @@ public class AccumulatorOperators {
 		}
 
 		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDocument(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDbObject(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 		 */
 		@Override
 		@SuppressWarnings("unchecked")
-		public Document toDocument(Object value, AggregationOperationContext context) {
+		public DBObject toDbObject(Object value, AggregationOperationContext context) {
 
 			if (value instanceof List) {
 				if (((List) value).size() == 1) {
-					return super.toDocument(((List<Object>) value).iterator().next(), context);
+					return super.toDbObject(((List<Object>) value).iterator().next(), context);
 				}
 			}
 
-			return super.toDocument(value, context);
+			return super.toDbObject(value, context);
 		}
 	}
 
@@ -297,19 +298,19 @@ public class AccumulatorOperators {
 		}
 
 		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDocument(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDbObject(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 		 */
 		@Override
 		@SuppressWarnings("unchecked")
-		public Document toDocument(Object value, AggregationOperationContext context) {
+		public DBObject toDbObject(Object value, AggregationOperationContext context) {
 
 			if (value instanceof List) {
 				if (((List) value).size() == 1) {
-					return super.toDocument(((List<Object>) value).iterator().next(), context);
+					return super.toDbObject(((List<Object>) value).iterator().next(), context);
 				}
 			}
 
-			return super.toDocument(value, context);
+			return super.toDbObject(value, context);
 		}
 	}
 
@@ -380,19 +381,19 @@ public class AccumulatorOperators {
 		}
 
 		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDocument(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDbObject(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 		 */
 		@Override
 		@SuppressWarnings("unchecked")
-		public Document toDocument(Object value, AggregationOperationContext context) {
+		public DBObject toDbObject(Object value, AggregationOperationContext context) {
 
 			if (value instanceof List) {
 				if (((List) value).size() == 1) {
-					return super.toDocument(((List<Object>) value).iterator().next(), context);
+					return super.toDbObject(((List<Object>) value).iterator().next(), context);
 				}
 			}
 
-			return super.toDocument(value, context);
+			return super.toDbObject(value, context);
 		}
 	}
 
@@ -463,19 +464,19 @@ public class AccumulatorOperators {
 		}
 
 		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDocument(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDbObject(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 		 */
 		@Override
 		@SuppressWarnings("unchecked")
-		public Document toDocument(Object value, AggregationOperationContext context) {
+		public DBObject toDbObject(Object value, AggregationOperationContext context) {
 
 			if (value instanceof List) {
 				if (((List) value).size() == 1) {
-					return super.toDocument(((List<Object>) value).iterator().next(), context);
+					return super.toDbObject(((List<Object>) value).iterator().next(), context);
 				}
 			}
 
-			return super.toDocument(value, context);
+			return super.toDbObject(value, context);
 		}
 	}
 
@@ -546,19 +547,19 @@ public class AccumulatorOperators {
 		}
 
 		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDocument(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDbObject(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 		 */
 		@Override
 		@SuppressWarnings("unchecked")
-		public Document toDocument(Object value, AggregationOperationContext context) {
+		public DBObject toDbObject(Object value, AggregationOperationContext context) {
 
 			if (value instanceof List) {
 				if (((List) value).size() == 1) {
-					return super.toDocument(((List<Object>) value).iterator().next(), context);
+					return super.toDbObject(((List<Object>) value).iterator().next(), context);
 				}
 			}
 
-			return super.toDocument(value, context);
+			return super.toDbObject(value, context);
 		}
 	}
 
@@ -629,19 +630,19 @@ public class AccumulatorOperators {
 		}
 
 		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDocument(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDbObject(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 		 */
 		@Override
 		@SuppressWarnings("unchecked")
-		public Document toDocument(Object value, AggregationOperationContext context) {
+		public DBObject toDbObject(Object value, AggregationOperationContext context) {
 
 			if (value instanceof List) {
 				if (((List) value).size() == 1) {
-					return super.toDocument(((List<Object>) value).iterator().next(), context);
+					return super.toDbObject(((List<Object>) value).iterator().next(), context);
 				}
 			}
 
-			return super.toDocument(value, context);
+			return super.toDbObject(value, context);
 		}
 	}
 }

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

@@ -17,23 +17,31 @@ package org.springframework.data.mongodb.core.aggregation;
 
 import static org.springframework.data.mongodb.core.aggregation.Fields.*;
 
+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.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.
@@ -45,7 +53,6 @@ import org.springframework.util.Assert;
  * @author Alessio Fachechi
  * @author Christoph Strobl
  * @author Nikolay Bogdanov
- * @author Gustavo de Geus
  * @since 1.3
  */
 public class Aggregation {
@@ -343,7 +350,7 @@ public class Aggregation {
 	 * @return
 	 */
 	public static SortOperation sort(Direction direction, String... fields) {
-		return new SortOperation(Sort.by(direction, fields));
+		return new SortOperation(new Sort(direction, fields));
 	}
 
 	/**
@@ -377,17 +384,6 @@ public class Aggregation {
 		return new LimitOperation(maxElements);
 	}
 
-	/**
-	 * Creates a new {@link SampleOperation} to select the specified number of documents from its input randomly.
-	 *
-	 * @param sampleSize must not be less than zero.
-	 * @return
-	 * @since 2.0
-	 */
-	public static SampleOperation sample(long sampleSize) {
-		return new SampleOperation(sampleSize);
-	}
-
 	/**
 	 * Creates a new {@link MatchOperation} using the given {@link Criteria}.
 	 *
@@ -574,16 +570,16 @@ public class Aggregation {
 	}
 
 	/**
-	 * 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);
+		List<DBObject> operationDocuments = AggregationOperationRenderer.toDBObject(operations, rootContext);
 
-		Document command = new Document("aggregate", inputCollectionName);
+		DBObject command = new BasicDBObject("aggregate", inputCollectionName);
 		command.put("pipeline", operationDocuments);
 
 		command = options.applyAndReturnPotentiallyChangedCommand(command);
@@ -591,13 +587,13 @@ public class Aggregation {
 		return command;
 	}
 
-	/*
+	/* 
 	 * (non-Javadoc)
 	 * @see java.lang.Object#toString()
 	 */
 	@Override
 	public String toString() {
-		return SerializationUtils.serializeToJsonSafely(toDocument("__collection__", DEFAULT_CONTEXT));
+		return SerializationUtils.serializeToJsonSafely(toDbObject("__collection__", DEFAULT_CONTEXT));
 	}
 
 	/**

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

@@ -15,7 +15,7 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import org.bson.Document;
+import com.mongodb.DBObject;
 
 /**
  * An {@link AggregationExpression} can be used with field expressions in aggregation pipeline stages like
@@ -28,11 +28,11 @@ import org.bson.Document;
 public interface AggregationExpression {
 
 	/**
-	 * Turns the {@link AggregationExpression} into a {@link Document} within the given
+	 * Turns the {@link AggregationExpression} into a {@link DBObject} within the given
 	 * {@link AggregationOperationContext}.
 	 *
 	 * @param context
 	 * @return
 	 */
-	Document toDocument(AggregationOperationContext context);
+	DBObject toDbObject(AggregationOperationContext context);
 }

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

@@ -19,16 +19,17 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.bson.Document;
 import org.springframework.util.Assert;
 
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
 /**
  * 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.
  */
@@ -78,10 +79,10 @@ public enum AggregationFunctionExpressions {
 
 		/*
 		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.Expression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 * @see org.springframework.data.mongodb.core.aggregation.Expression#toDbObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 		 */
 		@Override
-		public Document toDocument(AggregationOperationContext context) {
+		public DBObject toDbObject(AggregationOperationContext context) {
 
 			List<Object> args = new ArrayList<Object>(values.size());
 
@@ -89,13 +90,13 @@ public enum AggregationFunctionExpressions {
 				args.add(unpack(value, context));
 			}
 
-			return new Document("$" + name, args);
+			return new BasicDBObject("$" + name, args);
 		}
 
 		private static Object unpack(Object value, AggregationOperationContext context) {
 
 			if (value instanceof AggregationExpression) {
-				return ((AggregationExpression) value).toDocument(context);
+				return ((AggregationExpression) value).toDbObject(context);
 			}
 
 			if (value instanceof Field) {

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

@@ -18,15 +18,16 @@ 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;
 
+import com.mongodb.DBObject;
+
 /**
- * Rendering support for {@link AggregationOperation} into a {@link List} of {@link org.bson.Document}.
+ * Rendering support for {@link AggregationOperation} into a {@link List} of {@link com.mongodb.DBObject}.
  *
  * @author Mark Paluch
  * @author Christoph Strobl
@@ -38,21 +39,21 @@ class AggregationOperationRenderer {
 
 	/**
 	 * Render a {@link List} of {@link AggregationOperation} given {@link AggregationOperationContext} into their
-	 * {@link Document} representation.
+	 * {@link DBObject} representation.
 	 *
 	 * @param operations must not be {@literal null}.
 	 * @param context must not be {@literal null}.
-	 * @return the {@link List} of {@link Document}.
+	 * @return the {@link List} of {@link DBObject}.
 	 */
-	static List<Document> toDocument(List<AggregationOperation> operations, AggregationOperationContext rootContext) {
+	static List<DBObject> toDBObject(List<AggregationOperation> operations, AggregationOperationContext rootContext) {
 
-		List<Document> operationDocuments = new ArrayList<Document>(operations.size());
+		List<DBObject> operationDocuments = new ArrayList<DBObject>(operations.size());
 
 		AggregationOperationContext contextToUse = rootContext;
 
 		for (AggregationOperation operation : operations) {
 
-			operationDocuments.add(operation.toDocument(contextToUse));
+			operationDocuments.add(operation.toDBObject(contextToUse));
 
 			if (operation instanceof FieldsExposingAggregationOperation) {
 
@@ -80,11 +81,11 @@ class AggregationOperationRenderer {
 
 		/*
 		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(org.bson.Document)
+		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(com.mongodb.DBObject)
 		 */
 		@Override
-		public Document getMappedObject(Document document) {
-			return document;
+		public DBObject getMappedObject(DBObject dbObject) {
+			return dbObject;
 		}
 
 		/*

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 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,105 +15,48 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import java.util.Optional;
-
-import org.bson.Document;
-import org.springframework.data.mongodb.core.Collation;
-import org.springframework.util.Assert;
-
+import com.mongodb.BasicDBObject;
 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 static final String COLLATION = "collation";
 
 	private final boolean allowDiskUse;
 	private final boolean explain;
-	private final Optional<Document> cursor;
-	private final Optional<Collation> collation;
+	private final DBObject 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, explain, cursor, null);
-	}
-
-	/**
-	 * 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 (such as {@code batchSize}) to the
-	 *          aggregation.
-	 * @param collation collation for string comparison. Can be {@literal null}.
-	 * @since 2.0
-	 */
-	public AggregationOptions(boolean allowDiskUse, boolean explain, Document cursor, Collation collation) {
+	public AggregationOptions(boolean allowDiskUse, boolean explain, DBObject cursor) {
 
 		this.allowDiskUse = allowDiskUse;
 		this.explain = explain;
-		this.cursor = Optional.ofNullable(cursor);
-		this.collation = Optional.ofNullable(collation);
-	}
-
-	/**
-	 * 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), null);
-	}
-
-	/**
-	 * 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 = document.getBoolean(ALLOW_DISK_USE, false);
-		boolean explain = document.getBoolean(EXPLAIN, false);
-		Document cursor = document.get(CURSOR, Document.class);
-		Collation collation = document.containsKey(COLLATION) ? Collation.from(document.get(COLLATION, Document.class))
-				: null;
-
-		return new AggregationOptions(allowDiskUse, explain, cursor, collation);
+		this.cursor = 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() {
@@ -122,92 +65,61 @@ public class AggregationOptions {
 
 	/**
 	 * 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.filter(val -> val.containsKey(BATCH_SIZE)).isPresent()) {
-			return cursor.get().get(BATCH_SIZE, Integer.class);
-		}
-
-		return null;
-	}
-
 	/**
 	 * Specify a document that contains options that control the creation of the cursor object.
-	 *
+	 * 
 	 * @return
 	 */
-	public Optional<Document> getCursor() {
+	public DBObject getCursor() {
 		return cursor;
 	}
 
-	/**
-	 * Get collation settings for string comparison.
-	 *
-	 * @return
-	 * @since 2.0
-	 */
-	public Optional<Collation> getCollation() {
-		return collation;
-	}
-
 	/**
 	 * 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) {
+	DBObject applyAndReturnPotentiallyChangedCommand(DBObject command) {
 
-		Document result = new Document(command);
+		DBObject result = new BasicDBObject(command.toMap());
 
-		if (allowDiskUse && !result.containsKey(ALLOW_DISK_USE)) {
+		if (allowDiskUse && !result.containsField(ALLOW_DISK_USE)) {
 			result.put(ALLOW_DISK_USE, allowDiskUse);
 		}
 
-		if (explain && !result.containsKey(EXPLAIN)) {
+		if (explain && !result.containsField(EXPLAIN)) {
 			result.put(EXPLAIN, explain);
 		}
 
-		if (!result.containsKey(CURSOR)) {
-			cursor.ifPresent(val -> result.put(CURSOR, val));
-		}
-
-		if (!result.containsKey(COLLATION)) {
-			collation.map(Collation::toDocument).ifPresent(val -> result.append(COLLATION, val));
+		if (cursor != null && !result.containsField(CURSOR)) {
+			result.put("cursor", cursor);
 		}
 
 		return result;
 	}
 
 	/**
-	 * Returns a {@link Document} representation of this {@link AggregationOptions}.
-	 *
+	 * Returns a {@link DBObject} representation of this {@link AggregationOptions}.
+	 * 
 	 * @return
 	 */
-	public Document toDocument() {
+	public DBObject toDbObject() {
 
-		Document document = new Document();
-		document.put(ALLOW_DISK_USE, allowDiskUse);
-		document.put(EXPLAIN, explain);
+		DBObject dbo = new BasicDBObject();
+		dbo.put(ALLOW_DISK_USE, allowDiskUse);
+		dbo.put(EXPLAIN, explain);
+		dbo.put(CURSOR, cursor);
 
-		cursor.ifPresent(val -> document.put(CURSOR, val));
-		collation.ifPresent(val -> document.append(COLLATION, val.toDocument()));
-
-		return document;
+		return dbo;
 	}
 
 	/* (non-Javadoc)
@@ -215,29 +127,23 @@ public class AggregationOptions {
 	 */
 	@Override
 	public String toString() {
-		return toDocument().toJson();
-	}
-
-	static Document createCursor(int cursorBatchSize) {
-		return new Document("batchSize", cursorBatchSize);
+		return toDbObject().toString();
 	}
 
 	/**
 	 * A Builder for {@link AggregationOptions}.
-	 *
+	 * 
 	 * @author Thomas Darimont
-	 * @author Mark Paluch
 	 */
 	public static class Builder {
 
 		private boolean allowDiskUse;
 		private boolean explain;
-		private Document cursor;
-		private Collation collation;
+		private DBObject cursor;
 
 		/**
 		 * Defines whether to off-load intensive sort-operations to disk.
-		 *
+		 * 
 		 * @param allowDiskUse
 		 * @return
 		 */
@@ -249,7 +155,7 @@ public class AggregationOptions {
 
 		/**
 		 * Defines whether to get the execution plan for the aggregation instead of the actual results.
-		 *
+		 * 
 		 * @param explain
 		 * @return
 		 */
@@ -261,48 +167,23 @@ public class AggregationOptions {
 
 		/**
 		 * Additional options to the aggregation.
-		 *
+		 * 
 		 * @param cursor
 		 * @return
 		 */
-		public Builder cursor(Document cursor) {
+		public Builder cursor(DBObject 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;
-		}
-
-		/**
-		 * Define collation settings for string comparison.
-		 *
-		 * @param collation can be {@literal null}.
-		 * @return
-		 */
-		public Builder collation(Collation collation) {
-
-			this.collation = collation;
-			return this;
-		}
-
 		/**
 		 * Returns a new {@link AggregationOptions} instance with the given configuration.
-		 *
+		 * 
 		 * @return
 		 */
 		public AggregationOptions build() {
-			return new AggregationOptions(allowDiskUse, explain, cursor, collation);
+			return new AggregationOptions(allowDiskUse, explain, cursor);
 		}
 	}
 }

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

@@ -19,16 +19,16 @@ 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
@@ -36,7 +36,7 @@ import org.springframework.util.Assert;
 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,7 +45,7 @@ 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!");
@@ -98,7 +98,7 @@ public class AggregationResults<T> implements Iterable<T> {
 	 * @return
 	 * @since 1.6
 	 */
-	public Document getRawResults() {
+	public DBObject getRawResults() {
 		return rawResults;
 	}
 

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

@@ -15,9 +15,10 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import org.bson.Document;
 import org.springframework.util.Assert;
 
+import com.mongodb.DBObject;
+
 /**
  * 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
@@ -64,10 +65,10 @@ public class AggregationSpELExpression implements AggregationExpression {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDbObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 	 */
 	@Override
-	public Document toDocument(AggregationOperationContext context) {
-		return (Document) TRANSFORMER.transform(rawExpression, context, parameters);
+	public DBObject toDbObject(AggregationOperationContext context) {
+		return (DBObject) TRANSFORMER.transform(rawExpression, context, parameters);
 	}
 }

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

@@ -1,48 +0,0 @@
-/*
- * Copyright 2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.aggregation;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.data.domain.Range;
-import org.springframework.util.Assert;
-
-/**
- * Utility methods for aggregation operation implementations.
- * 
- * @author Oliver Gierke
- */
-interface AggregationUtils {
-
-	/**
-	 * Converts the given {@link Range} into an array of values.
-	 * 
-	 * @param range must not be {@literal null}.
-	 * @return
-	 */
-	public static List<Long> toRangeValues(Range<Long> range) {
-
-		Assert.notNull(range, "Range must not be null!");
-
-		List<Long> result = new ArrayList<Long>(2);
-		result.add(range.getLowerBound().getValue()
-				.orElseThrow(() -> new IllegalArgumentException("Lower bound of range must be bounded!")));
-		range.getUpperBound().getValue().ifPresent(it -> result.add(it));
-
-		return result;
-	}
-}

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

@@ -20,13 +20,15 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import org.bson.Document;
 import org.springframework.data.domain.Range;
 import org.springframework.data.mongodb.core.aggregation.ArrayOperators.Filter.AsBuilder;
 import org.springframework.data.mongodb.core.aggregation.ArrayOperators.Reduce.PropertyExpression;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
 import org.springframework.util.Assert;
 
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
 /**
  * Gateway to {@literal array} aggregation operations.
  *
@@ -217,8 +219,8 @@ public class ArrayOperators {
 		}
 
 		/**
-		 * Start creating new {@link AggregationExpression} that applies an {@link AggregationExpression} to each element in
-		 * an array and combines them into a single value.
+		 * Start creating new {@link AggregationExpression} that applies an {@link AggregationExpression} to each element
+		 * in an array and combines them into a single value.
 		 *
 		 * @param expression must not be {@literal null}.
 		 * @return
@@ -235,8 +237,8 @@ public class ArrayOperators {
 		}
 
 		/**
-		 * Start creating new {@link AggregationExpression} that applies an {@link AggregationExpression} to each element in
-		 * an array and combines them into a single value.
+		 * Start creating new {@link AggregationExpression} that applies an {@link AggregationExpression} to each element
+		 * in an array and combines them into a single value.
 		 *
 		 * @param expressions
 		 * @return
@@ -460,25 +462,25 @@ public class ArrayOperators {
 
 		/*
 		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDbObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 		 */
 		@Override
-		public Document toDocument(final AggregationOperationContext context) {
+		public DBObject toDbObject(final AggregationOperationContext context) {
 			return toFilter(ExposedFields.from(as), context);
 		}
 
-		private Document toFilter(ExposedFields exposedFields, AggregationOperationContext context) {
+		private DBObject toFilter(ExposedFields exposedFields, AggregationOperationContext context) {
 
-			Document filterExpression = new Document();
+			DBObject filterExpression = new BasicDBObject();
 			InheritingExposedFieldsAggregationOperationContext operationContext = new InheritingExposedFieldsAggregationOperationContext(
 					exposedFields, context);
 
-			filterExpression.putAll(context.getMappedObject(new Document("input", getMappedInput(context))));
+			filterExpression.putAll(context.getMappedObject(new BasicDBObject("input", getMappedInput(context))));
 			filterExpression.put("as", as.getTarget());
 
-			filterExpression.putAll(context.getMappedObject(new Document("cond", getMappedCondition(operationContext))));
+			filterExpression.putAll(context.getMappedObject(new BasicDBObject("cond", getMappedCondition(operationContext))));
 
-			return new Document("$filter", filterExpression);
+			return new BasicDBObject("$filter", filterExpression);
 		}
 
 		private Object getMappedInput(AggregationOperationContext context) {
@@ -493,7 +495,7 @@ public class ArrayOperators {
 
 			NestedDelegatingExpressionAggregationOperationContext nea = new NestedDelegatingExpressionAggregationOperationContext(
 					context);
-			return ((AggregationExpression) condition).toDocument(nea);
+			return ((AggregationExpression) condition).toDbObject(nea);
 		}
 
 		/**
@@ -559,7 +561,7 @@ public class ArrayOperators {
 			 * @param expression must not be {@literal null}.
 			 * @return
 			 */
-			Filter by(Document expression);
+			Filter by(DBObject expression);
 		}
 
 		/**
@@ -575,7 +577,7 @@ public class ArrayOperators {
 
 			/**
 			 * Creates new {@link InputBuilder}.
-			 *
+			 * 
 			 * @return
 			 */
 			public static InputBuilder newBuilder() {
@@ -644,10 +646,10 @@ public class ArrayOperators {
 
 			/*
 			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ArrayOperators.Filter.ConditionBuilder#by(org.bson.Document)
+			 * @see org.springframework.data.mongodb.core.aggregation.ArrayOperators.Filter.ConditionBuilder#by(com.mongodb.DBObject)
 			 */
 			@Override
-			public Filter by(Document expression) {
+			public Filter by(DBObject expression) {
 
 				Assert.notNull(expression, "Expression must not be null!");
 				filter.condition = expression;
@@ -849,7 +851,16 @@ public class ArrayOperators {
 		}
 
 		public IndexOfArray within(Range<Long> range) {
-			return new IndexOfArray(append(AggregationUtils.toRangeValues(range)));
+
+			Assert.notNull(range, "Range must not be null!");
+
+			List<Long> rangeValues = new ArrayList<Long>(2);
+			rangeValues.add(range.getLowerBound());
+			if (range.getUpperBound() != null) {
+				rangeValues.add(range.getUpperBound());
+			}
+
+			return new IndexOfArray(append(rangeValues));
 		}
 
 		/**
@@ -1023,41 +1034,41 @@ public class ArrayOperators {
 		}
 
 		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDbObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 		 */
 		@Override
-		public Document toDocument(AggregationOperationContext context) {
+		public DBObject toDbObject(AggregationOperationContext context) {
 
-			Document document = new Document();
+			DBObject dbo = new BasicDBObject();
 
-			document.put("input", getMappedValue(input, context));
-			document.put("initialValue", getMappedValue(initialValue, context));
+			dbo.put("input", getMappedValue(input, context));
+			dbo.put("initialValue", getMappedValue(initialValue, context));
 
 			if (reduceExpressions.iterator().next() instanceof PropertyExpression) {
 
-				Document properties = new Document();
+				DBObject properties = new BasicDBObject();
 				for (AggregationExpression e : reduceExpressions) {
-					properties.putAll(e.toDocument(context));
+					properties.putAll(e.toDbObject(context));
 				}
-				document.put("in", properties);
+				dbo.put("in", properties);
 			} else {
-				document.put("in", (reduceExpressions.iterator().next()).toDocument(context));
+				dbo.put("in", (reduceExpressions.iterator().next()).toDbObject(context));
 			}
 
-			return new Document("$reduce", document);
+			return new BasicDBObject("$reduce", dbo);
 		}
 
 		private Object getMappedValue(Object value, AggregationOperationContext context) {
 
-			if (value instanceof Document) {
+			if (value instanceof DBObject) {
 				return value;
 			}
 			if (value instanceof AggregationExpression) {
-				return ((AggregationExpression) value).toDocument(context);
+				return ((AggregationExpression) value).toDbObject(context);
 			} else if (value instanceof Field) {
 				return context.getReference(((Field) value)).toString();
 			} else {
-				return context.getMappedObject(new Document("###val###", value)).get("###val###");
+				return context.getMappedObject(new BasicDBObject("###val###", value)).get("###val###");
 			}
 		}
 
@@ -1214,11 +1225,11 @@ public class ArrayOperators {
 			}
 
 			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+			 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDbObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 			 */
 			@Override
-			public Document toDocument(AggregationOperationContext context) {
-				return new Document(propertyName, aggregationExpression.toDocument(context));
+			public DBObject toDbObject(AggregationOperationContext context) {
+				return new BasicDBObject(propertyName, aggregationExpression.toDbObject(context));
 			}
 
 			/**
@@ -1398,7 +1409,7 @@ public class ArrayOperators {
 		public Zip defaultTo(Object[] array) {
 
 			Assert.notNull(array, "Array must not be null!");
-			return new Zip(append("defaults", Arrays.asList(array)));
+			return new Zip(append("defaults", array));
 		}
 
 		public static class ZipBuilder {

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

@@ -19,7 +19,8 @@ import org.springframework.data.mongodb.core.aggregation.BucketAutoOperation.Buc
 import org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OutputBuilder;
 import org.springframework.util.Assert;
 
-import org.bson.Document;
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
 
 /**
  * Encapsulates the aggregation framework {@code $bucketAuto}-operation. <br />
@@ -91,22 +92,21 @@ public class BucketAutoOperation extends BucketOperationSupport<BucketAutoOperat
 	}
 
 	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 	 */
 	@Override
-	public Document toDocument(AggregationOperationContext context) {
+	public DBObject toDBObject(AggregationOperationContext context) {
 
-		Document options = new Document();
+		DBObject options = new BasicDBObject();
 
 		options.put("buckets", buckets);
+		options.putAll(super.toDBObject(context));
 
 		if (granularity != null) {
 			options.put("granularity", granularity);
 		}
 
-		options.putAll(super.toDocument(context));
-
-		return new Document("$bucketAuto", options);
+		return new BasicDBObject("$bucketAuto", options);
 	}
 
 	/**

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

@@ -23,7 +23,8 @@ import java.util.List;
 import org.springframework.data.mongodb.core.aggregation.BucketOperation.BucketOperationOutputBuilder;
 import org.springframework.util.Assert;
 
-import org.bson.Document;
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
 
 /**
  * Encapsulates the aggregation framework {@code $bucket}-operation. <br />
@@ -88,22 +89,22 @@ public class BucketOperation extends BucketOperationSupport<BucketOperation, Buc
 	}
 
 	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 	 */
 	@Override
-	public Document toDocument(AggregationOperationContext context) {
+	public DBObject toDBObject(AggregationOperationContext context) {
 
-		Document options = new Document();
+		DBObject options = new BasicDBObject();
 
-		options.put("boundaries", context.getMappedObject(new Document("$set", boundaries)).get("$set"));
+		options.put("boundaries", context.getMappedObject(new BasicDBObject("$set", boundaries)).get("$set"));
 
 		if (defaultBucket != null) {
-			options.put("default", context.getMappedObject(new Document("$set", defaultBucket)).get("$set"));
+			options.put("default", context.getMappedObject(new BasicDBObject("$set", defaultBucket)).get("$set"));
 		}
 
-		options.putAll(super.toDocument(context));
+		options.putAll(super.toDBObject(context));
 
-		return new Document("$bucket", options);
+		return new BasicDBObject("$bucket", options);
 	}
 
 	/**