Release version 1.0.1.RELEASE.

MappingMongoConverter now rejects objects that would result in field keys containing a dot as we cannot reliably escape and unescape them without potentially wrecking correct keys on reading. However I added a property mapKeyReplacement that can be set to e.g. ~ to have all dots in map keys replaced with ~. This will of course cause ~ to be transformed into dots when reading. If further customization is necessary override potentiallyEscapeMapKey(…) and potentiallyUnescapeMapKey(…).

README.md

@@ -1,22 +1,16 @@
-Spring Data MongoDB
+Spring Data - Document
 ======================
 
 The primary goal of the [Spring Data](http://www.springsource.org/spring-data) project is to make it easier to build Spring-powered applications that use new data access technologies such as non-relational databases, map-reduce frameworks, and cloud based data services.
-
-The Spring Data MongoDB aims to provide a familiar and consistent Spring-based programming model for for new datastores while retaining store-specific features and capabilities. The Spring Data MongoDB project provides integration with the MongoDB document database. Key functional areas of Spring Data MongoDB are a POJO centric model for interacting with a MongoDB DBCollection and easily writing a Repository style data access layer
+As the name implies, the **Document** modules provides integration with document databases such as [MongoDB](http://www.mongodb.org/) and [CouchDB](http://couchdb.apache.org/).
 
 Getting Help
 ------------
 
-For a comprehensive treatmet of all the Spring Data MongoDB features, please refer to the The [User Guide](http://static.springsource.org/spring-data/data-mongodb/docs/current/reference/html/) 
+At this point your best bet is to look at the Look at the [JavaDocs](http://static.springsource.org/spring-data/data-document/docs/1.0.0.BUILD-SNAPSHOT/spring-data-mongodb/apidocs/) for MongoDB integration and corresponding and source code. For more detailed questions, use the [forum](http://forum.springsource.org/forumdisplay.php?f=80). If you are new to Spring as well as to Spring Data, look for information about [Spring projects](http://www.springsource.org/projects). 
 
-The [JavaDocs](http://static.springsource.org/spring-data/data-mongodb/docs/current/api/) have extensive comments in them as well.
+The [User Guide](http://static.springsource.org/spring-data/data-document/docs/1.0.0.BUILD-SNAPSHOT/reference/html/) (A work in progress). 
 
-The home page of [Spring Data MongoDB](http://www.springsource.org/spring-data/mongodb) contains links to articles and other resources.
-
-For more detailed questions, use the [forum](http://forum.springsource.org/forumdisplay.php?f=80). 
-
-If you are new to Spring as well as to Spring Data, look for information about [Spring projects](http://www.springsource.org/projects). 
 
 
 Quick Start
@@ -143,6 +137,11 @@ This will register an object in the container named PersonRepository.  You can u
     }
 
 
+## CouchDB
+
+TBD
+
+
 Contributing to Spring Data
 ---------------------------
 

etc/formatting.xml

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

pom.xml

@@ -6,7 +6,7 @@
   <name>Spring Data MongoDB Distribution</name>
   <description>Spring Data project for MongoDB</description>
   <url>http://www.springsource.org/spring-data/mongodb</url>
-  <version>1.1.3.BUILD-SNAPSHOT</version>
+  <version>1.0.1.RELEASE</version>
   <packaging>pom</packaging>
   <modules>
     <module>spring-data-mongodb</module>
@@ -15,7 +15,18 @@
     <module>spring-data-mongodb-parent</module>
   </modules>
 
-  <developers>
+   <developers>
+    <developer>
+      <id>ogierke</id>
+      <name>Oliver Gierke</name>
+      <email>ogierke at vmware.com</email>
+      <organization>SpringSource</organization>
+      <organizationUrl>http://www.springsource.com</organizationUrl>
+      <roles>
+        <role>Project lead</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
     <developer>
       <id>trisberg</id>
       <name>Thomas Risberg</name>
@@ -40,17 +51,6 @@
       </roles>
       <timezone>-5</timezone>
     </developer>
-    <developer>
-      <id>ogierke</id>
-      <name>Oliver Gierke</name>
-      <email>ogierke at vmware.com</email>
-      <organization>SpringSource</organization>
-      <organizationUrl>http://www.springsource.com</organizationUrl>
-      <roles>
-        <role>Developer</role>
-      </roles>
-      <timezone>+1</timezone>
-    </developer>
     <developer>
       <id>jbrisbin</id>
       <name>Jon Brisbin</name>
@@ -151,7 +151,7 @@
           <entities>
             <entity>
               <name>version</name>
-              <value>${project.version}</value>
+              <value>${pom.version}</value>
             </entity>
           </entities>
           <postProcess>
@@ -262,10 +262,16 @@
   </build>
 
   <pluginRepositories>
-    <!-- Necessary for the build extension -->
     <pluginRepository>
-      <id>spring-plugins-release</id>
-      <url>http://repo.springsource.org/plugins-release</url>
+      <!-- necessary for bundlor and utils -->
+      <id>repository.plugin.springsource.release</id>
+      <name>SpringSource Maven Repository</name>
+      <url>http://repository.springsource.com/maven/bundles/release</url>
+    </pluginRepository>
+    <pluginRepository>
+      <id>spring-libs-release</id>
+      <name>Spring Framework Maven Release Repository</name>
+      <url>http://repo.springsource.org/libs-release</url>
     </pluginRepository>
   </pluginRepositories>
 
@@ -279,9 +285,9 @@
       </url>
     </site>
     <repository>
-      <id>spring-milestone</id>
-      <name>Spring Milestone Repository</name>
-      <url>s3://maven.springframework.org/milestone</url>
+      <id>spring-release</id>
+      <name>Spring Release Repository</name>
+      <url>s3://maven.springframework.org/release</url>
     </repository>
     <snapshotRepository>
       <id>spring-snapshot</id>
@@ -289,9 +295,7 @@
       <url>s3://maven.springframework.org/snapshot</url>
     </snapshotRepository>
   </distributionManagement>
-
   <scm>
     <url>https://github.com/SpringSource/spring-data-mongodb</url>
   </scm>
-
 </project>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.springframework.data</groupId>
     <artifactId>spring-data-mongodb-parent</artifactId>
-    <version>1.1.3.BUILD-SNAPSHOT</version>
+    <version>1.0.1.RELEASE</version>
     <relativePath>../spring-data-mongodb-parent/pom.xml</relativePath>
   </parent>
   <artifactId>spring-data-mongodb-cross-store</artifactId>
@@ -15,12 +15,10 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>${org.springframework.version.range}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
-      <version>${org.springframework.version.range}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -30,19 +28,82 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-orm</artifactId>
-      <version>${org.springframework.version.range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <scope>test</scope>
     </dependency>
 
     <!--  Spring Data -->
     <dependency>
       <groupId>org.springframework.data</groupId>
       <artifactId>spring-data-commons-core</artifactId>
-      <version>${data.commons.version}</version>
     </dependency>
+    <!-- <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-commons-aspects</artifactId>
+    </dependency> -->
     <dependency>
       <groupId>org.springframework.data</groupId>
       <artifactId>spring-data-mongodb</artifactId>
-      <version>1.1.3.BUILD-SNAPSHOT</version>
+    </dependency>
+
+
+    <!-- Logging -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.mail</groupId>
+          <artifactId>mail</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.jms</groupId>
+          <artifactId>jms</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.sun.jdmk</groupId>
+          <artifactId>jmxtools</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.sun.jmx</groupId>
+          <artifactId>jmxri</artifactId>
+        </exclusion>
+      </exclusions>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>jsr250-api</artifactId>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
     </dependency>
 
     <dependency>

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

@@ -58,8 +58,10 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 		this.entityManagerFactory = entityManagerFactory;
 	}
 
-	public void getPersistentState(Class<? extends ChangeSetBacked> entityClass, Object id, final ChangeSet changeSet)
-			throws DataAccessException, NotFoundException {
+
+	public void getPersistentState(Class<? extends ChangeSetBacked> entityClass,
+			Object id, final ChangeSet changeSet)
+					throws DataAccessException, NotFoundException {
 
 		if (id == null) {
 			log.debug("Unable to load MongoDB data for null id");
@@ -75,7 +77,8 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 			log.debug("Loading MongoDB data for " + dbk);
 		}
 		mongoTemplate.execute(collName, new CollectionCallback<Object>() {
-			public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+			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()) {
@@ -84,8 +87,9 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 					if (!changeSet.getValues().containsKey(key)) {
 						String className = (String) dbo.get(ENTITY_FIELD_CLASS);
 						if (className == null) {
-							throw new DataIntegrityViolationException("Unble to convert property " + key + ": Invalid metadata, "
-									+ ENTITY_FIELD_CLASS + " not available");
+							throw new DataIntegrityViolationException(
+									"Unble to convert property " + key
+									+ ": Invalid metadata, " + ENTITY_FIELD_CLASS + " not available");
 						}
 						Class<?> clazz = ClassUtils.resolveClassName(className, ClassUtils.getDefaultClassLoader());
 						Object value = mongoTemplate.getConverter().read(clazz, dbo);
@@ -131,8 +135,10 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 				dbQuery.put(ENTITY_ID, getPersistentId(entity, cs));
 				dbQuery.put(ENTITY_CLASS, entity.getClass().getName());
 				dbQuery.put(ENTITY_FIELD_NAME, key);
-				DBObject dbId = mongoTemplate.execute(collName, new CollectionCallback<DBObject>() {
-					public DBObject doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+				DBObject dbId = mongoTemplate.execute(collName,
+						new CollectionCallback<DBObject>() {
+					public DBObject doInCollection(DBCollection collection)
+							throws MongoException, DataAccessException {
 						return collection.findOne(dbQuery);
 					}
 				});
@@ -141,12 +147,14 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 						log.debug("Flush: removing: " + dbQuery);
 					}
 					mongoTemplate.execute(collName, new CollectionCallback<Object>() {
-						public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+						public Object doInCollection(DBCollection collection)
+								throws MongoException, DataAccessException {
 							collection.remove(dbQuery);
 							return null;
 						}
 					});
-				} else {
+				}
+				else {
 					final DBObject dbDoc = new BasicDBObject();
 					dbDoc.putAll(dbQuery);
 					if (log.isDebugEnabled()) {
@@ -158,7 +166,8 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 						dbDoc.put("_id", dbId.get("_id"));
 					}
 					mongoTemplate.execute(collName, new CollectionCallback<Object>() {
-						public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+						public Object doInCollection(DBCollection collection)
+								throws MongoException, DataAccessException {
 							collection.save(dbDoc);
 							return null;
 						}

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

@@ -38,234 +38,235 @@ import org.springframework.data.crossstore.HashMapChangeSet;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 /**
- * Aspect to turn an object annotated with @Document into a persistent document using Mongo.
+ * Aspect to turn an object annotated with @Document into a persistent document
+ * using Mongo.
  * 
  * @author Thomas Risberg
  */
 public aspect MongoDocumentBacking {
 
-	private static final Log LOGGER = LogFactory.getLog(MongoDocumentBacking.class);
+  private static final Log LOGGER = LogFactory
+      .getLog(MongoDocumentBacking.class);
 
-	// Aspect shared config
-	private ChangeSetPersister<Object> changeSetPersister;
+  // Aspect shared config
+  private ChangeSetPersister<Object> changeSetPersister;
 
-	public void setChangeSetPersister(ChangeSetPersister<Object> changeSetPersister) {
-		this.changeSetPersister = changeSetPersister;
-	}
+  public void setChangeSetPersister(
+      ChangeSetPersister<Object> changeSetPersister) {
+    this.changeSetPersister = changeSetPersister;
+  }
 
-	// ITD to introduce N state to Annotated objects
-	declare parents : (@Entity *) implements DocumentBacked;
+  // ITD to introduce N state to Annotated objects
+  declare parents : (@Entity *) implements DocumentBacked;
 
-	// The annotated fields that will be persisted in MongoDB rather than with JPA
-	declare @field: @RelatedDocument * (@Entity+ *).*:@Transient;
+  // The annotated fields that will be persisted in MongoDB rather than with JPA
+  declare @field: @RelatedDocument * (@Entity+ *).*:@Transient;
 
-	// -------------------------------------------------------------------------
-	// Advise user-defined constructors of ChangeSetBacked objects to create a new
-	// backing ChangeSet
-	// -------------------------------------------------------------------------
-	pointcut arbitraryUserConstructorOfChangeSetBackedObject(DocumentBacked entity) : 
+  // -------------------------------------------------------------------------
+  // Advise user-defined constructors of ChangeSetBacked objects to create a new
+  // backing ChangeSet
+  // -------------------------------------------------------------------------
+  pointcut arbitraryUserConstructorOfChangeSetBackedObject(DocumentBacked entity) : 
 		execution((DocumentBacked+).new(..)) &&
 		!execution((DocumentBacked+).new(ChangeSet)) &&
 		this(entity);
 
-	pointcut finderConstructorOfChangeSetBackedObject(DocumentBacked entity, ChangeSet cs) : 
+  pointcut finderConstructorOfChangeSetBackedObject(DocumentBacked entity,
+      ChangeSet cs) : 
 		execution((DocumentBacked+).new(ChangeSet)) &&
 		this(entity) && 
 		args(cs);
 
-	protected pointcut entityFieldGet(DocumentBacked entity) :
+  protected pointcut entityFieldGet(DocumentBacked entity) :
         get(@RelatedDocument * DocumentBacked+.*) &&
         this(entity) &&
         !get(* DocumentBacked.*);
 
-	protected pointcut entityFieldSet(DocumentBacked entity, Object newVal) :
+  protected pointcut entityFieldSet(DocumentBacked entity, Object newVal) :
         set(@RelatedDocument * DocumentBacked+.*) &&
         this(entity) &&
         args(newVal) &&
         !set(* DocumentBacked.*);
 
-	// intercept EntityManager.merge calls
-	public pointcut entityManagerMerge(EntityManager em, Object entity) : 
+  // intercept EntityManager.merge calls
+  public pointcut entityManagerMerge(EntityManager em, Object entity) : 
     call(* EntityManager.merge(Object)) &&
     target(em) &&
     args(entity);
+  
+  // intercept EntityManager.remove calls
+//  public pointcut entityManagerRemove(EntityManager em, Object entity) : 
+//    call(* EntityManager.remove(Object)) &&
+//    target(em) &&
+//    args(entity);
 
-	// intercept EntityManager.remove calls
-	// public pointcut entityManagerRemove(EntityManager em, Object entity) :
-	// call(* EntityManager.remove(Object)) &&
-	// target(em) &&
-	// args(entity);
+  // move changeSet from detached entity to the newly merged persistent object
+  Object around(EntityManager em, Object entity) : entityManagerMerge(em, entity) {
+    Object mergedEntity = proceed(em, entity);
+    if (entity instanceof DocumentBacked && mergedEntity instanceof DocumentBacked) {
+      ((DocumentBacked)mergedEntity).changeSet = ((DocumentBacked)entity).getChangeSet();
+    }
+    return mergedEntity;
+  }
 
-	// move changeSet from detached entity to the newly merged persistent object
-	Object around(EntityManager em, Object entity) : entityManagerMerge(em, entity) {
-		Object mergedEntity = proceed(em, entity);
-		if (entity instanceof DocumentBacked && mergedEntity instanceof DocumentBacked) {
-			((DocumentBacked) mergedEntity).changeSet = ((DocumentBacked) entity).getChangeSet();
-		}
-		return mergedEntity;
+  // clear changeSet from removed entity
+//  Object around(EntityManager em, Object entity) : entityManagerRemove(em, entity) {
+//    if (entity instanceof DocumentBacked) {
+//      removeChangeSetValues((DocumentBacked)entity);
+//    }
+//    return proceed(em, entity);
+//  }
+
+  private static void removeChangeSetValues(DocumentBacked entity) {
+    LOGGER.debug("Removing all change-set values for " + entity);	
+	ChangeSet nulledCs = new HashMapChangeSet();
+	DocumentBacked documentEntity = (DocumentBacked) entity;
+	@SuppressWarnings("unchecked")
+	ChangeSetPersister<Object> changeSetPersister = (ChangeSetPersister<Object>)documentEntity.itdChangeSetPersister;
+	try {
+        changeSetPersister.getPersistentState(
+            documentEntity.getClass(),
+            documentEntity.get_persistent_id(), 
+            documentEntity.getChangeSet());
+	} 
+	catch (DataAccessException e) {} 
+	catch (NotFoundException e) {}
+	for (String key :entity.getChangeSet().getValues().keySet()) {
+        nulledCs.set(key, null);
 	}
+	entity.setChangeSet(nulledCs);
+  }
 
-	// clear changeSet from removed entity
-	// Object around(EntityManager em, Object entity) : entityManagerRemove(em, entity) {
-	// if (entity instanceof DocumentBacked) {
-	// removeChangeSetValues((DocumentBacked)entity);
-	// }
-	// return proceed(em, entity);
-	// }
+  before(DocumentBacked entity) : arbitraryUserConstructorOfChangeSetBackedObject(entity) {
+    LOGGER
+        .debug("User-defined constructor called on DocumentBacked object of class "
+            + entity.getClass());
+    // Populate all ITD fields
+    entity.setChangeSet(new HashMapChangeSet());
+    entity.itdChangeSetPersister = changeSetPersister;
+    entity.itdTransactionSynchronization = 
+        new ChangeSetBackedTransactionSynchronization(changeSetPersister, entity);
+    //registerTransactionSynchronization(entity);
+  }
 
-	private static void removeChangeSetValues(DocumentBacked entity) {
-		LOGGER.debug("Removing all change-set values for " + entity);
-		ChangeSet nulledCs = new HashMapChangeSet();
-		DocumentBacked documentEntity = (DocumentBacked) entity;
-		@SuppressWarnings("unchecked")
-		ChangeSetPersister<Object> changeSetPersister = (ChangeSetPersister<Object>) documentEntity.itdChangeSetPersister;
-		try {
-			changeSetPersister.getPersistentState(documentEntity.getClass(), documentEntity.get_persistent_id(),
-					documentEntity.getChangeSet());
-		} catch (DataAccessException e) {
-		} catch (NotFoundException e) {
-		}
-		for (String key : entity.getChangeSet().getValues().keySet()) {
-			nulledCs.set(key, null);
-		}
-		entity.setChangeSet(nulledCs);
-	}
+  private static void registerTransactionSynchronization(DocumentBacked entity) {
+    if (TransactionSynchronizationManager.isSynchronizationActive()) {
+      if (!TransactionSynchronizationManager.getSynchronizations().contains(entity.itdTransactionSynchronization)) {
+        if (LOGGER.isDebugEnabled()) {
+          LOGGER.debug("Adding transaction synchronization for " + entity);
+        }
+        TransactionSynchronizationManager.registerSynchronization(entity.itdTransactionSynchronization);
+      }
+      else {
+        if (LOGGER.isDebugEnabled()) {
+          LOGGER.debug("Transaction synchronization already active for " + entity);
+        }
+      }
+    }
+    else {
+      if (LOGGER.isDebugEnabled()) {
+        LOGGER.debug("Transaction synchronization is not active for " + entity);
+      }
+    }
+  }
 
-	before(DocumentBacked entity) : arbitraryUserConstructorOfChangeSetBackedObject(entity) {
-		LOGGER.debug("User-defined constructor called on DocumentBacked object of class " + entity.getClass());
-		// Populate all ITD fields
-		entity.setChangeSet(new HashMapChangeSet());
-		entity.itdChangeSetPersister = changeSetPersister;
-		entity.itdTransactionSynchronization = new ChangeSetBackedTransactionSynchronization(changeSetPersister, entity);
-		// registerTransactionSynchronization(entity);
-	}
+  // -------------------------------------------------------------------------
+  // ChangeSet-related mixins
+  // -------------------------------------------------------------------------
+  // Introduced field
+  @Transient private ChangeSet DocumentBacked.changeSet;
 
-	private static void registerTransactionSynchronization(DocumentBacked entity) {
-		if (TransactionSynchronizationManager.isSynchronizationActive()) {
-			if (!TransactionSynchronizationManager.getSynchronizations().contains(entity.itdTransactionSynchronization)) {
-				if (LOGGER.isDebugEnabled()) {
-					LOGGER.debug("Adding transaction synchronization for " + entity);
-				}
-				TransactionSynchronizationManager.registerSynchronization(entity.itdTransactionSynchronization);
-			} else {
-				if (LOGGER.isDebugEnabled()) {
-					LOGGER.debug("Transaction synchronization already active for " + entity);
-				}
-			}
-		} else {
-			if (LOGGER.isDebugEnabled()) {
-				LOGGER.debug("Transaction synchronization is not active for " + entity);
-			}
-		}
-	}
+  @Transient private ChangeSetPersister<?> DocumentBacked.itdChangeSetPersister;
 
-	// -------------------------------------------------------------------------
-	// ChangeSet-related mixins
-	// -------------------------------------------------------------------------
-	// Introduced field
-	@Transient
-	private ChangeSet DocumentBacked.changeSet;
+  @Transient private ChangeSetBackedTransactionSynchronization DocumentBacked.itdTransactionSynchronization;
 
-	@Transient
-	private ChangeSetPersister<?> DocumentBacked.itdChangeSetPersister;
+  public void DocumentBacked.setChangeSet(ChangeSet cs) {
+    this.changeSet = cs;
+  }
 
-	@Transient
-	private ChangeSetBackedTransactionSynchronization DocumentBacked.itdTransactionSynchronization;
+  public ChangeSet DocumentBacked.getChangeSet() {
+    return changeSet;
+  }
 
-	public void DocumentBacked.setChangeSet(ChangeSet cs) {
-		this.changeSet = cs;
-	}
+  // Flush the entity state to the persistent store
+  public void DocumentBacked.flush() {
+    Object id = itdChangeSetPersister.getPersistentId(this, this.changeSet);
+    itdChangeSetPersister.persistState(this, this.changeSet);
+  }
 
-	public ChangeSet DocumentBacked.getChangeSet() {
-		return changeSet;
-	}
+  public Object DocumentBacked.get_persistent_id() {
+    return itdChangeSetPersister.getPersistentId(this, this.changeSet);
+  }
 
-	// Flush the entity state to the persistent store
-	public void DocumentBacked.flush() {
-		Object id = itdChangeSetPersister.getPersistentId(this, this.changeSet);
-		itdChangeSetPersister.persistState(this, this.changeSet);
-	}
+  // lifecycle methods
+  @javax.persistence.PostPersist public void DocumentBacked.itdPostPersist() {
+    if (LOGGER.isDebugEnabled()) {
+      LOGGER.debug("JPA lifecycle event PrePersist: " + this.getClass().getName());
+    }
+    registerTransactionSynchronization(this);
+  }
+  @javax.persistence.PreUpdate public void DocumentBacked.itdPreUpdate() {
+    if (LOGGER.isDebugEnabled()) {
+      LOGGER.debug("JPA lifecycle event PreUpdate: " + this.getClass().getName() + " :: " + this);
+    }
+    registerTransactionSynchronization(this);
+  }
+  @javax.persistence.PostUpdate public void DocumentBacked.itdPostUpdate() {
+    if (LOGGER.isDebugEnabled()) {
+      LOGGER.debug("JPA lifecycle event PostUpdate: " + this.getClass().getName() + " :: " + this);
+    }
+    registerTransactionSynchronization(this);
+  }
+  @javax.persistence.PostRemove public void DocumentBacked.itdPostRemove() {
+    if (LOGGER.isDebugEnabled()) {
+      LOGGER.debug("JPA lifecycle event PostRemove: " + this.getClass().getName() + " :: " + this);
+    }
+    registerTransactionSynchronization(this);
+    removeChangeSetValues(this);
+  }
+  @javax.persistence.PostLoad public void DocumentBacked.itdPostLoad() {
+    if (LOGGER.isDebugEnabled()) {
+      LOGGER.debug("JPA lifecycle event PostLoad: " + this.getClass().getName() + " :: " + this);
+    }
+    registerTransactionSynchronization(this);
+  }
+  
+  /**
+   * delegates field reads to the state accessors instance
+   */
+  Object around(DocumentBacked entity): entityFieldGet(entity) {
+    Field f = field(thisJoinPoint);
+    String propName = f.getName();
+    LOGGER.trace("GET " + f + " -> ChangeSet value property [" + propName
+        + "] using: " + entity.getChangeSet());
+    if (entity.getChangeSet().getValues().get(propName) == null) {
+      try {
+        this.changeSetPersister.getPersistentState(entity.getClass(),
+            entity.get_persistent_id(), entity.getChangeSet());
+      } catch (NotFoundException e) {
+      }
+    }
+    Object fValue = entity.getChangeSet().getValues().get(propName);
+    if (fValue != null) {
+      return fValue;
+    }
+    return proceed(entity);
+  }
 
-	public Object DocumentBacked.get_persistent_id() {
-		return itdChangeSetPersister.getPersistentId(this, this.changeSet);
-	}
+  /**
+   * delegates field writes to the state accessors instance
+   */
+  Object around(DocumentBacked entity, Object newVal) : entityFieldSet(entity, newVal) {
+    Field f = field(thisJoinPoint);
+    String propName = f.getName();
+    LOGGER.trace("SET " + f + " -> ChangeSet number value property [" + propName
+        + "] with value=[" + newVal + "]");
+    entity.getChangeSet().set(propName, newVal);
+    return proceed(entity, newVal);
+  }
 
-	// lifecycle methods
-	@javax.persistence.PostPersist
-	public void DocumentBacked.itdPostPersist() {
-		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("JPA lifecycle event PrePersist: " + this.getClass().getName());
-		}
-		registerTransactionSynchronization(this);
-	}
-
-	@javax.persistence.PreUpdate
-	public void DocumentBacked.itdPreUpdate() {
-		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("JPA lifecycle event PreUpdate: " + this.getClass().getName() + " :: " + this);
-		}
-		registerTransactionSynchronization(this);
-	}
-
-	@javax.persistence.PostUpdate
-	public void DocumentBacked.itdPostUpdate() {
-		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("JPA lifecycle event PostUpdate: " + this.getClass().getName() + " :: " + this);
-		}
-		registerTransactionSynchronization(this);
-	}
-
-	@javax.persistence.PostRemove
-	public void DocumentBacked.itdPostRemove() {
-		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("JPA lifecycle event PostRemove: " + this.getClass().getName() + " :: " + this);
-		}
-		registerTransactionSynchronization(this);
-		removeChangeSetValues(this);
-	}
-
-	@javax.persistence.PostLoad
-	public void DocumentBacked.itdPostLoad() {
-		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("JPA lifecycle event PostLoad: " + this.getClass().getName() + " :: " + this);
-		}
-		registerTransactionSynchronization(this);
-	}
-
-	/**
-	 * delegates field reads to the state accessors instance
-	 */
-	Object around(DocumentBacked entity): entityFieldGet(entity) {
-		Field f = field(thisJoinPoint);
-		String propName = f.getName();
-		LOGGER.trace("GET " + f + " -> ChangeSet value property [" + propName + "] using: " + entity.getChangeSet());
-		if (entity.getChangeSet().getValues().get(propName) == null) {
-			try {
-				this.changeSetPersister
-						.getPersistentState(entity.getClass(), entity.get_persistent_id(), entity.getChangeSet());
-			} catch (NotFoundException e) {
-			}
-		}
-		Object fValue = entity.getChangeSet().getValues().get(propName);
-		if (fValue != null) {
-			return fValue;
-		}
-		return proceed(entity);
-	}
-
-	/**
-	 * delegates field writes to the state accessors instance
-	 */
-	Object around(DocumentBacked entity, Object newVal) : entityFieldSet(entity, newVal) {
-		Field f = field(thisJoinPoint);
-		String propName = f.getName();
-		LOGGER.trace("SET " + f + " -> ChangeSet number value property [" + propName + "] with value=[" + newVal + "]");
-		entity.getChangeSet().set(propName, newVal);
-		return proceed(entity, newVal);
-	}
-
-	Field field(JoinPoint joinPoint) {
-		FieldSignature fieldSignature = (FieldSignature) joinPoint.getSignature();
-		return fieldSignature.getField();
-	}
+  Field field(JoinPoint joinPoint) {
+    FieldSignature fieldSignature = (FieldSignature) joinPoint.getSignature();
+    return fieldSignature.getField();
+  }
 }

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

@@ -24,6 +24,8 @@ import java.lang.annotation.Target;
  * @author Thomas Risberg
  */
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.FIELD })
+@Target({
+    ElementType.FIELD
+})
 public @interface RelatedDocument {
 }

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

@@ -90,7 +90,8 @@ public class CrossStoreMongoTests {
 		Assert.assertNotNull(found);
 		Assert.assertEquals(Long.valueOf(1), found.getId());
 		Assert.assertNotNull(found.getResume());
-		Assert.assertEquals("DiMark, DBA, 1990-2000" + "; " + "VMware, Developer, 2007-", found.getResume().getJobs());
+		Assert.assertEquals("DiMark, DBA, 1990-2000" + "; "
+				+ "VMware, Developer, 2007-", found.getResume().getJobs());
 		found.getResume().addJob("SpringDeveloper.com, Consultant, 2005-2006");
 		found.setAge(44);
 	}
@@ -105,7 +106,8 @@ public class CrossStoreMongoTests {
 		Assert.assertNotNull(found);
 		Assert.assertEquals(Long.valueOf(1), found.getId());
 		Assert.assertNotNull(found.getResume());
-		Assert.assertEquals("DiMark, DBA, 1990-2000" + "; " + "VMware, Developer, 2007-" + "; "
+		Assert.assertEquals("DiMark, DBA, 1990-2000" + "; "
+				+ "VMware, Developer, 2007-" + "; "
 				+ "SpringDeveloper.com, Consultant, 2005-2006", found.getResume().getJobs());
 	}
 

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

@@ -23,7 +23,8 @@ public class Address {
 	private String state;
 	private String zip;
 
-	public Address(Integer streetNumber, String streetName, String city, String state, String zip) {
+	public Address(Integer streetNumber, String streetName, String city,
+			String state, String zip) {
 		super();
 		this.streetNumber = streetNumber;
 		this.streetName = streetName;
@@ -35,41 +36,34 @@ public class Address {
 	public Integer getStreetNumber() {
 		return streetNumber;
 	}
-
 	public void setStreetNumber(Integer streetNumber) {
 		this.streetNumber = streetNumber;
 	}
-
 	public String getStreetName() {
 		return streetName;
 	}
-
 	public void setStreetName(String streetName) {
 		this.streetName = streetName;
 	}
-
 	public String getCity() {
 		return city;
 	}
-
 	public void setCity(String city) {
 		this.city = city;
 	}
-
 	public String getState() {
 		return state;
 	}
-
 	public void setState(String state) {
 		this.state = state;
 	}
-
 	public String getZip() {
 		return zip;
 	}
-
 	public void setZip(String zip) {
 		this.zip = zip;
 	}
 
+
+
 }

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

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

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

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

spring-data-mongodb-log4j/pom.xml

@@ -4,14 +4,14 @@
   <parent>
     <groupId>org.springframework.data</groupId>
     <artifactId>spring-data-mongodb-parent</artifactId>
-    <version>1.1.3.BUILD-SNAPSHOT</version>
+    <version>1.0.1.RELEASE</version>
     <relativePath>../spring-data-mongodb-parent/pom.xml</relativePath>
   </parent>
   <artifactId>spring-data-mongodb-log4j</artifactId>
   <name>Spring Data MongoDB Log4J Appender</name>
 
   <properties>
-    <log4j.version>1.2.16</log4j.version>
+    <mongo.version>2.3</mongo.version>
   </properties>
 
   <dependencies>
@@ -27,7 +27,45 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>${log4j.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.mail</groupId>
+          <artifactId>mail</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.jms</groupId>
+          <artifactId>jms</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.sun.jdmk</groupId>
+          <artifactId>jmxtools</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.sun.jmx</groupId>
+          <artifactId>jmxri</artifactId>
+        </exclusion>
+      </exclusions>
+      <scope>compile</scope>
+    </dependency>
+
+    <!-- Test dependencies -->
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-all</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
     </dependency>
 
   </dependencies>

spring-data-mongodb-parent/pom.xml

@@ -6,10 +6,35 @@
   <name>Spring Data MongoDB Parent</name>
   <description>Spring Data project for MongoDB</description>
   <url>http://www.springsource.org/spring-data/mongodb</url>
-  <version>1.1.3.BUILD-SNAPSHOT</version>
+  <version>1.0.1.RELEASE</version>
   <packaging>pom</packaging>
-  
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <!-- versions for commonly-used dependencies -->
+    <junit.version>4.8.1</junit.version>
+    <log4j.version>1.2.15</log4j.version>
+    <org.mockito.version>1.8.4</org.mockito.version>
+    <org.slf4j.version>1.5.10</org.slf4j.version>
+    <org.codehaus.jackson.version>1.6.1</org.codehaus.jackson.version>
+    <org.springframework.version.30>3.0.7.RELEASE</org.springframework.version.30>
+    <org.springframework.version.40>4.0.0.RELEASE</org.springframework.version.40>
+    <org.springframework.version.range>[${org.springframework.version.30}, ${org.springframework.version.40})</org.springframework.version.range>
+    <data.commons.version>1.2.1.RELEASE</data.commons.version>
+    <aspectj.version>1.6.11.RELEASE</aspectj.version>
+  </properties>
+
   <developers>
+    <developer>
+      <id>ogierke</id>
+      <name>Oliver Gierke</name>
+      <email>ogierke at vmware.com</email>
+      <organization>SpringSource</organization>
+      <organizationUrl>http://www.springsource.com</organizationUrl>
+      <roles>
+        <role>Project lead</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
     <developer>
       <id>trisberg</id>
       <name>Thomas Risberg</name>
@@ -34,17 +59,6 @@
       </roles>
       <timezone>-5</timezone>
     </developer>
-    <developer>
-      <id>ogierke</id>
-      <name>Oliver Gierke</name>
-      <email>ogierke at vmware.com</email>
-      <organization>SpringSource</organization>
-      <organizationUrl>http://www.springsource.com</organizationUrl>
-      <roles>
-        <role>Developer</role>
-      </roles>
-      <timezone>+1</timezone>
-    </developer>
     <developer>
       <id>jbrisbin</id>
       <name>Jon Brisbin</name>
@@ -57,7 +71,7 @@
       <timezone>-6</timezone>
     </developer>
   </developers>
-  
+
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
@@ -80,23 +94,43 @@
       </comments>
     </license>
   </licenses>
-  
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <!-- versions for commonly-used dependencies -->
-    <mongo.version>2.9.3</mongo.version>
-    <junit.version>4.10</junit.version>
-    <logback.version>1.0.6</logback.version>
-    <org.mockito.version>1.9.0</org.mockito.version>
-    <org.slf4j.version>1.6.1</org.slf4j.version>
-    <org.codehaus.jackson.version>1.6.1</org.codehaus.jackson.version>
-    <org.springframework.version.30>3.0.7.RELEASE</org.springframework.version.30>
-    <org.springframework.version.range>3.1.2.RELEASE</org.springframework.version.range>
-    <data.commons.version>1.4.1.RELEASE</data.commons.version>
-    <aspectj.version>1.6.11.RELEASE</aspectj.version>
-    <bundlor.failOnWarnings>true</bundlor.failOnWarnings>
-  </properties>
- 
+
+  <profiles>
+    <profile>
+      <id>strict</id>
+      <properties>
+        <maven.test.failure.ignore>false</maven.test.failure.ignore>
+      </properties>
+    </profile>
+    <profile>
+      <id>fast</id>
+      <properties>
+        <maven.test.skip>true</maven.test.skip>
+        <maven.javadoc.skip>true</maven.javadoc.skip>
+      </properties>
+    </profile>
+    <profile>
+      <id>staging</id>
+      <distributionManagement>
+        <site>
+          <id>spring-site-staging</id>
+          <url>file:///${java.io.tmpdir}/spring-data/mongodb/docs</url>
+        </site>
+        <repository>
+          <id>spring-milestone-staging</id>
+          <url>file:///${java.io.tmpdir}/spring-data/mongodb/milestone</url>
+        </repository>
+        <snapshotRepository>
+          <id>spring-snapshot-staging</id>
+          <url>file:///${java.io.tmpdir}/spring-data/mongodb/snapshot</url>
+        </snapshotRepository>
+      </distributionManagement>
+    </profile>
+    <profile>
+      <id>bootstrap</id>
+      <!-- TODO: move the repositories in here before release -->
+    </profile>
+  </profiles>
   <distributionManagement>
     <!-- see 'staging' profile for dry-run deployment settings -->
     <downloadUrl>http://www.springsource.com/download/community
@@ -108,9 +142,9 @@
       </url>
     </site>
     <repository>
-      <id>spring-milestone</id>
-      <name>Spring Milestone Repository</name>
-      <url>s3://maven.springframework.org/milestone</url>
+      <id>spring-release</id>
+      <name>Spring Release Repository</name>
+      <url>s3://maven.springframework.org/release</url>
     </repository>
     <snapshotRepository>
       <id>spring-snapshot</id>
@@ -118,68 +152,166 @@
       <url>s3://maven.springframework.org/snapshot</url>
     </snapshotRepository>
   </distributionManagement>
-  
+  <scm>
+  	<url>https://github.com/SpringSource/spring-data-mongodb</url>
+  </scm>
+  <dependencyManagement>
+    <!--
+        inheritable <dependency> declarations for child poms. children still
+        must explicitly declare the groupId/artifactId of these dependencies
+        in order for them to show up on the classpath, but metadata like
+        <version> and <scope> are inherited, which cuts down on verbosity.
+        see
+        http://www.sonatype.com/books/mvnref-book/reference/pom-relationships-sect-dep-manage.html
+      -->
+    <dependencies>
+
+      <!--  Spring -->
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-aop</artifactId>
+        <version>${org.springframework.version.range}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-beans</artifactId>
+        <version>${org.springframework.version.range}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-core</artifactId>
+        <version>${org.springframework.version.range}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-tx</artifactId>
+        <version>${org.springframework.version.range}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-orm</artifactId>
+        <version>${org.springframework.version.range}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-web</artifactId>
+        <version>${org.springframework.version.range}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-expression</artifactId>
+        <version>${org.springframework.version.range}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-test</artifactId>
+        <version>${org.springframework.version.range}</version>
+        <scope>test</scope>
+      </dependency>
+
+      <!--  Spring Data -->
+      <dependency>
+        <groupId>org.springframework.data</groupId>
+        <artifactId>spring-data-commons-core</artifactId>
+        <version>${data.commons.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.data</groupId>
+        <artifactId>spring-data-commons-aspects</artifactId>
+        <version>${data.commons.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.data</groupId>
+        <artifactId>spring-data-couchdb</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.data</groupId>
+        <artifactId>spring-data-mongodb</artifactId>
+        <version>1.0.1.RELEASE</version>
+      </dependency>
+
+      <!-- Logging -->
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>${org.slf4j.version}</version>
+        <scope>runtime</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>jcl-over-slf4j</artifactId>
+        <version>${org.slf4j.version}</version>
+        <scope>runtime</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-log4j12</artifactId>
+        <version>${org.slf4j.version}</version>
+        <scope>runtime</scope>
+      </dependency>
+      <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>${log4j.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.jms</groupId>
+            <artifactId>jms</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.sun.jdmk</groupId>
+            <artifactId>jmxtools</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.sun.jmx</groupId>
+            <artifactId>jmxri</artifactId>
+          </exclusion>
+        </exclusions>
+        <scope>runtime</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>javax.annotation</groupId>
+        <artifactId>jsr250-api</artifactId>
+        <version>1.0</version>
+        <optional>true</optional>
+      </dependency>
+
+      <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-all</artifactId>
+        <version>${org.mockito.version}</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>${junit.version}</version>
+        <scope>test</scope>
+      </dependency>
+
+    </dependencies>
+  </dependencyManagement>
   <dependencies>
-
-		<!-- Test dependencies -->
-		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-library</artifactId>
-			<version>1.2.1</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit-dep</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<version>${org.mockito.version}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>joda-time</groupId>
-			<artifactId>joda-time</artifactId>
-			<version>1.6</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>${org.slf4j.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-			<version>${org.slf4j.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jul-to-slf4j</artifactId>
-			<version>${org.slf4j.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>${logback.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<version>${org.springframework.version.range}</version>
-			<scope>test</scope>
-		</dependency>
-
+    <!--
+        dependency definitions to be inherited by child poms. any
+        <dependency> declarations here will automatically show up on child
+        project classpaths. only items that are truly common across all
+        projects (modules and samples) should go here. otherwise, consider
+        <dependencyManagement> above
+      -->
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -235,7 +367,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.5.1</version>
+        <version>2.3.2</version>
         <configuration>
           <source>1.5</source>
           <target>1.5</target>
@@ -255,19 +387,13 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.12</version>
+        <version>2.8</version>
         <configuration>
           <useFile>false</useFile>
           <includes>
             <include>**/*Tests.java</include>
           </includes>
-          <excludes>
-          	<exclude>**/PerformanceTests.java</exclude>
-          </excludes>
-          <junitArtifactName>junit:junit-dep</junitArtifactName>
-          <systemPropertyVariables>
-            <java.util.logging.config.file>src/test/resources/logging.properties</java.util.logging.config.file>
-          </systemPropertyVariables>
+          <junitArtifactName>junit:junit</junitArtifactName>
         </configuration>
       </plugin>
       <plugin>
@@ -303,7 +429,7 @@
           <artifactId>com.springsource.bundlor.maven</artifactId>
           <version>1.0.0.RELEASE</version>
           <configuration>
-            <failOnWarnings>${bundlor.failOnWarnings}</failOnWarnings>
+            <failOnWarnings>true</failOnWarnings>
           </configuration>
           <executions>
             <execution>
@@ -322,15 +448,11 @@
       <id>spring-plugins-release</id>
       <url>http://repo.springsource.org/plugins-release</url>
     </pluginRepository>
-    <pluginRepository>
-      <id>querydsl</id>
-      <url>http://source.mysema.com/maven2/releases</url>
-    </pluginRepository>
   </pluginRepositories>
   <repositories>
     <repository>
-      <id>spring-libs-snapshot</id>
-      <url>http://repo.springsource.org/libs-snapshot</url>
+      <id>spring-libs-release</id>
+      <url>http://repo.springsource.org/libs-release</url>
     </repository>
   </repositories>
   <reporting>
@@ -350,7 +472,4 @@
       </plugin>
     </plugins>
   </reporting>
-  <scm>
-    <url>https://github.com/SpringSource/spring-data-mongodb</url>
-  </scm>
 </project>

spring-data-mongodb/Spring Data MongoDB.sonargraph

@@ -49,12 +49,6 @@
                 </element>
                 <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core"/>
             </element>
-            <element name="GridFS" type="Layer">
-                <element name="Assignment" type="TypeFilter">
-                    <element name="**.gridfs.**" type="IncludeTypePattern"/>
-                </element>
-                <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core"/>
-            </element>
             <element name="Core" type="Layer">
                 <element name="Assignment" type="TypeFilter">
                     <element name="**.core.**" type="IncludeTypePattern"/>

spring-data-mongodb/pom.xml

@@ -4,52 +4,32 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.1.3.BUILD-SNAPSHOT</version>
+		<version>1.0.1.RELEASE</version>
 		<relativePath>../spring-data-mongodb-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>spring-data-mongodb</artifactId>
 	<name>Spring Data MongoDB</name>
 
 	<properties>
-		<querydsl.version>2.8.2</querydsl.version>
-		<cdi.version>1.0</cdi.version>
-		<validation.version>1.0.0.GA</validation.version>
-		<webbeans.version>1.1.3</webbeans.version>
+		<mongo.version>2.7.1</mongo.version>
+		<querydsl.version>2.3.0</querydsl.version>
 	</properties>
 
 	<dependencies>
 
 		<!--  Spring -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-tx</artifactId>
-			<version>${org.springframework.version.range}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>${org.springframework.version.range}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
-			<version>${org.springframework.version.range}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>${org.springframework.version.range}</version>
-			<exclusions>
-				<exclusion>
-          			<groupId>commons-logging</groupId>
-          			<artifactId>commons-logging</artifactId>
-        		</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-expression</artifactId>
-			<version>${org.springframework.version.range}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<scope>test</scope>
 		</dependency>
 
 		<!--  Spring Data -->
@@ -64,6 +44,12 @@
 			<groupId>org.mongodb</groupId>
 			<artifactId>mongo-java-driver</artifactId>
 			<version>${mongo.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.persistence</groupId>
+					<artifactId>persistence-api</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>
@@ -71,86 +57,77 @@
 			<artifactId>querydsl-mongodb</artifactId>
 			<version>${querydsl.version}</version>
 			<optional>true</optional>
+			<exclusions>
+				<exclusion>
+					<groupId>com.google.code.morphia</groupId>
+					<artifactId>morphia</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>com.mysema.querydsl</groupId>
+			<artifactId>querydsl-apt</artifactId>
+			<version>${querydsl.version}</version>
+			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>javax.annotation</groupId>
 			<artifactId>jsr250-api</artifactId>
-			<version>1.0</version>
-			<optional>true</optional>
-		</dependency>
-		
-		<!-- CDI -->
-		<dependency>
-			<groupId>javax.enterprise</groupId>
-			<artifactId>cdi-api</artifactId>
-			<version>${cdi.version}</version>
-			<scope>provided</scope>
-			<optional>true</optional>
-		</dependency>
-		
-		<dependency>
-			<groupId>javax.el</groupId>
-			<artifactId>el-api</artifactId>
-			<version>${cdi.version}</version>
-			<scope>test</scope>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.apache.openwebbeans.test</groupId>
-			<artifactId>cditest-owb</artifactId>
-			<version>${webbeans.version}</version>
-			<scope>test</scope>
-		</dependency>
-		
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.5</version>
-			<scope>test</scope>
-		</dependency>
-
-		<!-- JSR 303 Validation -->
-		<dependency>
-			<groupId>javax.validation</groupId>
-			<artifactId>validation-api</artifactId>
-			<version>${validation.version}</version>
 			<optional>true</optional>
 		</dependency>
 
+		<!-- Test dependencies -->
 		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-validator</artifactId>
-			<version>4.2.0.Final</version>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-all</artifactId>
+			<version>1.1</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+			<version>1.6</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
 			<scope>test</scope>
 		</dependency>
 
 	</dependencies>
 	
-	<profiles>
-		<profile>
-			<id>performance-tests</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<version>2.8</version>
-						<configuration>
-							<includes>
-								<include>**/PerformanceTests.java</include>
-							</includes>
-							<excludes>
-								<exclude>none</exclude>
-							</excludes>
-							<junitArtifactName>junit:junit-dep</junitArtifactName>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-	
 	<build>
 		<plugins>
 			<plugin>
@@ -161,14 +138,7 @@
 			<plugin>
 				<groupId>com.mysema.maven</groupId>
 				<artifactId>maven-apt-plugin</artifactId>
-				<version>1.0.4</version>
-				<dependencies>
-					<dependency>
-						<groupId>com.mysema.querydsl</groupId>
-						<artifactId>querydsl-apt</artifactId>
-						<version>${querydsl.version}</version>
-					</dependency>
-				</dependencies>
+				<version>1.0.2</version>
 				<executions>
 					<execution>
 						<phase>generate-test-sources</phase>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 the original author or authors.
+ * Copyright 2010-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.
@@ -16,51 +16,42 @@
 package org.springframework.data.mongodb;
 
 import org.springframework.dao.DataAccessResourceFailureException;
-import org.springframework.data.authentication.UserCredentials;
 
-/**
- * Exception being thrown in case we cannot connect to a MongoDB instance.
- * 
- * @author Oliver Gierke
- */
 public class CannotGetMongoDbConnectionException extends DataAccessResourceFailureException {
 
-	private final UserCredentials credentials;
-	private final String database;
+	private String username;
+
+	private char[] password;
+
+	private String database;
 
 	private static final long serialVersionUID = 1172099106475265589L;
 
 	public CannotGetMongoDbConnectionException(String msg, Throwable cause) {
 		super(msg, cause);
-		this.database = null;
-		this.credentials = UserCredentials.NO_CREDENTIALS;
 	}
 
 	public CannotGetMongoDbConnectionException(String msg) {
-		this(msg, null, UserCredentials.NO_CREDENTIALS);
-	}
-
-	public CannotGetMongoDbConnectionException(String msg, String database, UserCredentials credentials) {
 		super(msg);
+	}
+
+	public CannotGetMongoDbConnectionException(String msg, String database, String username, char[] password) {
+		super(msg);
+		this.username = username;
+		this.password = password == null ? null : password.clone();
 		this.database = database;
-		this.credentials = credentials;
 	}
 
-	/**
-	 * Returns the {@link UserCredentials} that were used when trying to connect to the MongoDB instance.
-	 * 
-	 * @return
-	 */
-	public UserCredentials getCredentials() {
-		return this.credentials;
+	public String getUsername() {
+		return username;
+	}
+
+	public char[] getPassword() {
+		return password;
 	}
 
-	/**
-	 * Returns the name of the database trying to be accessed.
-	 * 
-	 * @return
-	 */
 	public String getDatabase() {
 		return database;
 	}
+
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 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,180 +15,88 @@
  */
 package org.springframework.data.mongodb.config;
 
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
+import com.mongodb.Mongo;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.data.annotation.Persistent;
 import org.springframework.data.authentication.UserCredentials;
+import org.springframework.data.mongodb.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.MappingMongoConverter;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
-import com.mongodb.Mongo;
-
-/**
- * Base class for Spring Data MongoDB configuration using JavaConfig.
- * 
- * @author Mark Pollack
- * @author Oliver Gierke
- */
 @Configuration
 public abstract class AbstractMongoConfiguration {
 
-	/**
-	 * Return the name of the database to connect to.
-	 * 
-	 * @return must not be {@literal null}.
-	 */
-	protected abstract String getDatabaseName();
+	public abstract String getDatabaseName();
 
-	/**
-	 * Return the {@link Mongo} instance to connect to.
-	 * 
-	 * @return
-	 * @throws Exception
-	 */
 	@Bean
 	public abstract Mongo mongo() throws Exception;
 
-	/**
-	 * Creates a {@link MongoTemplate}.
-	 * 
-	 * @return
-	 * @throws Exception
-	 */
 	@Bean
 	public MongoTemplate mongoTemplate() throws Exception {
 		return new MongoTemplate(mongoDbFactory(), mappingMongoConverter());
 	}
 
-	/**
-	 * Creates a {@link SimpleMongoDbFactory} to be used by the {@link MongoTemplate}. Will use the {@link Mongo} instance
-	 * configured in {@link #mongo()}.
-	 * 
-	 * @see #mongo()
-	 * @see #mongoTemplate()
-	 * @return
-	 * @throws Exception
-	 */
 	@Bean
-	public SimpleMongoDbFactory mongoDbFactory() throws Exception {
-
-		UserCredentials credentials = getUserCredentials();
-
-		if (credentials == null) {
+	public MongoDbFactory mongoDbFactory() throws Exception {
+		if (getUserCredentials() == null) {
 			return new SimpleMongoDbFactory(mongo(), getDatabaseName());
 		} else {
-			return new SimpleMongoDbFactory(mongo(), getDatabaseName(), credentials);
+			return new SimpleMongoDbFactory(mongo(), getDatabaseName(), getUserCredentials());
 		}
 	}
 
-	/**
-	 * Return the base package to scan for mapped {@link Document}s. Will return the package name of the configuration
-	 * class' (the concrete class, not this one here) by default. So if you have a {@code com.acme.AppConfig} extending
-	 * {@link AbstractMongoConfiguration} the base package will be considered {@code com.acme} unless the method is
-	 * overriden to implement alternate behaviour.
-	 * 
-	 * @return the base package to scan for mapped {@link Document} classes or {@literal null} to not enable scanning for
-	 *         entities.
-	 */
-	protected String getMappingBasePackage() {
-		return getClass().getPackage().getName();
+	public String getMappingBasePackage() {
+		return "";
 	}
 
-	/**
-	 * Return {@link UserCredentials} to be used when connecting to the MongoDB instance or {@literal null} if none shall
-	 * be used.
-	 * 
-	 * @return
-	 */
-	protected UserCredentials getUserCredentials() {
+	public 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 {
-
+	public MongoMappingContext mongoMappingContext() throws ClassNotFoundException, LinkageError {
 		MongoMappingContext mappingContext = new MongoMappingContext();
-		mappingContext.setInitialEntitySet(getInitialEntitySet());
-		mappingContext.setSimpleTypeHolder(customConversions().getSimpleTypeHolder());
-		mappingContext.initialize();
-
-		return mappingContext;
-	}
-
-	/**
-	 * Register custom {@link Converter}s in a {@link CustomConversions} object if required. These
-	 * {@link CustomConversions} will be registered with the {@link #mappingMongoConverter()} and
-	 * {@link #mongoMappingContext()}. Returns an empty {@link CustomConversions} instance by default.
-	 * 
-	 * @return must not be {@literal null}.
-	 */
-	@Bean
-	public CustomConversions customConversions() {
-		return new CustomConversions(Collections.emptyList());
-	}
-
-	/**
-	 * Creates a {@link MappingMongoConverter} using the configured {@link #mongoDbFactory()} and
-	 * {@link #mongoMappingContext()}. Will get {@link #customConversions()} applied.
-	 * 
-	 * @see #customConversions()
-	 * @see #mongoMappingContext()
-	 * @see #mongoDbFactory()
-	 * @return
-	 * @throws Exception
-	 */
-	@Bean
-	public MappingMongoConverter mappingMongoConverter() throws Exception {
-		MappingMongoConverter converter = new MappingMongoConverter(mongoDbFactory(), mongoMappingContext());
-		converter.setCustomConversions(customConversions());
-		return converter;
-	}
-
-	/**
-	 * Scans the mapping base package for classes annotated with {@link Document}.
-	 * 
-	 * @see #getMappingBasePackage()
-	 * @return
-	 * @throws ClassNotFoundException
-	 */
-	protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
-
 		String basePackage = getMappingBasePackage();
-		Set<Class<?>> initialEntitySet = new HashSet<Class<?>>();
-
 		if (StringUtils.hasText(basePackage)) {
 			ClassPathScanningCandidateComponentProvider componentProvider = new ClassPathScanningCandidateComponentProvider(
 					false);
 			componentProvider.addIncludeFilter(new AnnotationTypeFilter(Document.class));
 			componentProvider.addIncludeFilter(new AnnotationTypeFilter(Persistent.class));
 
+			Set<Class<?>> initialEntitySet = new HashSet<Class<?>>();
 			for (BeanDefinition candidate : componentProvider.findCandidateComponents(basePackage)) {
-				initialEntitySet.add(ClassUtils.forName(candidate.getBeanClassName(),
-						AbstractMongoConfiguration.class.getClassLoader()));
+				initialEntitySet.add(ClassUtils.forName(candidate.getBeanClassName(), mappingContext.getClass()
+						.getClassLoader()));
 			}
+			mappingContext.setInitialEntitySet(initialEntitySet);
 		}
+		return mappingContext;
+	}
 
-		return initialEntitySet;
+	@Bean
+	public MappingMongoConverter mappingMongoConverter() throws Exception {
+		MappingMongoConverter converter = new MappingMongoConverter(mongoDbFactory(), mongoMappingContext());
+		afterMappingMongoConverterCreation(converter);
+		return converter;
+	}
+
+	/**
+	 * Hook that allows post-processing after the MappingMongoConverter has been successfully created.
+	 * 
+	 * @param converter
+	 */
+	protected void afterMappingMongoConverterCreation(MappingMongoConverter converter) {
 	}
 }

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

@@ -25,7 +25,4 @@ public abstract class BeanNames {
 	static final String INDEX_HELPER = "indexCreationHelper";
 	static final String MONGO = "mongo";
 	static final String DB_FACTORY = "mongoDbFactory";
-	static final String VALIDATING_EVENT_LISTENER = "validatingMongoEventListener";
-	static final String IS_NEW_STRATEGY_FACTORY = "isNewStrategyFactory";
-	static final String DEFAULT_CONVERTER_BEAN_NAME = "mappingConverter";
 }

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ * Copyright (c) 2011 by the original author(s).
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.data.mongodb.config;
 
 import static org.springframework.data.mongodb.config.BeanNames.*;
@@ -24,21 +25,18 @@ import java.util.List;
 import java.util.Set;
 
 import org.springframework.beans.BeanMetadataElement;
+import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
-import org.springframework.beans.factory.parsing.BeanComponentDefinition;
-import org.springframework.beans.factory.parsing.CompositeComponentDefinition;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.GenericBeanDefinition;
 import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.support.ManagedSet;
-import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
 import org.springframework.core.convert.converter.Converter;
@@ -49,46 +47,37 @@ import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.core.type.filter.AssignableTypeFilter;
 import org.springframework.core.type.filter.TypeFilter;
 import org.springframework.data.annotation.Persistent;
-import org.springframework.data.config.BeanComponentDefinitionBuilder;
 import org.springframework.data.mongodb.core.convert.CustomConversions;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.index.MongoPersistentEntityIndexCreator;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
-import org.springframework.data.mongodb.core.mapping.event.ValidatingMongoEventListener;
 import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;
 
 /**
- * Bean definition parser for the {@code mapping-converter} element.
- * 
- * @author Jon Brisbin
+ * @author Jon Brisbin <jbrisbin@vmware.com>
  * @author Oliver Gierke
- * @author Maciej Walkowiak
  */
-public class MappingMongoConverterParser implements BeanDefinitionParser {
+public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 
 	private static final String BASE_PACKAGE = "base-package";
-	private static final boolean jsr303Present = ClassUtils.isPresent("javax.validation.Validator",
-			MappingMongoConverterParser.class.getClassLoader());
 
-	/* (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) {
+	@Override
+	protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext)
+			throws BeanDefinitionStoreException {
+		String id = super.resolveId(element, definition, parserContext);
+		return StringUtils.hasText(id) ? id : "mappingConverter";
+	}
 
+	@Override
+	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
 		BeanDefinitionRegistry registry = parserContext.getRegistry();
 
-		String id = element.getAttribute(AbstractBeanDefinitionParser.ID_ATTRIBUTE);
-		id = StringUtils.hasText(id) ? id : "mappingConverter";
-
-		parserContext.pushContainingComponent(new CompositeComponentDefinition("Mapping Mongo Converter", element));
-
 		BeanDefinition conversionsDefinition = getCustomConversions(element, parserContext);
-		String ctxRef = potentiallyCreateMappingContext(element, parserContext, conversionsDefinition, id);
+		String ctxRef = potentiallyCreateMappingContext(element, parserContext, conversionsDefinition);
 
 		// Need a reference to a Mongo instance
 		String dbFactoryRef = element.getAttribute("db-factory-ref");
@@ -113,93 +102,39 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 			}
 			BeanDefinitionBuilder indexHelperBuilder = BeanDefinitionBuilder
 					.genericBeanDefinition(MongoPersistentEntityIndexCreator.class);
-			indexHelperBuilder.addConstructorArgReference(ctxRef);
-			indexHelperBuilder.addConstructorArgReference(dbFactoryRef);
-
-			parserContext.registerBeanComponent(new BeanComponentDefinition(indexHelperBuilder.getBeanDefinition(),
-					INDEX_HELPER));
+			indexHelperBuilder.addConstructorArgValue(new RuntimeBeanReference(ctxRef));
+			indexHelperBuilder.addConstructorArgValue(new RuntimeBeanReference(dbFactoryRef));
+			registry.registerBeanDefinition(INDEX_HELPER, indexHelperBuilder.getBeanDefinition());
 		}
 
-		BeanDefinition validatingMongoEventListener = potentiallyCreateValidatingMongoEventListener(element, parserContext);
-
-		if (validatingMongoEventListener != null) {
-			parserContext.registerBeanComponent(new BeanComponentDefinition(validatingMongoEventListener,
-					VALIDATING_EVENT_LISTENER));
-		}
-
-		parserContext.registerBeanComponent(new BeanComponentDefinition(converterBuilder.getBeanDefinition(), id));
-		parserContext.popAndRegisterContainingComponent();
-		return null;
+		return converterBuilder.getBeanDefinition();
 	}
 
-	private BeanDefinition potentiallyCreateValidatingMongoEventListener(Element element, ParserContext parserContext) {
-
-		String disableValidation = element.getAttribute("disable-validation");
-		boolean validationDisabled = StringUtils.hasText(disableValidation) && Boolean.valueOf(disableValidation);
-
-		if (!validationDisabled) {
-
-			BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition();
-			RuntimeBeanReference validator = getValidator(builder, parserContext);
-
-			if (validator != null) {
-				builder.getRawBeanDefinition().setBeanClass(ValidatingMongoEventListener.class);
-				builder.addConstructorArgValue(validator);
-
-				return builder.getBeanDefinition();
-			}
-		}
-
-		return null;
-	}
-
-	private RuntimeBeanReference getValidator(Object source, ParserContext parserContext) {
-
-		if (!jsr303Present) {
-			return null;
-		}
-
-		RootBeanDefinition validatorDef = new RootBeanDefinition(
-				"org.springframework.validation.beanvalidation.LocalValidatorFactoryBean");
-		validatorDef.setSource(source);
-		validatorDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
-		String validatorName = parserContext.getReaderContext().registerWithGeneratedName(validatorDef);
-		parserContext.registerBeanComponent(new BeanComponentDefinition(validatorDef, validatorName));
-
-		return new RuntimeBeanReference(validatorName);
-	}
-
-	static String potentiallyCreateMappingContext(Element element, ParserContext parserContext,
-			BeanDefinition conversionsDefinition, String converterId) {
+	private String potentiallyCreateMappingContext(Element element, ParserContext parserContext,
+			BeanDefinition conversionsDefinition) {
 
 		String ctxRef = element.getAttribute("mapping-context-ref");
+		if (!StringUtils.hasText(ctxRef)) {
+			BeanDefinitionBuilder mappingContextBuilder = BeanDefinitionBuilder
+					.genericBeanDefinition(MongoMappingContext.class);
 
-		if (StringUtils.hasText(ctxRef)) {
-			return ctxRef;
+			Set<String> classesToAdd = getInititalEntityClasses(element, mappingContextBuilder);
+			if (classesToAdd != null) {
+				mappingContextBuilder.addPropertyValue("initialEntitySet", classesToAdd);
+			}
+
+			if (conversionsDefinition != null) {
+				AbstractBeanDefinition simpleTypesDefinition = new GenericBeanDefinition();
+				simpleTypesDefinition.setFactoryBeanName("customConversions");
+				simpleTypesDefinition.setFactoryMethodName("getSimpleTypeHolder");
+
+				mappingContextBuilder.addPropertyValue("simpleTypeHolder", simpleTypesDefinition);
+			}
+
+			parserContext.getRegistry().registerBeanDefinition(MAPPING_CONTEXT, mappingContextBuilder.getBeanDefinition());
+			ctxRef = MAPPING_CONTEXT;
 		}
 
-		BeanComponentDefinitionBuilder componentDefinitionBuilder = new BeanComponentDefinitionBuilder(element,
-				parserContext);
-
-		BeanDefinitionBuilder mappingContextBuilder = BeanDefinitionBuilder
-				.genericBeanDefinition(MongoMappingContext.class);
-
-		Set<String> classesToAdd = getInititalEntityClasses(element, mappingContextBuilder);
-		if (classesToAdd != null) {
-			mappingContextBuilder.addPropertyValue("initialEntitySet", classesToAdd);
-		}
-
-		if (conversionsDefinition != null) {
-			AbstractBeanDefinition simpleTypesDefinition = new GenericBeanDefinition();
-			simpleTypesDefinition.setFactoryBeanName("customConversions");
-			simpleTypesDefinition.setFactoryMethodName("getSimpleTypeHolder");
-
-			mappingContextBuilder.addPropertyValue("simpleTypeHolder", simpleTypesDefinition);
-		}
-
-		ctxRef = converterId + "." + MAPPING_CONTEXT;
-
-		parserContext.registerBeanComponent(componentDefinitionBuilder.getComponent(mappingContextBuilder, ctxRef));
 		return ctxRef;
 	}
 
@@ -237,7 +172,7 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 			AbstractBeanDefinition conversionsBean = conversionsBuilder.getBeanDefinition();
 			conversionsBean.setSource(parserContext.extractSource(element));
 
-			parserContext.registerBeanComponent(new BeanComponentDefinition(conversionsBean, "customConversions"));
+			parserContext.getRegistry().registerBeanDefinition("customConversions", conversionsBean);
 
 			return conversionsBean;
 		}
@@ -245,7 +180,7 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 		return null;
 	}
 
-	public static Set<String> getInititalEntityClasses(Element element, BeanDefinitionBuilder builder) {
+	public Set<String> getInititalEntityClasses(Element element, BeanDefinitionBuilder builder) {
 
 		String basePackage = element.getAttribute(BASE_PACKAGE);
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 by the original author(s).
+ * Copyright 2011 by the original author(s).
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,19 +15,19 @@
  */
 package org.springframework.data.mongodb.config;
 
-import static org.springframework.data.config.ParsingUtils.*;
-import static org.springframework.data.mongodb.config.MongoParsingUtils.*;
+import static org.springframework.data.mongodb.config.BeanNames.*;
+import static org.springframework.data.mongodb.config.ParsingUtils.*;
 
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.parsing.BeanComponentDefinition;
+import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
 import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
 import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.data.authentication.UserCredentials;
-import org.springframework.data.config.BeanComponentDefinitionBuilder;
 import org.springframework.data.mongodb.core.MongoFactoryBean;
 import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
 import org.springframework.util.StringUtils;
@@ -44,29 +44,19 @@ import com.mongodb.MongoURI;
  */
 public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#resolveId(org.w3c.dom.Element, org.springframework.beans.factory.support.AbstractBeanDefinition, org.springframework.beans.factory.xml.ParserContext)
-	 */
 	@Override
 	protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext)
 			throws BeanDefinitionStoreException {
-
-		String id = super.resolveId(element, definition, parserContext);
-		return StringUtils.hasText(id) ? id : BeanNames.DB_FACTORY;
+		String id = element.getAttribute("id");
+		if (!StringUtils.hasText(id)) {
+			id = DB_FACTORY;
+		}
+		return id;
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#parseInternal(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext)
-	 */
 	@Override
 	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
 
-		Object source = parserContext.extractSource(element);
-
-		BeanComponentDefinitionBuilder helper = new BeanComponentDefinitionBuilder(element, parserContext);
-
 		String uri = element.getAttribute("uri");
 		String mongoRef = element.getAttribute("mongo-ref");
 		String dbname = element.getAttribute("dbname");
@@ -74,11 +64,12 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 
 		// Common setup
 		BeanDefinitionBuilder dbFactoryBuilder = BeanDefinitionBuilder.genericBeanDefinition(SimpleMongoDbFactory.class);
-		setPropertyValue(dbFactoryBuilder, element, "write-concern", "writeConcern");
+		ParsingUtils.setPropertyValue(element, dbFactoryBuilder, "write-concern", "writeConcern");
 
 		if (StringUtils.hasText(uri)) {
 			if (StringUtils.hasText(mongoRef) || StringUtils.hasText(dbname) || userCredentials != null) {
-				parserContext.getReaderContext().error("Configure either Mongo URI or details individually!", source);
+				parserContext.getReaderContext().error("Configure either Mongo URI or details individually!",
+						parserContext.extractSource(element));
 			}
 
 			dbFactoryBuilder.addConstructorArgValue(getMongoUri(uri));
@@ -86,26 +77,19 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 		}
 
 		// Defaulting
-		if (StringUtils.hasText(mongoRef)) {
-			dbFactoryBuilder.addConstructorArgReference(mongoRef);
-		} else {
-			dbFactoryBuilder.addConstructorArgValue(registerMongoBeanDefinition(element, parserContext));
-		}
-
+		mongoRef = StringUtils.hasText(mongoRef) ? mongoRef : registerMongoBeanDefinition(element, parserContext);
 		dbname = StringUtils.hasText(dbname) ? dbname : "db";
+
+		dbFactoryBuilder.addConstructorArgValue(new RuntimeBeanReference(mongoRef));
 		dbFactoryBuilder.addConstructorArgValue(dbname);
 
 		if (userCredentials != null) {
 			dbFactoryBuilder.addConstructorArgValue(userCredentials);
 		}
 
-		BeanDefinitionBuilder writeConcernPropertyEditorBuilder = getWriteConcernPropertyEditorBuilder();
+		ParsingUtils.registerWriteConcernPropertyEditor(parserContext.getRegistry());
 
-		BeanComponentDefinition component = helper.getComponent(writeConcernPropertyEditorBuilder);
-		parserContext.registerBeanComponent(component);
-
-		return (AbstractBeanDefinition) helper.getComponentIdButFallback(dbFactoryBuilder, BeanNames.DB_FACTORY)
-				.getBeanDefinition();
+		return getSourceBeanDefinition(dbFactoryBuilder, parserContext, element);
 	}
 
 	/**
@@ -116,13 +100,14 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 	 * @param parserContext must not be {@literal null}.
 	 * @return
 	 */
-	private BeanDefinition registerMongoBeanDefinition(Element element, ParserContext parserContext) {
+	private String registerMongoBeanDefinition(Element element, ParserContext parserContext) {
 
 		BeanDefinitionBuilder mongoBuilder = BeanDefinitionBuilder.genericBeanDefinition(MongoFactoryBean.class);
-		setPropertyValue(mongoBuilder, element, "host");
-		setPropertyValue(mongoBuilder, element, "port");
+		ParsingUtils.setPropertyValue(element, mongoBuilder, "host");
+		ParsingUtils.setPropertyValue(element, mongoBuilder, "port");
 
-		return getSourceBeanDefinition(mongoBuilder, parserContext, element);
+		return BeanDefinitionReaderUtils.registerWithGeneratedName(mongoBuilder.getBeanDefinition(),
+				parserContext.getRegistry());
 	}
 
 	/**

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

@@ -16,9 +16,7 @@
 package org.springframework.data.mongodb.config;
 
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
-import org.springframework.data.mongodb.repository.config.MongoRepositoryConfigurationExtension;
-import org.springframework.data.repository.config.RepositoryBeanDefinitionParser;
-import org.springframework.data.repository.config.RepositoryConfigurationExtension;
+import org.springframework.data.mongodb.repository.config.MongoRepositoryConfigParser;
 
 /**
  * {@link org.springframework.beans.factory.xml.NamespaceHandler} for Mongo DB based repositories.
@@ -34,10 +32,7 @@ public class MongoNamespaceHandler extends NamespaceHandlerSupport {
 	*/
 	public void init() {
 
-		RepositoryConfigurationExtension extension = new MongoRepositoryConfigurationExtension();
-		RepositoryBeanDefinitionParser repositoryBeanDefinitionParser = new RepositoryBeanDefinitionParser(extension);
-
-		registerBeanDefinitionParser("repositories", repositoryBeanDefinitionParser);
+		registerBeanDefinitionParser("repositories", new MongoRepositoryConfigParser());
 		registerBeanDefinitionParser("mapping-converter", new MappingMongoConverterParser());
 		registerBeanDefinitionParser("mongo", new MongoParser());
 		registerBeanDefinitionParser("db-factory", new MongoDbFactoryParser());

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 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.
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.data.mongodb.config;
 
 import java.util.Map;
 
-import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.config.CustomEditorConfigurer;
-import org.springframework.beans.factory.parsing.BeanComponentDefinition;
-import org.springframework.beans.factory.parsing.CompositeComponentDefinition;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.ManagedMap;
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
+import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 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;
@@ -35,59 +35,54 @@ import org.w3c.dom.Element;
  * Parser for <mongo;gt; definitions.
  * 
  * @author Mark Pollack
- * @author Oliver Gierke
  */
-public class MongoParser implements BeanDefinitionParser {
+public class MongoParser extends AbstractSingleBeanDefinitionParser {
 
-	/* 
-	 * (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) {
+	@Override
+	protected Class<?> getBeanClass(Element element) {
+		return MongoFactoryBean.class;
+	}
 
-		Object source = parserContext.extractSource(element);
-		String id = element.getAttribute("id");
+	@Override
+	protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
 
-		BeanComponentDefinitionBuilder helper = new BeanComponentDefinitionBuilder(element, parserContext);
+		ParsingUtils.setPropertyValue(element, builder, "port", "port");
+		ParsingUtils.setPropertyValue(element, builder, "host", "host");
+		ParsingUtils.setPropertyValue(element, builder, "write-concern", "writeConcern");
 
-		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");
+		ParsingUtils.parseMongoOptions(element, builder);
+		ParsingUtils.parseReplicaSet(element, builder);
 
-		MongoParsingUtils.parseMongoOptions(element, builder);
-		MongoParsingUtils.parseReplicaSet(element, builder);
+		registerServerAddressPropertyEditor(parserContext.getRegistry());
+		ParsingUtils.registerWriteConcernPropertyEditor(parserContext.getRegistry());
 
-		String defaultedId = StringUtils.hasText(id) ? id : BeanNames.MONGO;
-
-		parserContext.pushContainingComponent(new CompositeComponentDefinition("Mongo", source));
-
-		BeanComponentDefinition mongoComponent = helper.getComponent(builder, defaultedId);
-		parserContext.registerBeanComponent(mongoComponent);
-		BeanComponentDefinition serverAddressPropertyEditor = helper.getComponent(registerServerAddressPropertyEditor());
-		parserContext.registerBeanComponent(serverAddressPropertyEditor);
-		BeanComponentDefinition writeConcernPropertyEditor = helper.getComponent(MongoParsingUtils
-				.getWriteConcernPropertyEditorBuilder());
-		parserContext.registerBeanComponent(writeConcernPropertyEditor);
-
-		parserContext.popAndRegisterContainingComponent();
-
-		return mongoComponent.getBeanDefinition();
 	}
 
 	/**
 	 * One should only register one bean definition but want to have the convenience of using
 	 * AbstractSingleBeanDefinitionParser but have the side effect of registering a 'default' property editor with the
 	 * container.
+	 * 
+	 * @param parserContext the ParserContext to
 	 */
-	private BeanDefinitionBuilder registerServerAddressPropertyEditor() {
+	private void registerServerAddressPropertyEditor(BeanDefinitionRegistry registry) {
 
+		BeanDefinitionBuilder customEditorConfigurer = BeanDefinitionBuilder
+				.genericBeanDefinition(CustomEditorConfigurer.class);
 		Map<String, String> customEditors = new ManagedMap<String, String>();
 		customEditors.put("com.mongodb.ServerAddress[]",
 				"org.springframework.data.mongodb.config.ServerAddressPropertyEditor");
-
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CustomEditorConfigurer.class);
-		builder.addPropertyValue("customEditors", customEditors);
-		return builder;
+		customEditorConfigurer.addPropertyValue("customEditors", customEditors);
+		BeanDefinitionReaderUtils.registerWithGeneratedName(customEditorConfigurer.getBeanDefinition(), registry);
 	}
-}
+
+	@Override
+	protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext)
+			throws BeanDefinitionStoreException {
+		String name = super.resolveId(element, definition, parserContext);
+		if (!StringUtils.hasText(name)) {
+			name = "mongo";
+		}
+		return name;
+	}
+}

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

@@ -1,103 +0,0 @@
-/*
- * Copyright 2011-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.config;
-
-import static org.springframework.data.config.ParsingUtils.*;
-
-import java.util.Map;
-
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.CustomEditorConfigurer;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.ManagedMap;
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
-import org.springframework.data.mongodb.core.MongoOptionsFactoryBean;
-import org.springframework.util.xml.DomUtils;
-import org.w3c.dom.Element;
-
-/**
- * Utility methods for {@link BeanDefinitionParser} implementations for MongoDB.
- * 
- * @author Mark Pollack
- * @author Oliver Gierke
- */
-abstract class MongoParsingUtils {
-
-	private MongoParsingUtils() {
-
-	}
-
-	/**
-	 * Parses the mongo replica-set element.
-	 * 
-	 * @param parserContext the parser context
-	 * @param element the mongo element
-	 * @param mongoBuilder the bean definition builder to populate
-	 * @return
-	 */
-	static void parseReplicaSet(Element element, BeanDefinitionBuilder mongoBuilder) {
-		setPropertyValue(mongoBuilder, element, "replica-set", "replicaSetSeeds");
-	}
-
-	/**
-	 * Parses the mongo:options sub-element. Populates the given attribute factory with the proper attributes.
-	 * 
-	 * @return true if parsing actually occured, false otherwise
-	 */
-	static boolean parseMongoOptions(Element element, BeanDefinitionBuilder mongoBuilder) {
-		Element optionsElement = DomUtils.getChildElementByTagName(element, "options");
-		if (optionsElement == null) {
-			return false;
-		}
-
-		BeanDefinitionBuilder optionsDefBuilder = BeanDefinitionBuilder
-				.genericBeanDefinition(MongoOptionsFactoryBean.class);
-
-		setPropertyValue(optionsDefBuilder, optionsElement, "connections-per-host", "connectionsPerHost");
-		setPropertyValue(optionsDefBuilder, optionsElement, "threads-allowed-to-block-for-connection-multiplier",
-				"threadsAllowedToBlockForConnectionMultiplier");
-		setPropertyValue(optionsDefBuilder, optionsElement, "max-wait-time", "maxWaitTime");
-		setPropertyValue(optionsDefBuilder, optionsElement, "connect-timeout", "connectTimeout");
-		setPropertyValue(optionsDefBuilder, optionsElement, "socket-timeout", "socketTimeout");
-		setPropertyValue(optionsDefBuilder, optionsElement, "socket-keep-alive", "socketKeepAlive");
-		setPropertyValue(optionsDefBuilder, optionsElement, "auto-connect-retry", "autoConnectRetry");
-		setPropertyValue(optionsDefBuilder, optionsElement, "max-auto-connect-retry-time", "maxAutoConnectRetryTime");
-		setPropertyValue(optionsDefBuilder, optionsElement, "write-number", "writeNumber");
-		setPropertyValue(optionsDefBuilder, optionsElement, "write-timeout", "writeTimeout");
-		setPropertyValue(optionsDefBuilder, optionsElement, "write-fsync", "writeFsync");
-		setPropertyValue(optionsDefBuilder, optionsElement, "slave-ok", "slaveOk");
-
-		mongoBuilder.addPropertyValue("mongoOptions", optionsDefBuilder.getBeanDefinition());
-		return true;
-	}
-
-	/**
-	 * Returns the {@link BeanDefinitionBuilder} to build a {@link BeanDefinition} for a
-	 * {@link WriteConcernPropertyEditor}.
-	 * 
-	 * @return
-	 */
-	static BeanDefinitionBuilder getWriteConcernPropertyEditorBuilder() {
-
-		Map<String, Class<?>> customEditors = new ManagedMap<String, Class<?>>();
-		customEditors.put("com.mongodb.WriteConcern", WriteConcernPropertyEditor.class);
-
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CustomEditorConfigurer.class);
-		builder.addPropertyValue("customEditors", customEditors);
-
-		return builder;
-	}
-}

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

@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2011 by the original author(s).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.mongodb.config;
+
+import java.util.Map;
+
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.CustomEditorConfigurer;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.support.ManagedMap;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.data.mongodb.core.MongoOptionsFactoryBean;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+import org.springframework.util.xml.DomUtils;
+import org.w3c.dom.Element;
+
+abstract class ParsingUtils {
+
+	/**
+	 * Parses the mongo replica-set element.
+	 * 
+	 * @param parserContext the parser context
+	 * @param element the mongo element
+	 * @param mongoBuilder the bean definition builder to populate
+	 * @return true if parsing actually occured, false otherwise
+	 */
+	static boolean parseReplicaSet(Element element, BeanDefinitionBuilder mongoBuilder) {
+
+		String replicaSetString = element.getAttribute("replica-set");
+		if (StringUtils.hasText(replicaSetString)) {
+			mongoBuilder.addPropertyValue("replicaSetSeeds", replicaSetString);
+		}
+		return true;
+
+	}
+
+	/**
+	 * Parses the mongo:options sub-element. Populates the given attribute factory with the proper attributes.
+	 * 
+	 * @return true if parsing actually occured, false otherwise
+	 */
+	static boolean parseMongoOptions(Element element, BeanDefinitionBuilder mongoBuilder) {
+		Element optionsElement = DomUtils.getChildElementByTagName(element, "options");
+		if (optionsElement == null) {
+			return false;
+		}
+
+		BeanDefinitionBuilder optionsDefBuilder = BeanDefinitionBuilder
+				.genericBeanDefinition(MongoOptionsFactoryBean.class);
+
+		setPropertyValue(optionsElement, optionsDefBuilder, "connections-per-host", "connectionsPerHost");
+		setPropertyValue(optionsElement, optionsDefBuilder, "threads-allowed-to-block-for-connection-multiplier",
+				"threadsAllowedToBlockForConnectionMultiplier");
+		setPropertyValue(optionsElement, optionsDefBuilder, "max-wait-time", "maxWaitTime");
+		setPropertyValue(optionsElement, optionsDefBuilder, "connect-timeout", "connectTimeout");
+		setPropertyValue(optionsElement, optionsDefBuilder, "socket-timeout", "socketTimeout");
+		setPropertyValue(optionsElement, optionsDefBuilder, "socket-keep-alive", "socketKeepAlive");
+		setPropertyValue(optionsElement, optionsDefBuilder, "auto-connect-retry", "autoConnectRetry");
+		setPropertyValue(optionsElement, optionsDefBuilder, "max-auto-connect-retry-time", "maxAutoConnectRetryTime");
+		setPropertyValue(optionsElement, optionsDefBuilder, "write-number", "writeNumber");
+		setPropertyValue(optionsElement, optionsDefBuilder, "write-timeout", "writeTimeout");
+		setPropertyValue(optionsElement, optionsDefBuilder, "write-fsync", "writeFsync");
+		setPropertyValue(optionsElement, optionsDefBuilder, "slave-ok", "slaveOk");
+
+		mongoBuilder.addPropertyValue("mongoOptions", optionsDefBuilder.getBeanDefinition());
+		return true;
+	}
+
+	static void setPropertyValue(Element element, BeanDefinitionBuilder builder, String attrName, String propertyName) {
+		String attr = element.getAttribute(attrName);
+		if (StringUtils.hasText(attr)) {
+			builder.addPropertyValue(propertyName, attr);
+		}
+	}
+
+	/**
+	 * Sets the property with the given attribute name on the given {@link BeanDefinitionBuilder} to the value of the
+	 * attribute with the given name.
+	 * 
+	 * @param element must not be {@literal null}.
+	 * @param builder must not be {@literal null}.
+	 * @param attrName must not be {@literal null} or empty.
+	 */
+	static void setPropertyValue(Element element, BeanDefinitionBuilder builder, String attrName) {
+		String attr = element.getAttribute(attrName);
+		if (StringUtils.hasText(attr)) {
+			builder.addPropertyValue(attrName, attr);
+		}
+	}
+
+	/**
+	 * Returns the {@link BeanDefinition} built by the given {@link BeanDefinitionBuilder} enriched with source
+	 * information derived from the given {@link Element}.
+	 * 
+	 * @param builder must not be {@literal null}.
+	 * @param context must not be {@literal null}.
+	 * @param element must not be {@literal null}.
+	 * @return
+	 */
+	static AbstractBeanDefinition getSourceBeanDefinition(BeanDefinitionBuilder builder, ParserContext context,
+			Element element) {
+		AbstractBeanDefinition definition = builder.getBeanDefinition();
+		definition.setSource(context.extractSource(element));
+		return definition;
+	}
+
+	/**
+	 * Registers a {@link WriteConcernPropertyEditor} in the given {@link BeanDefinitionRegistry}.
+	 * 
+	 * @param registry must not be {@literal null}.
+	 */
+	static void registerWriteConcernPropertyEditor(BeanDefinitionRegistry registry) {
+
+		Assert.notNull(registry);
+
+		BeanDefinitionBuilder customEditorConfigurer = BeanDefinitionBuilder
+				.genericBeanDefinition(CustomEditorConfigurer.class);
+		Map<String, Class<?>> customEditors = new ManagedMap<String, Class<?>>();
+		customEditors.put("com.mongodb.WriteConcern", WriteConcernPropertyEditor.class);
+		customEditorConfigurer.addPropertyValue("customEditors", customEditors);
+		BeanDefinitionReaderUtils.registerWithGeneratedName(customEditorConfigurer.getBeanDefinition(), registry);
+	}
+}

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

@@ -17,11 +17,7 @@ package org.springframework.data.mongodb.config;
 
 import java.beans.PropertyEditorSupport;
 import java.net.UnknownHostException;
-import java.util.HashSet;
-import java.util.Set;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.util.StringUtils;
 
 import com.mongodb.ServerAddress;
@@ -34,8 +30,6 @@ import com.mongodb.ServerAddress;
  */
 public class ServerAddressPropertyEditor extends PropertyEditorSupport {
 
-	private static final Logger LOG = LoggerFactory.getLogger(ServerAddressPropertyEditor.class);
-
 	/*
 	 * (non-Javadoc)
 	 * @see java.beans.PropertyEditorSupport#setAsText(java.lang.String)
@@ -44,49 +38,21 @@ public class ServerAddressPropertyEditor extends PropertyEditorSupport {
 	public void setAsText(String replicaSetString) {
 
 		String[] replicaSetStringArray = StringUtils.commaDelimitedListToStringArray(replicaSetString);
-		Set<ServerAddress> serverAddresses = new HashSet<ServerAddress>(replicaSetStringArray.length);
+		ServerAddress[] serverAddresses = new ServerAddress[replicaSetStringArray.length];
 
-		for (String element : replicaSetStringArray) {
+		for (int i = 0; i < replicaSetStringArray.length; i++) {
 
-			ServerAddress address = parseServerAddress(element);
+			String[] hostAndPort = StringUtils.delimitedListToStringArray(replicaSetStringArray[i], ":");
 
-			if (address != null) {
-				serverAddresses.add(address);
+			try {
+				serverAddresses[i] = new ServerAddress(hostAndPort[0], Integer.parseInt(hostAndPort[1]));
+			} catch (NumberFormatException e) {
+				throw new IllegalArgumentException("Could not parse port " + hostAndPort[1], e);
+			} catch (UnknownHostException e) {
+				throw new IllegalArgumentException("Could not parse host " + hostAndPort[0], e);
 			}
 		}
 
-		if (serverAddresses.isEmpty()) {
-			throw new IllegalArgumentException(
-					"Could not resolve at least one server of the replica set configuration! Validate your config!");
-		}
-
-		setValue(serverAddresses.toArray(new ServerAddress[serverAddresses.size()]));
-	}
-
-	/**
-	 * Parses the given source into a {@link ServerAddress}.
-	 * 
-	 * @param source
-	 * @return the
-	 */
-	private ServerAddress parseServerAddress(String source) {
-
-		String[] hostAndPort = StringUtils.delimitedListToStringArray(source.trim(), ":");
-
-		if (!StringUtils.hasText(source) || hostAndPort.length > 2) {
-			LOG.warn("Could not parse address source '{}'. Check your replica set configuration!", source);
-			return null;
-		}
-
-		try {
-			return hostAndPort.length == 1 ? new ServerAddress(hostAndPort[0]) : new ServerAddress(hostAndPort[0],
-					Integer.parseInt(hostAndPort[1]));
-		} catch (UnknownHostException e) {
-			LOG.warn("Could not parse host '{}'. Check your replica set configuration!", hostAndPort[0]);
-		} catch (NumberFormatException e) {
-			LOG.warn("Could not parse port '{}'. Check your replica set configuration!", hostAndPort[1]);
-		}
-
-		return null;
+		setValue(serverAddresses);
 	}
 }

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

@@ -1,38 +0,0 @@
-/*
- * 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.
- * 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.core.convert.converter.Converter;
-
-import com.mongodb.WriteConcern;
-
-/**
- * Converter to create {@link WriteConcern} instances from String representations.
- * 
- * @author Oliver Gierke
- */
-public class StringToWriteConcernConverter implements Converter<String, WriteConcern> {
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-	 */
-	public WriteConcern convert(String source) {
-
-		WriteConcern writeConcern = WriteConcern.valueOf(source);
-		return writeConcern != null ? writeConcern : new WriteConcern(source);
-	}
-}

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

@@ -16,11 +16,14 @@
 package org.springframework.data.mongodb.core;
 
 import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.mongodb.core.index.IndexDefinition;
-import org.springframework.data.mongodb.core.index.IndexField;
 import org.springframework.data.mongodb.core.index.IndexInfo;
 import org.springframework.data.mongodb.core.query.Order;
 import org.springframework.util.Assert;
@@ -120,27 +123,25 @@ public class DefaultIndexOperations implements IndexOperations {
 				return getIndexData(dbObjectList);
 			}
 
+			@SuppressWarnings("unchecked")
 			private List<IndexInfo> getIndexData(List<DBObject> dbObjectList) {
 
 				List<IndexInfo> indexInfoList = new ArrayList<IndexInfo>();
 
 				for (DBObject ix : dbObjectList) {
 
+					Map<String, Order> keyOrderMap = new LinkedHashMap<String, Order>();
 					DBObject keyDbObject = (DBObject) ix.get("key");
-					int numberOfElements = keyDbObject.keySet().size();
+					Iterator<?> entries = keyDbObject.toMap().entrySet().iterator();
 
-					List<IndexField> indexFields = new ArrayList<IndexField>(numberOfElements);
-
-					for (String key : keyDbObject.keySet()) {
-
-						Object value = keyDbObject.get(key);
-
-						if (Integer.valueOf(1).equals(value)) {
-							indexFields.add(IndexField.create(key, Order.ASCENDING));
-						} else if (Integer.valueOf(-1).equals(value)) {
-							indexFields.add(IndexField.create(key, Order.DESCENDING));
-						} else if ("2d".equals(value)) {
-							indexFields.add(IndexField.geo(key));
+					while (entries.hasNext()) {
+						Entry<Object, Integer> thisEntry = (Entry<Object, Integer>) entries.next();
+						String key = thisEntry.getKey().toString();
+						int value = thisEntry.getValue();
+						if (value == 1) {
+							keyOrderMap.put(key, Order.ASCENDING);
+						} else {
+							keyOrderMap.put(key, Order.DESCENDING);
 						}
 					}
 
@@ -150,11 +151,12 @@ public class DefaultIndexOperations implements IndexOperations {
 					boolean dropDuplicates = ix.containsField("dropDups") ? (Boolean) ix.get("dropDups") : false;
 					boolean sparse = ix.containsField("sparse") ? (Boolean) ix.get("sparse") : false;
 
-					indexInfoList.add(new IndexInfo(indexFields, name, unique, dropDuplicates, sparse));
+					indexInfoList.add(new IndexInfo(keyOrderMap, name, unique, dropDuplicates, sparse));
 				}
 
 				return indexInfoList;
 			}
 		});
 	}
+
 }

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

@@ -20,7 +20,6 @@ import java.util.List;
 import org.springframework.data.mongodb.core.index.IndexDefinition;
 import org.springframework.data.mongodb.core.index.IndexInfo;
 
-
 /**
  * Index operations on a collection.
  * 

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ * Copyright 2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ package org.springframework.data.mongodb.core;
  * for a given mutating operation
  * 
  * @author Mark Pollack
- * @author Oliver Gierke
  * @see MongoAction
+ * 
  */
 public enum MongoActionOperation {
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ * Copyright 2002-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,28 +15,32 @@
  */
 package org.springframework.data.mongodb.core;
 
-import org.springframework.data.authentication.UserCredentials;
-import org.springframework.jmx.export.annotation.ManagedOperation;
-import org.springframework.jmx.export.annotation.ManagedResource;
-import org.springframework.util.Assert;
-
 import com.mongodb.DB;
 import com.mongodb.Mongo;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.jmx.export.annotation.ManagedOperation;
+import org.springframework.jmx.export.annotation.ManagedResource;
 
 /**
  * Mongo server administration exposed via JMX annotations
  * 
  * @author Mark Pollack
  */
+
 @ManagedResource(description = "Mongo Admin Operations")
 public class MongoAdmin implements MongoAdminOperations {
 
-	private final Mongo mongo;
+	/**
+	 * Logger available to subclasses
+	 */
+	protected final Log logger = LogFactory.getLog(getClass());
+
+	private Mongo mongo;
 	private String username;
 	private String password;
 
 	public MongoAdmin(Mongo mongo) {
-		Assert.notNull(mongo);
 		this.mongo = mongo;
 	}
 
@@ -79,10 +83,11 @@ public class MongoAdmin implements MongoAdminOperations {
 	 * @param password The password to use
 	 */
 	public void setPassword(String password) {
+
 		this.password = password;
 	}
 
 	DB getDB(String databaseName) {
-		return MongoDbUtils.getDB(mongo, databaseName, new UserCredentials(username, password));
+		return MongoDbUtils.getDB(mongo, databaseName, username, password == null ? null : password.toCharArray());
 	}
 }

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

@@ -15,16 +15,14 @@
  */
 package org.springframework.data.mongodb.core;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.authentication.UserCredentials;
+import com.mongodb.DB;
+import com.mongodb.Mongo;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.data.mongodb.CannotGetMongoDbConnectionException;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.Assert;
 
-import com.mongodb.DB;
-import com.mongodb.Mongo;
-
 /**
  * Helper class featuring helper methods for internal MongoDb classes.
  * <p/>
@@ -38,7 +36,7 @@ import com.mongodb.Mongo;
  */
 public abstract class MongoDbUtils {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(MongoDbUtils.class);
+	private static final Log LOGGER = LogFactory.getLog(MongoDbUtils.class);
 
 	/**
 	 * Private constructor to prevent instantiation.
@@ -50,90 +48,74 @@ public abstract class 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
+	 * @param mongo The {@link Mongo} instance
+	 * @param databaseName The database name
+	 * @return The {@link DB} connection
 	 */
 	public static DB getDB(Mongo mongo, String databaseName) {
-		return doGetDB(mongo, databaseName, UserCredentials.NO_CREDENTIALS, true);
+		return doGetDB(mongo, databaseName, null, null, true);
 	}
 
 	/**
 	 * 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
+	 * @param mongo The {@link Mongo} instance
+	 * @param databaseName The database name
+	 * @param username The username to authenticate with
+	 * @param password The password to authenticate with
+	 * @return The {@link DB} connection
 	 */
-	public static DB getDB(Mongo mongo, String databaseName, UserCredentials credentials) {
-
-		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!");
-
-		return doGetDB(mongo, databaseName, credentials, true);
+	public static DB getDB(Mongo mongo, String databaseName, String username, char[] password) {
+		return doGetDB(mongo, databaseName, username, password, true);
 	}
 
-	private static DB doGetDB(Mongo mongo, String databaseName, UserCredentials credentials, boolean allowCreate) {
+	public static DB doGetDB(Mongo mongo, String databaseName, String username, char[] password, boolean allowCreate) {
+		Assert.notNull(mongo, "No Mongo instance specified");
 
 		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 (dbHolder != null && !dbHolder.isEmpty()) {
+			// pre-bound Mongo DB
+			DB db = null;
+			if (TransactionSynchronizationManager.isSynchronizationActive() && dbHolder.doesNotHoldNonDefaultDB()) {
+				// Spring transaction management is active ->
+				db = dbHolder.getDB();
+				if (db != null && !dbHolder.isSynchronizedWithTransaction()) {
+					LOGGER.debug("Registering Spring transaction synchronization for existing Mongo DB");
+					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);
-
+		LOGGER.trace("Getting Mongo Database name=[" + databaseName + "]");
 		DB db = mongo.getDB(databaseName);
-		boolean credentialsGiven = credentials.hasUsername() && credentials.hasPassword();
 
-		synchronized (db) {
-
-			if (credentialsGiven && !db.isAuthenticated()) {
-
-				String username = credentials.getUsername();
-				String password = credentials.hasPassword() ? credentials.getPassword() : null;
-
-				if (!db.authenticate(username, password == null ? null : password.toCharArray())) {
-					throw new CannotGetMongoDbConnectionException("Failed to authenticate to database [" + databaseName
-							+ "], username = [" + username + "], password = [ -not-shown- ]", databaseName, credentials);
-				}
+		boolean credentialsGiven = username != null && password != null;
+		if (credentialsGiven && !db.isAuthenticated()) {
+			// Note, can only authenticate once against the same com.mongodb.DB object.
+			if (!db.authenticate(username, password)) {
+				throw new CannotGetMongoDbConnectionException("Failed to authenticate to database [" + databaseName
+						+ "], username = [" + username + "], password = [" + new String(password) + "]", databaseName, username,
+						password);
 			}
 		}
 
-		// TX sync active, bind new database to thread
+		// Use same Session for further Mongo actions within the transaction.
+		// Thread object will get removed by synchronization at transaction completion.
 		if (TransactionSynchronizationManager.isSynchronizationActive()) {
-
-			LOGGER.debug("Registering Spring transaction synchronization for MongoDB instance {}.", databaseName);
-
+			// We're within a Spring-managed transaction, possibly from JtaTransactionManager.
+			LOGGER.debug("Registering Spring transaction synchronization for new Hibernate Session");
 			DbHolder holderToUse = dbHolder;
-
 			if (holderToUse == null) {
-				holderToUse = new DbHolder(databaseName, db);
+				holderToUse = new DbHolder(db);
 			} else {
-				holderToUse.addDB(databaseName, db);
+				holderToUse.addDB(db);
 			}
-
 			TransactionSynchronizationManager.registerSynchronization(new MongoSynchronization(holderToUse, mongo));
 			holderToUse.setSynchronizedWithTransaction(true);
-
 			if (holderToUse != dbHolder) {
 				TransactionSynchronizationManager.bindResource(mongo, holderToUse);
 			}
@@ -157,12 +139,11 @@ public abstract class MongoDbUtils {
 	 * @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);
+		return (dbHolder != null && dbHolder.containsDB(db));
 	}
 
 	/**
@@ -171,7 +152,6 @@ public abstract class MongoDbUtils {
 	 * @param db the DB to close (may be <code>null</code>)
 	 */
 	public static void closeDB(DB db) {
-
 		if (db != null) {
 			LOGGER.debug("Closing Mongo DB object");
 			try {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 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,6 +15,12 @@
  */
 package org.springframework.data.mongodb.core;
 
+import com.mongodb.MongoException;
+import com.mongodb.MongoException.CursorNotFound;
+import com.mongodb.MongoException.DuplicateKey;
+import com.mongodb.MongoException.Network;
+import com.mongodb.MongoInternalException;
+
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.dao.DuplicateKeyException;
@@ -23,26 +29,21 @@ import org.springframework.dao.InvalidDataAccessResourceUsageException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.mongodb.UncategorizedMongoDbException;
 
-import com.mongodb.MongoException;
-import com.mongodb.MongoException.CursorNotFound;
-import com.mongodb.MongoException.DuplicateKey;
-import com.mongodb.MongoException.Network;
-import com.mongodb.MongoInternalException;
-
 /**
  * Simple {@link PersistenceExceptionTranslator} for Mongo. Convert the given runtime exception to an appropriate
  * exception from the {@code org.springframework.dao} hierarchy. Return {@literal null} if no translation is
  * appropriate: any other exception may have resulted from user code, and should not be translated.
  * 
  * @author Oliver Gierke
- * @author Michal Vich
  */
 public class MongoExceptionTranslator implements PersistenceExceptionTranslator {
 
 	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.dao.support.PersistenceExceptionTranslator#translateExceptionIfPossible(java.lang.RuntimeException)
-	 */
+	  * (non-Javadoc)
+	  *
+	  * @see org.springframework.dao.support.PersistenceExceptionTranslator#
+	  * translateExceptionIfPossible(java.lang.RuntimeException)
+	  */
 	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
 
 		// Check for well-known MongoException subclasses.
@@ -51,23 +52,14 @@ public class MongoExceptionTranslator implements PersistenceExceptionTranslator
 		if (ex instanceof DuplicateKey) {
 			return new DuplicateKeyException(ex.getMessage(), ex);
 		}
-
 		if (ex instanceof Network) {
 			return new DataAccessResourceFailureException(ex.getMessage(), ex);
 		}
-
 		if (ex instanceof CursorNotFound) {
 			return new DataAccessResourceFailureException(ex.getMessage(), ex);
 		}
-
-		if (ex instanceof MongoInternalException) {
-			return new InvalidDataAccessResourceUsageException(ex.getMessage(), ex);
-		}
-
 		if (ex instanceof MongoException) {
-
 			int code = ((MongoException) ex).getCode();
-
 			if (code == 11000 || code == 11001) {
 				throw new DuplicateKeyException(ex.getMessage(), ex);
 			} else if (code == 12000 || code == 13440) {
@@ -77,6 +69,9 @@ public class MongoExceptionTranslator implements PersistenceExceptionTranslator
 			}
 			return new UncategorizedMongoDbException(ex.getMessage(), ex);
 		}
+		if (ex instanceof MongoInternalException) {
+			return new InvalidDataAccessResourceUsageException(ex.getMessage(), ex);
+		}
 
 		// If we get here, we have an exception that resulted from user code,
 		// rather than the persistence provider, so we return null to indicate

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 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.
@@ -13,14 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.data.mongodb.core;
 
 import java.util.Arrays;
 import java.util.List;
 
-import org.springframework.beans.factory.DisposableBean;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.mongodb.CannotGetMongoDbConnectionException;
@@ -38,10 +39,12 @@ import com.mongodb.WriteConcern;
  * @author Oliver Gierke
  * @since 1.0
  */
-public class MongoFactoryBean implements FactoryBean<Mongo>, InitializingBean, DisposableBean,
-		PersistenceExceptionTranslator {
+public class MongoFactoryBean implements FactoryBean<Mongo>, PersistenceExceptionTranslator {
 
-	private Mongo mongo;
+	/**
+	 * Logger, available to subclasses.
+	 */
+	protected final Log logger = LogFactory.getLog(getClass());
 
 	private MongoOptions mongoOptions;
 	private String host;
@@ -86,7 +89,34 @@ public class MongoFactoryBean implements FactoryBean<Mongo>, InitializingBean, D
 	}
 
 	public Mongo getObject() throws Exception {
+
+		Mongo mongo;
+
+		ServerAddress defaultOptions = new ServerAddress();
+
+		if (mongoOptions == null) {
+			mongoOptions = new MongoOptions();
+		}
+
+		if (replicaPair != null) {
+			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 (replicaSetSeeds != null) {
+			mongo = new Mongo(replicaSetSeeds, mongoOptions);
+		} else {
+			String mongoHost = host != null ? 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;
+
 	}
 
 	/*
@@ -112,45 +142,4 @@ public class MongoFactoryBean implements FactoryBean<Mongo>, InitializingBean, D
 	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
 		return exceptionTranslator.translateExceptionIfPossible(ex);
 	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-	 */
-	public void afterPropertiesSet() throws Exception {
-
-		Mongo mongo;
-		ServerAddress defaultOptions = new ServerAddress();
-
-		if (mongoOptions == null) {
-			mongoOptions = new MongoOptions();
-		}
-
-		if (replicaPair != null) {
-			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 (replicaSetSeeds != null) {
-			mongo = new Mongo(replicaSetSeeds, mongoOptions);
-		} else {
-			String mongoHost = host != null ? host : defaultOptions.getHost();
-			mongo = port != null ? new Mongo(new ServerAddress(mongoHost, port), mongoOptions) : new Mongo(mongoHost,
-					mongoOptions);
-		}
-
-		if (writeConcern != null) {
-			mongo.setWriteConcern(writeConcern);
-		}
-
-		this.mongo = mongo;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.DisposableBean#destroy()
-	 */
-	public void destroy() throws Exception {
-		this.mongo.close();
-	}
 }

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

@@ -1,11 +1,15 @@
 /*
- * Copyright 2010-2012 the original author or authors.
+ * Copyright 2010-2011 the original author or authors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under t
+import org.springframework.util.ResourceUtils;
+
+import org.springframework.data.convert.EntityReader;
+he Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *			http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,29 +20,27 @@
 package org.springframework.data.mongodb.core;
 
 import static org.springframework.data.mongodb.core.query.Criteria.*;
-import static org.springframework.data.mongodb.core.query.SerializationUtils.*;
 
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Scanner;
 import java.util.Set;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.bson.types.ObjectId;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
-import org.springframework.context.ApplicationListener;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.io.Resource;
@@ -46,10 +48,8 @@ import org.springframework.core.io.ResourceLoader;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.dao.OptimisticLockingFailureException;
 import org.springframework.data.authentication.UserCredentials;
 import org.springframework.data.convert.EntityReader;
-import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.model.BeanWrapper;
 import org.springframework.data.mapping.model.MappingException;
@@ -57,7 +57,6 @@ import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoWriter;
-import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.geo.Distance;
 import org.springframework.data.mongodb.core.geo.GeoResult;
 import org.springframework.data.mongodb.core.geo.GeoResults;
@@ -101,7 +100,6 @@ import com.mongodb.ReadPreference;
 import com.mongodb.WriteConcern;
 import com.mongodb.WriteResult;
 import com.mongodb.util.JSON;
-import com.mongodb.util.JSONParseException;
 
 /**
  * Primary implementation of {@link MongoOperations}.
@@ -110,25 +108,40 @@ import com.mongodb.util.JSONParseException;
  * @author Graeme Rocher
  * @author Mark Pollack
  * @author Oliver Gierke
- * @author Amol Nayak
- * @author Patryk Wasik
  */
 public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(MongoTemplate.class);
-	private static final String ID_FIELD = "_id";
+	private static final Log LOGGER = LogFactory.getLog(MongoTemplate.class);
+	private static final String ID = "_id";
 	private static final WriteResultChecking DEFAULT_WRITE_RESULT_CHECKING = WriteResultChecking.NONE;
-	private static final Collection<String> ITERABLE_CLASSES;
+	@SuppressWarnings("serial")
+	private static final List<String> ITERABLE_CLASSES = new ArrayList<String>() {
+		{
+			add(List.class.getName());
+			add(Collection.class.getName());
+			add(Iterator.class.getName());
+		}
+	};
 
-	static {
+	/*
+	 * WriteConcern to be used for write operations if it has been specified.
+	 * Otherwise we should not use a WriteConcern defaulting to the one set for
+	 * the DB or Collection.
+	 */
+	private WriteConcern writeConcern = null;
 
-		Set<String> iterableClasses = new HashSet<String>();
-		iterableClasses.add(List.class.getName());
-		iterableClasses.add(Collection.class.getName());
-		iterableClasses.add(Iterator.class.getName());
+	private WriteConcernResolver writeConcernResolver = new DefaultWriteConcernResolver();
 
-		ITERABLE_CLASSES = Collections.unmodifiableCollection(iterableClasses);
-	}
+	/*
+	 * WriteResultChecking to be used for write operations if it has been
+	 * specified. Otherwise we should not do any checking.
+	 */
+	private WriteResultChecking writeResultChecking = WriteResultChecking.NONE;
+
+	/**
+	 * Set the ReadPreference when operating on a collection. See {@link #prepareCollection(DBCollection)}
+	 */
+	private ReadPreference readPreference = null;
 
 	private final MongoConverter mongoConverter;
 	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
@@ -136,10 +149,6 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	private final MongoExceptionTranslator exceptionTranslator = new MongoExceptionTranslator();
 	private final QueryMapper mapper;
 
-	private WriteConcern writeConcern;
-	private WriteConcernResolver writeConcernResolver = DefaultWriteConcernResolver.INSTANCE;
-	private WriteResultChecking writeResultChecking = WriteResultChecking.NONE;
-	private ReadPreference readPreference;
 	private ApplicationEventPublisher eventPublisher;
 	private ResourceLoader resourceLoader;
 	private MongoPersistentEntityIndexCreator indexCreator;
@@ -147,8 +156,8 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	/**
 	 * Constructor used for a basic template configuration
 	 * 
-	 * @param mongo must not be {@literal null}.
-	 * @param databaseName must not be {@literal null} or empty.
+	 * @param mongo
+	 * @param databaseName
 	 */
 	public MongoTemplate(Mongo mongo, String databaseName) {
 		this(new SimpleMongoDbFactory(mongo, databaseName), null);
@@ -158,8 +167,8 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * Constructor used for a template configuration with user credentials in the form of
 	 * {@link org.springframework.data.authentication.UserCredentials}
 	 * 
-	 * @param mongo must not be {@literal null}.
-	 * @param databaseName must not be {@literal null} or empty.
+	 * @param mongo
+	 * @param databaseName
 	 * @param userCredentials
 	 */
 	public MongoTemplate(Mongo mongo, String databaseName, UserCredentials userCredentials) {
@@ -167,9 +176,9 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	}
 
 	/**
-	 * Constructor used for a basic template configuration.
+	 * Constructor used for a basic template configuration
 	 * 
-	 * @param mongoDbFactory must not be {@literal null}.
+	 * @param mongoDbFactory
 	 */
 	public MongoTemplate(MongoDbFactory mongoDbFactory) {
 		this(mongoDbFactory, null);
@@ -178,7 +187,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	/**
 	 * Constructor used for a basic template configuration.
 	 * 
-	 * @param mongoDbFactory must not be {@literal null}.
+	 * @param mongoDbFactory
 	 * @param mongoConverter
 	 */
 	public MongoTemplate(MongoDbFactory mongoDbFactory, MongoConverter mongoConverter) {
@@ -199,6 +208,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 				((ApplicationEventPublisherAware) mappingContext).setApplicationEventPublisher(eventPublisher);
 			}
 		}
+
 	}
 
 	/**
@@ -212,9 +222,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	}
 
 	/**
-	 * Configures the {@link WriteConcern} to be used with the template. If none is configured the {@link WriteConcern}
-	 * configured on the {@link MongoDbFactory} will apply. If you configured a {@link Mongo} instance no
-	 * {@link WriteConcern} will be used.
+	 * Configures the {@link WriteConcern} to be used with the template.
 	 * 
 	 * @param writeConcern
 	 */
@@ -241,14 +249,11 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		this.readPreference = readPreference;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
-	 */
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-
-		prepareIndexCreator(applicationContext);
-
+		String[] beans = applicationContext.getBeanNamesForType(MongoPersistentEntityIndexCreator.class);
+		if ((null == beans || beans.length == 0) && applicationContext instanceof ConfigurableApplicationContext) {
+			((ConfigurableApplicationContext) applicationContext).addApplicationListener(indexCreator);
+		}
 		eventPublisher = applicationContext;
 		if (mappingContext instanceof ApplicationEventPublisherAware) {
 			((ApplicationEventPublisherAware) mappingContext).setApplicationEventPublisher(eventPublisher);
@@ -256,30 +261,6 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		resourceLoader = applicationContext;
 	}
 
-	/**
-	 * Inspects the given {@link ApplicationContext} for {@link MongoPersistentEntityIndexCreator} and those in turn if
-	 * they were registered for the current {@link MappingContext}. If no creator for the current {@link MappingContext}
-	 * can be found we manually add the internally created one as {@link ApplicationListener} to make sure indexes get
-	 * created appropriately for entity types persisted through this {@link MongoTemplate} instance.
-	 * 
-	 * @param context must not be {@literal null}.
-	 */
-	private void prepareIndexCreator(ApplicationContext context) {
-
-		String[] indexCreators = context.getBeanNamesForType(MongoPersistentEntityIndexCreator.class);
-
-		for (String creator : indexCreators) {
-			MongoPersistentEntityIndexCreator creatorBean = context.getBean(creator, MongoPersistentEntityIndexCreator.class);
-			if (creatorBean.isIndexCreatorFor(mappingContext)) {
-				return;
-			}
-		}
-
-		if (context instanceof ConfigurableApplicationContext) {
-			((ConfigurableApplicationContext) context).addApplicationListener(indexCreator);
-		}
-	}
-
 	/**
 	 * Returns the default {@link org.springframework.data.mongodb.core.core.convert.MongoConverter}.
 	 * 
@@ -352,12 +333,11 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		Assert.notNull(query);
 
 		DBObject queryObject = query.getQueryObject();
-		DBObject sortObject = query.getSortObject();
 		DBObject fieldsObject = query.getFieldsObject();
 
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug(String.format("Executing query: %s sort: %s fields: %s in collection: $s",
-					serializeToJsonSafely(queryObject), sortObject, fieldsObject, collectionName));
+			LOGGER.debug("find using query: " + queryObject + " fields: " + fieldsObject + " in collection: "
+					+ collectionName);
 		}
 
 		this.executeQueryInternal(new FindCallback(queryObject, fieldsObject), preparer, dch, collectionName);
@@ -476,7 +456,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		} else {
 			query.limit(1);
 			List<T> results = find(query, entityClass, collectionName);
-			return results.isEmpty() ? null : results.get(0);
+			return (results.isEmpty() ? null : results.get(0));
 		}
 	}
 
@@ -487,23 +467,19 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	}
 
 	public <T> List<T> find(final Query query, Class<T> entityClass, String collectionName) {
-
-		if (query == null) {
-			return findAll(entityClass, collectionName);
-		}
-
-		return doFind(collectionName, query.getQueryObject(), query.getFieldsObject(), entityClass,
-				new QueryCursorPreparer(query));
+		CursorPreparer cursorPreparer = query == null ? null : new QueryCursorPreparer(query);
+		return doFind(collectionName, query.getQueryObject(), query.getFieldsObject(), entityClass, cursorPreparer);
 	}
 
 	public <T> T findById(Object id, Class<T> entityClass) {
-		return findById(id, entityClass, determineCollectionName(entityClass));
+		MongoPersistentEntity<?> persistentEntity = mappingContext.getPersistentEntity(entityClass);
+		return findById(id, entityClass, persistentEntity.getCollection());
 	}
 
 	public <T> T findById(Object id, Class<T> entityClass, String collectionName) {
 		MongoPersistentEntity<?> persistentEntity = mappingContext.getPersistentEntity(entityClass);
-		MongoPersistentProperty idProperty = persistentEntity == null ? null : persistentEntity.getIdProperty();
-		String idKey = idProperty == null ? ID_FIELD : idProperty.getName();
+		MongoPersistentProperty idProperty = persistentEntity.getIdProperty();
+		String idKey = idProperty == null ? ID : idProperty.getName();
 		return doFindOne(collectionName, new BasicDBObject(idKey, id), null, entityClass);
 	}
 
@@ -648,8 +624,6 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 
 		assertUpdateableIdIfNotSet(objectToSave);
 
-		initializeVersionProperty(objectToSave);
-
 		BasicDBObject dbDoc = new BasicDBObject();
 
 		maybeEmitEvent(new BeforeConvertEvent<T>(objectToSave));
@@ -662,16 +636,6 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		maybeEmitEvent(new AfterSaveEvent<T>(objectToSave, dbDoc));
 	}
 
-	private void initializeVersionProperty(Object entity) {
-
-		MongoPersistentEntity<?> mongoPersistentEntity = getPersistentEntity(entity.getClass());
-
-		if (mongoPersistentEntity == null || mongoPersistentEntity.hasVersionProperty()) {
-			BeanWrapper<PersistentEntity<Object, ?>, Object> wrapper = BeanWrapper.create(entity, null);
-			wrapper.setProperty(mongoPersistentEntity.getVersionProperty(), 0);
-		}
-	}
-
 	public void insert(Collection<? extends Object> batchToSave, Class<?> entityClass) {
 		doInsertBatch(determineCollectionName(entityClass), batchToSave, this.mongoConverter);
 	}
@@ -716,8 +680,6 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 
 		List<DBObject> dbObjectList = new ArrayList<DBObject>();
 		for (T o : batchToSave) {
-
-			initializeVersionProperty(o);
 			BasicDBObject dbDoc = new BasicDBObject();
 
 			maybeEmitEvent(new BeforeConvertEvent<T>(o));
@@ -738,83 +700,21 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	}
 
 	public void save(Object objectToSave) {
-
-		Assert.notNull(objectToSave);
 		save(objectToSave, determineEntityCollectionName(objectToSave));
 	}
 
 	public void save(Object objectToSave, String collectionName) {
-
-		Assert.notNull(objectToSave);
-		Assert.hasText(collectionName);
-
-		MongoPersistentEntity<?> mongoPersistentEntity = getPersistentEntity(objectToSave.getClass());
-
-		// No optimistic locking -> simple save
-		if (mongoPersistentEntity == null || !mongoPersistentEntity.hasVersionProperty()) {
-			doSave(collectionName, objectToSave, this.mongoConverter);
-			return;
-		}
-
-		doSaveVersioned(objectToSave, mongoPersistentEntity, collectionName);
+		doSave(collectionName, objectToSave, this.mongoConverter);
 	}
 
-	private <T> void doSaveVersioned(T objectToSave, MongoPersistentEntity<?> entity, String collectionName) {
-
-		BeanWrapper<PersistentEntity<T, ?>, T> beanWrapper = BeanWrapper.create(objectToSave,
-				this.mongoConverter.getConversionService());
-		MongoPersistentProperty idProperty = entity.getIdProperty();
-		MongoPersistentProperty versionProperty = entity.getVersionProperty();
-
-		Number version = beanWrapper.getProperty(versionProperty, Number.class, !versionProperty.usePropertyAccess());
-
-		// Fresh instance -> initialize version property
-		if (version == null) {
-			beanWrapper.setProperty(versionProperty, 0);
-			doSave(collectionName, objectToSave, this.mongoConverter);
-		} else {
-
-			assertUpdateableIdIfNotSet(objectToSave);
-
-			// Create query for entity with the id and old version
-			Object id = beanWrapper.getProperty(idProperty);
-			Query query = new Query(Criteria.where(idProperty.getName()).is(id).and(versionProperty.getName()).is(version));
-
-			// Bump version number
-			Number number = beanWrapper.getProperty(versionProperty, Number.class, false);
-			beanWrapper.setProperty(versionProperty, number.longValue() + 1);
-
-			BasicDBObject dbObject = new BasicDBObject();
-
-			maybeEmitEvent(new BeforeConvertEvent<T>(objectToSave));
-			this.mongoConverter.write(objectToSave, dbObject);
-
-			maybeEmitEvent(new BeforeSaveEvent<T>(objectToSave, dbObject));
-			Update update = Update.fromDBObject(dbObject, ID_FIELD);
-
-			updateFirst(query, update, objectToSave.getClass());
-			maybeEmitEvent(new AfterSaveEvent<T>(objectToSave, dbObject));
-		}
-	}
-
-	@SuppressWarnings("unchecked")
 	protected <T> void doSave(String collectionName, T objectToSave, MongoWriter<T> writer) {
 
 		assertUpdateableIdIfNotSet(objectToSave);
 
-		DBObject dbDoc = new BasicDBObject();
+		BasicDBObject dbDoc = new BasicDBObject();
 
 		maybeEmitEvent(new BeforeConvertEvent<T>(objectToSave));
-
-		if (!(objectToSave instanceof String)) {
-			writer.write(objectToSave, dbDoc);
-		} else {
-			try {
-				objectToSave = (T) JSON.parse((String) objectToSave);
-			} catch (JSONParseException e) {
-				throw new MappingException("Could not parse given String to save into a JSON document!", e);
-			}
-		}
+		writer.write(objectToSave, dbDoc);
 
 		maybeEmitEvent(new BeforeSaveEvent<T>(objectToSave, dbDoc));
 		Object id = saveDBObject(collectionName, dbDoc, objectToSave.getClass());
@@ -825,17 +725,19 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 
 	protected Object insertDBObject(final String collectionName, final DBObject dbDoc, final Class<?> entityClass) {
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("Inserting DBObject containing fields: " + dbDoc.keySet() + " in collection: " + collectionName);
+			LOGGER.debug("insert DBObject containing fields: " + dbDoc.keySet() + " in collection: " + collectionName);
 		}
 		return execute(collectionName, new CollectionCallback<Object>() {
 			public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
 				MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.INSERT, collectionName,
 						entityClass, dbDoc, null);
 				WriteConcern writeConcernToUse = prepareWriteConcern(mongoAction);
-				WriteResult writeResult = writeConcernToUse == null ? collection.insert(dbDoc) : collection.insert(dbDoc,
-						writeConcernToUse);
-				handleAnyWriteResultErrors(writeResult, dbDoc, MongoActionOperation.INSERT);
-				return dbDoc.get(ID_FIELD);
+				if (writeConcernToUse == null) {
+					collection.insert(dbDoc);
+				} else {
+					collection.insert(dbDoc, writeConcernToUse);
+				}
+				return dbDoc.get(ID);
 			}
 		});
 	}
@@ -846,23 +748,25 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		}
 
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("Inserting list of DBObjects containing " + dbDocList.size() + " items");
+			LOGGER.debug("insert list of DBObjects containing " + dbDocList.size() + " items");
 		}
 		execute(collectionName, new CollectionCallback<Void>() {
 			public Void doInCollection(DBCollection collection) throws MongoException, DataAccessException {
 				MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.INSERT_LIST, collectionName, null,
 						null, null);
 				WriteConcern writeConcernToUse = prepareWriteConcern(mongoAction);
-				WriteResult writeResult = writeConcernToUse == null ? collection.insert(dbDocList) : collection.insert(
-						dbDocList.toArray((DBObject[]) new BasicDBObject[dbDocList.size()]), writeConcernToUse);
-				handleAnyWriteResultErrors(writeResult, null, MongoActionOperation.INSERT_LIST);
+				if (writeConcernToUse == null) {
+					collection.insert(dbDocList);
+				} else {
+					collection.insert(dbDocList.toArray((DBObject[]) new BasicDBObject[dbDocList.size()]), writeConcernToUse);
+				}
 				return null;
 			}
 		});
 
 		List<ObjectId> ids = new ArrayList<ObjectId>();
 		for (DBObject dbo : dbDocList) {
-			Object id = dbo.get(ID_FIELD);
+			Object id = dbo.get(ID);
 			if (id instanceof ObjectId) {
 				ids.add((ObjectId) id);
 			} else {
@@ -875,17 +779,19 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 
 	protected Object saveDBObject(final String collectionName, final DBObject dbDoc, final Class<?> entityClass) {
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("Saving DBObject containing fields: " + dbDoc.keySet());
+			LOGGER.debug("save DBObject containing fields: " + dbDoc.keySet());
 		}
 		return execute(collectionName, new CollectionCallback<Object>() {
 			public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
 				MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.SAVE, collectionName, entityClass,
 						dbDoc, null);
 				WriteConcern writeConcernToUse = prepareWriteConcern(mongoAction);
-				WriteResult writeResult = writeConcernToUse == null ? collection.save(dbDoc) : collection.save(dbDoc,
-						writeConcernToUse);
-				handleAnyWriteResultErrors(writeResult, dbDoc, MongoActionOperation.SAVE);
-				return dbDoc.get(ID_FIELD);
+				if (writeConcernToUse == null) {
+					collection.save(dbDoc);
+				} else {
+					collection.save(dbDoc, writeConcernToUse);
+				}
+				return dbDoc.get(ID);
 			}
 		});
 	}
@@ -924,29 +830,28 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 
 				DBObject queryObj = query == null ? new BasicDBObject()
 						: mapper.getMappedObject(query.getQueryObject(), entity);
-				DBObject updateObj = update == null ? new BasicDBObject() : mapper.getMappedObject(update.getUpdateObject(),
-						entity);
+				DBObject updateObj = update.getUpdateObject();
+
+				for (String key : updateObj.keySet()) {
+					updateObj.put(key, mongoConverter.convertToMongoType(updateObj.get(key)));
+				}
 
 				if (LOGGER.isDebugEnabled()) {
-					LOGGER.debug("Calling update using query: " + queryObj + " and update: " + updateObj + " in collection: "
+					LOGGER.debug("calling update using query: " + queryObj + " and update: " + updateObj + " in collection: "
 							+ collectionName);
 				}
 
+				WriteResult wr;
 				MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.UPDATE, collectionName,
 						entityClass, updateObj, queryObj);
 				WriteConcern writeConcernToUse = prepareWriteConcern(mongoAction);
-				WriteResult writeResult = writeConcernToUse == null ? collection.update(queryObj, updateObj, upsert, multi)
-						: collection.update(queryObj, updateObj, upsert, multi, writeConcernToUse);
-
-				if (entity != null && entity.hasVersionProperty() && !multi) {
-					if (writeResult.getN() == 0) {
-						throw new OptimisticLockingFailureException("Optimistic lock exception on saving entity: "
-								+ updateObj.toMap().toString());
-					}
+				if (writeConcernToUse == null) {
+					wr = collection.update(queryObj, updateObj, upsert, multi);
+				} else {
+					wr = collection.update(queryObj, updateObj, upsert, multi, writeConcernToUse);
 				}
-
-				handleAnyWriteResultErrors(writeResult, queryObj, MongoActionOperation.UPDATE);
-				return writeResult;
+				handleAnyWriteResultErrors(wr, queryObj, "update with '" + updateObj + "'");
+				return wr;
 			}
 		});
 	}
@@ -968,7 +873,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 			return;
 		}
 
-		doRemove(collection, getIdQueryFor(object), object.getClass());
+		remove(getIdQueryFor(object), collection);
 	}
 
 	/**
@@ -982,7 +887,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		Assert.notNull(object);
 
 		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(object.getClass());
-		MongoPersistentProperty idProp = entity == null ? null : entity.getIdProperty();
+		MongoPersistentProperty idProp = entity.getIdProperty();
 
 		if (idProp == null) {
 			throw new MappingException("No id property found for object of type " + entity.getType().getName());
@@ -998,7 +903,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	private void assertUpdateableIdIfNotSet(Object entity) {
 
 		MongoPersistentEntity<?> persistentEntity = mappingContext.getPersistentEntity(entity.getClass());
-		MongoPersistentProperty idProperty = persistentEntity == null ? null : persistentEntity.getIdProperty();
+		MongoPersistentProperty idProperty = persistentEntity.getIdProperty();
 
 		if (idProperty == null) {
 			return;
@@ -1020,30 +925,27 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	}
 
 	protected <T> void doRemove(final String collectionName, final Query query, final Class<T> entityClass) {
-
 		if (query == null) {
 			throw new InvalidDataAccessApiUsageException("Query passed in to remove can't be null");
 		}
-
 		final DBObject queryObject = query.getQueryObject();
 		final MongoPersistentEntity<?> entity = getPersistentEntity(entityClass);
-
 		execute(collectionName, new CollectionCallback<Void>() {
 			public Void doInCollection(DBCollection collection) throws MongoException, DataAccessException {
-
 				DBObject dboq = mapper.getMappedObject(queryObject, entity);
-
+				WriteResult wr = null;
 				MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.REMOVE, collectionName,
 						entityClass, null, queryObject);
 				WriteConcern writeConcernToUse = prepareWriteConcern(mongoAction);
-
 				if (LOGGER.isDebugEnabled()) {
-					LOGGER.debug("Remove using query: {} in collection: {}.", new Object[] { dboq, collection.getName() });
+					LOGGER.debug("remove using query: " + queryObject + " in collection: " + collection.getName());
 				}
-
-				WriteResult wr = writeConcernToUse == null ? collection.remove(dboq) : collection.remove(dboq,
-						writeConcernToUse);
-				handleAnyWriteResultErrors(wr, dboq, MongoActionOperation.REMOVE);
+				if (writeConcernToUse == null) {
+					wr = collection.remove(dboq);
+				} else {
+					wr = collection.remove(dboq, writeConcernToUse);
+				}
+				handleAnyWriteResultErrors(wr, dboq, "remove");
 				return null;
 			}
 		});
@@ -1094,15 +996,26 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 			LOGGER.debug("Executing MapReduce on collection [" + command.getInput() + "], mapFunction [" + mapFunc
 					+ "], reduceFunction [" + reduceFunc + "]");
 		}
-
-		CommandResult commandResult = command.getOutputType() == MapReduceCommand.OutputType.INLINE ? executeCommand(
-				commandObject, getDb().getOptions()) : executeCommand(commandObject);
-		handleCommandError(commandResult, commandObject);
-
-		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("MapReduce command result = [{}]", serializeToJsonSafely(commandObject));
+		CommandResult commandResult = null;
+		try {
+			if (command.getOutputType() == MapReduceCommand.OutputType.INLINE) {
+				commandResult = executeCommand(commandObject, getDb().getOptions());
+			} else {
+				commandResult = executeCommand(commandObject);
+			}
+			commandResult.throwOnError();
+		} catch (RuntimeException ex) {
+			this.potentiallyConvertRuntimeException(ex);
+		}
+		String error = commandResult.getErrorMessage();
+		if (error != null) {
+			throw new InvalidDataAccessApiUsageException("Command execution failed:  Error [" + error + "], Command = "
+					+ commandObject);
 		}
 
+		if (LOGGER.isDebugEnabled()) {
+			LOGGER.debug("MapReduce command result = [" + commandResult + "]");
+		}
 		MapReduceOutput mapReduceOutput = new MapReduceOutput(inputCollection, commandObject, commandResult);
 		List<T> mappedResults = new ArrayList<T>();
 		DbObjectCallback<T> callback = new ReadDbObjectCallback<T>(mongoConverter, entityClass);
@@ -1127,7 +1040,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		if (criteria == null) {
 			dbo.put("cond", null);
 		} else {
-			dbo.put("cond", mapper.getMappedObject(criteria.getCriteriaObject(), null));
+			dbo.put("cond", criteria.getCriteriaObject());
 		}
 		// If initial document was a JavaScript string, potentially loaded by Spring's Resource abstraction, load it and
 		// convert to DBObject
@@ -1153,14 +1066,23 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		DBObject commandObject = new BasicDBObject("group", dbo);
 
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("Executing Group with DBObject [{}]", serializeToJsonSafely(commandObject));
+			LOGGER.debug("Executing Group with DBObject [" + commandObject.toString() + "]");
+		}
+		CommandResult commandResult = null;
+		try {
+			commandResult = executeCommand(commandObject, getDb().getOptions());
+			commandResult.throwOnError();
+		} catch (RuntimeException ex) {
+			this.potentiallyConvertRuntimeException(ex);
+		}
+		String error = commandResult.getErrorMessage();
+		if (error != null) {
+			throw new InvalidDataAccessApiUsageException("Command execution failed:  Error [" + error + "], Command = "
+					+ commandObject);
 		}
 
-		CommandResult commandResult = executeCommand(commandObject, getDb().getOptions());
-		handleCommandError(commandResult, commandObject);
-
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("Group command result = [{}]", commandResult);
+			LOGGER.debug("Group command result = [" + commandResult + "]");
 		}
 
 		@SuppressWarnings("unchecked")
@@ -1276,7 +1198,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 				DBCollection coll = db.createCollection(collectionName, collectionOptions);
 				// TODO: Emit a collection created event
 				if (LOGGER.isDebugEnabled()) {
-					LOGGER.debug("Created collection [{}]", coll.getFullName());
+					LOGGER.debug("Created collection [" + coll.getFullName() + "]");
 				}
 				return coll;
 			}
@@ -1304,10 +1226,14 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	}
 
 	/**
-	 * Map the results of an ad-hoc query on the default MongoDB collection to a List of the specified type. The object is
-	 * converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless configured
-	 * otherwise, an instance of SimpleMongoConverter will be used. The query document is specified as a standard DBObject
-	 * and so is the fields specification. Can be overridden by subclasses.
+	 * Map the results of an ad-hoc query on the default MongoDB collection to a List 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 SimpleMongoConverter will be used.
+	 * <p/>
+	 * The query document is specified as a standard DBObject and so is the fields specification.
+	 * <p/>
+	 * Can be overridden by subclasses.
 	 * 
 	 * @param collectionName name of the collection to retrieve the objects from
 	 * @param query the query document that specifies the criteria used to find a record
@@ -1325,21 +1251,19 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 
 	protected <S, T> List<T> doFind(String collectionName, DBObject query, DBObject fields, Class<S> entityClass,
 			CursorPreparer preparer, DbObjectCallback<T> objectCallback) {
-
 		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(entityClass);
-
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug(String.format("find using query: %s fields: %s for class: %s in collection: %s",
-					serializeToJsonSafely(query), fields, entityClass, collectionName));
+			LOGGER.debug("find using query: " + query + " fields: " + fields + " for class: " + entityClass
+					+ " in collection: " + collectionName);
 		}
-
 		return executeFindMultiInternal(new FindCallback(mapper.getMappedObject(query, entity), fields), preparer,
 				objectCallback, collectionName);
 	}
 
 	/**
-	 * Map the results of an ad-hoc query on the default MongoDB collection to a List using the template's converter. The
-	 * query document is specified as a standard DBObject and so is the fields specification.
+	 * Map the results of an ad-hoc query on the default MongoDB collection to a List using the template's converter.
+	 * <p/>
+	 * The query document is specified as a standard DBObject and so is the fields specification.
 	 * 
 	 * @param collectionName name of the collection to retrieve the objects from
 	 * @param query the query document that specifies the criteria used to find a record
@@ -1413,15 +1337,13 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 			updateObj.put(key, mongoConverter.convertToMongoType(updateObj.get(key)));
 		}
 
-		DBObject mappedQuery = mapper.getMappedObject(query, entity);
-
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("findAndModify using query: " + mappedQuery + " fields: " + fields + " sort: " + sort
-					+ " for class: " + entityClass + " and update: " + updateObj + " in collection: " + collectionName);
+			LOGGER.debug("findAndModify using query: " + query + " fields: " + fields + " sort: " + sort + " for class: "
+					+ entityClass + " and update: " + updateObj + " in collection: " + collectionName);
 		}
 
-		return executeFindOneInternal(new FindAndModifyCallback(mappedQuery, fields, sort, updateObj, options),
-				new ReadDbObjectCallback<T>(readerToUse, entityClass), collectionName);
+		return executeFindOneInternal(new FindAndModifyCallback(mapper.getMappedObject(query, entity), fields, sort,
+				updateObj, options), new ReadDbObjectCallback<T>(readerToUse, entityClass), collectionName);
 	}
 
 	/**
@@ -1436,28 +1358,20 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 			return;
 		}
 
-		if (savedObject instanceof BasicDBObject) {
-			DBObject dbObject = (DBObject) savedObject;
-			dbObject.put(ID_FIELD, id);
-			return;
-		}
-
 		MongoPersistentProperty idProp = getIdPropertyFor(savedObject.getClass());
 
 		if (idProp == null) {
 			return;
 		}
 
-		ConversionService conversionService = mongoConverter.getConversionService();
-		BeanWrapper<PersistentEntity<Object, ?>, Object> wrapper = BeanWrapper.create(savedObject, conversionService);
-
-		Object idValue = wrapper.getProperty(idProp, idProp.getType(), true);
-
-		if (idValue != null) {
+		try {
+			BeanWrapper.create(savedObject, mongoConverter.getConversionService()).setProperty(idProp, id);
 			return;
+		} catch (IllegalAccessException e) {
+			throw new MappingException(e.getMessage(), e);
+		} catch (InvocationTargetException e) {
+			throw new MappingException(e.getMessage(), e);
 		}
-
-		wrapper.setProperty(idProp, id);
 	}
 
 	private DBCollection getAndPrepareCollection(DB db, String collectionName) {
@@ -1518,32 +1432,19 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 			CursorPreparer preparer, DbObjectCallback<T> objectCallback, String collectionName) {
 
 		try {
+			DBCursor cursor = collectionCallback.doInCollection(getAndPrepareCollection(getDb(), collectionName));
 
-			DBCursor cursor = null;
-
-			try {
-
-				cursor = collectionCallback.doInCollection(getAndPrepareCollection(getDb(), collectionName));
-
-				if (preparer != null) {
-					cursor = preparer.prepare(cursor);
-				}
-
-				List<T> result = new ArrayList<T>();
-
-				while (cursor.hasNext()) {
-					DBObject object = cursor.next();
-					result.add(objectCallback.doWith(object));
-				}
-
-				return result;
-
-			} finally {
-
-				if (cursor != null) {
-					cursor.close();
-				}
+			if (preparer != null) {
+				cursor = preparer.prepare(cursor);
 			}
+
+			List<T> result = new ArrayList<T>();
+
+			for (DBObject object : cursor) {
+				result.add(objectCallback.doWith(object));
+			}
+
+			return result;
 		} catch (RuntimeException e) {
 			throw potentiallyConvertRuntimeException(e);
 		}
@@ -1553,27 +1454,15 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 			DocumentCallbackHandler callbackHandler, String collectionName) {
 
 		try {
+			DBCursor cursor = collectionCallback.doInCollection(getAndPrepareCollection(getDb(), collectionName));
 
-			DBCursor cursor = null;
-
-			try {
-				cursor = collectionCallback.doInCollection(getAndPrepareCollection(getDb(), collectionName));
-
-				if (preparer != null) {
-					cursor = preparer.prepare(cursor);
-				}
-
-				while (cursor.hasNext()) {
-					DBObject dbobject = cursor.next();
-					callbackHandler.processDocument(dbobject);
-				}
-
-			} finally {
-				if (cursor != null) {
-					cursor.close();
-				}
+			if (preparer != null) {
+				cursor = preparer.prepare(cursor);
 			}
 
+			for (DBObject dbobject : cursor) {
+				callbackHandler.processDocument(dbobject);
+			}
 		} catch (RuntimeException e) {
 			throw potentiallyConvertRuntimeException(e);
 		}
@@ -1584,8 +1473,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	}
 
 	private MongoPersistentProperty getIdPropertyFor(Class<?> type) {
-		MongoPersistentEntity<?> persistentEntity = mappingContext.getPersistentEntity(type);
-		return persistentEntity == null ? null : persistentEntity.getIdProperty();
+		return mappingContext.getPersistentEntity(type).getIdProperty();
 	}
 
 	private <T> String determineEntityCollectionName(T obj) {
@@ -1612,45 +1500,30 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	}
 
 	/**
-	 * Handles {@link WriteResult} errors based on the configured {@link WriteResultChecking}.
-	 * 
-	 * @param writeResult
-	 * @param query
-	 * @param operation
+	 * Checks and handles any errors.
+	 * <p/>
+	 * Current implementation logs errors. Future version may make this configurable to log warning, errors or throw
+	 * exception.
 	 */
-	protected void handleAnyWriteResultErrors(WriteResult writeResult, DBObject query, MongoActionOperation operation) {
+	protected void handleAnyWriteResultErrors(WriteResult wr, DBObject query, String operation) {
 
-		if (writeResultChecking == WriteResultChecking.NONE) {
+		if (WriteResultChecking.NONE == this.writeResultChecking) {
 			return;
 		}
 
-		String error = writeResult.getError();
+		String error = wr.getError();
 
-		if (error == null) {
-			return;
-		}
+		if (error != null) {
 
-		String message;
+			String message = String.format("Execution of %s%s failed: %s", operation, query == null ? "" : "' using '"
+					+ query.toString() + "' query", error);
 
-		switch (operation) {
-
-			case INSERT:
-			case SAVE:
-				message = String.format("Insert/Save for %s failed: %s", query, error);
-				break;
-			case INSERT_LIST:
-				message = String.format("Insert list failed: %s", error);
-				break;
-			default:
-				message = String.format("Execution of %s%s failed: %s", operation,
-						query == null ? "" : " using query " + query.toString(), error);
-		}
-
-		if (writeResultChecking == WriteResultChecking.EXCEPTION) {
-			throw new DataIntegrityViolationException(message);
-		} else {
-			LOGGER.error(message);
-			return;
+			if (WriteResultChecking.EXCEPTION == this.writeResultChecking) {
+				throw new DataIntegrityViolationException(message);
+			} else {
+				LOGGER.error(message);
+				return;
+			}
 		}
 	}
 
@@ -1666,27 +1539,6 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		return resolved == null ? ex : resolved;
 	}
 
-	/**
-	 * Inspects the given {@link CommandResult} for erros and potentially throws an
-	 * {@link InvalidDataAccessApiUsageException} for that error.
-	 * 
-	 * @param result must not be {@literal null}.
-	 * @param source must not be {@literal null}.
-	 */
-	private void handleCommandError(CommandResult result, DBObject source) {
-
-		try {
-			result.throwOnError();
-		} catch (MongoException ex) {
-
-			String error = result.getErrorMessage();
-			error = error == null ? "NO MESSAGE" : error;
-
-			throw new InvalidDataAccessApiUsageException("Command execution failed:  Error [" + error + "], Command = "
-					+ source, ex);
-		}
-	}
-
 	private static final MongoConverter getDefaultMongoConverter(MongoDbFactory factory) {
 		MappingMongoConverter converter = new MappingMongoConverter(factory, new MongoMappingContext());
 		converter.afterPropertiesSet();
@@ -1738,6 +1590,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	private static class FindCallback implements CollectionCallback<DBCursor> {
 
 		private final DBObject query;
+
 		private final DBObject fields;
 
 		public FindCallback(DBObject query) {
@@ -1845,13 +1698,12 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		}
 	}
 
-	private enum DefaultWriteConcernResolver implements WriteConcernResolver {
-
-		INSTANCE;
+	private class DefaultWriteConcernResolver implements WriteConcernResolver {
 
 		public WriteConcern resolve(MongoAction action) {
 			return action.getDefaultWriteConcern();
 		}
+
 	}
 
 	class QueryCursorPreparer implements CursorPreparer {
@@ -1915,7 +1767,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		 * Creates a new {@link GeoNearResultDbObjectCallback} using the given {@link DbObjectCallback} delegate for
 		 * {@link GeoResult} content unmarshalling.
 		 * 
-		 * @param delegate must not be {@literal null}.
+		 * @param delegate
 		 */
 		public GeoNearResultDbObjectCallback(DbObjectCallback<T> delegate, Metric metric) {
 			Assert.notNull(delegate);

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

@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2011 by the original author(s).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+import org.bson.types.BasicBSONList;
+import org.bson.types.ObjectId;
+import org.springframework.core.convert.ConversionException;
+import org.springframework.core.convert.ConversionService;
+import org.springframework.data.mapping.PersistentEntity;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.util.Assert;
+
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
+/**
+ * A helper class to encapsulate any modifications of a Query object before it gets submitted to the database.
+ * 
+ * @author Jon Brisbin <jbrisbin@vmware.com>
+ * @author Oliver Gierke
+ */
+public class QueryMapper {
+
+	private final ConversionService conversionService;
+	private final MongoConverter converter;
+
+	/**
+	 * Creates a new {@link QueryMapper} with the given {@link MongoConverter}.
+	 * 
+	 * @param converter must not be {@literal null}.
+	 */
+	public QueryMapper(MongoConverter converter) {
+		Assert.notNull(converter);
+		this.conversionService = converter.getConversionService();
+		this.converter = converter;
+	}
+
+	/**
+	 * Replaces the property keys used in the given {@link DBObject} with the appropriate keys by using the
+	 * {@link PersistentEntity} metadata.
+	 * 
+	 * @param query
+	 * @param entity
+	 * @return
+	 */
+	public DBObject getMappedObject(DBObject query, MongoPersistentEntity<?> entity) {
+
+		DBObject newDbo = new BasicDBObject();
+
+		for (String key : query.keySet()) {
+			String newKey = key;
+			Object value = query.get(key);
+			if (isIdKey(key, entity)) {
+				if (value instanceof DBObject) {
+					DBObject valueDbo = (DBObject) value;
+					if (valueDbo.containsField("$in") || valueDbo.containsField("$nin")) {
+						String inKey = valueDbo.containsField("$in") ? "$in" : "$nin";
+						List<Object> ids = new ArrayList<Object>();
+						for (Object id : (Iterable<?>) valueDbo.get(inKey)) {
+							ids.add(convertId(id));
+						}
+						valueDbo.put(inKey, ids.toArray(new Object[ids.size()]));
+					} else {
+						value = getMappedObject((DBObject) value, entity);
+					}
+				} else {
+					value = convertId(value);
+				}
+				newKey = "_id";
+			} else if (key.startsWith("$") && key.endsWith("or")) {
+				// $or/$nor
+				Iterable<?> conditions = (Iterable<?>) value;
+				BasicBSONList newConditions = new BasicBSONList();
+				Iterator<?> iter = conditions.iterator();
+				while (iter.hasNext()) {
+					newConditions.add(getMappedObject((DBObject) iter.next(), entity));
+				}
+				value = newConditions;
+			} else if (key.equals("$ne")) {
+				value = convertId(value);
+			} else if (value instanceof DBObject) {
+				newDbo.put(newKey, getMappedObject((DBObject) value, entity));
+				continue;
+			}
+
+			newDbo.put(newKey, converter.convertToMongoType(value));
+		}
+
+		return newDbo;
+	}
+
+	/**
+	 * Returns whether the given key will be considered an id key.
+	 * 
+	 * @param key
+	 * @param entity
+	 * @return
+	 */
+	private boolean isIdKey(String key, MongoPersistentEntity<?> entity) {
+
+		if (null != entity && entity.getIdProperty() != null) {
+			MongoPersistentProperty idProperty = entity.getIdProperty();
+			return idProperty.getName().equals(key) || idProperty.getFieldName().equals(key);
+		}
+
+		return Arrays.asList("id", "_id").contains(key);
+	}
+
+	/**
+	 * Converts the given raw id value into either {@link ObjectId} or {@link String}.
+	 * 
+	 * @param id
+	 * @return
+	 */
+	public Object convertId(Object id) {
+
+		try {
+			return conversionService.convert(id, ObjectId.class);
+		} catch (ConversionException e) {
+			// Ignore
+		}
+
+		return converter.convertToMongoType(id);
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 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.
@@ -17,6 +17,8 @@ package org.springframework.data.mongodb.core;
 
 import java.net.UnknownHostException;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.authentication.UserCredentials;
@@ -37,31 +39,40 @@ import com.mongodb.WriteConcern;
  */
 public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 
+	protected final Log logger = LogFactory.getLog(getClass());
+
 	private final Mongo mongo;
 	private final String databaseName;
-	private final boolean mongoInstanceCreated;
-	private final UserCredentials credentials;
+	private String username;
+	private String password;
 	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.
+	 * @param databaseName database name, not be {@literal null}.
 	 */
 	public SimpleMongoDbFactory(Mongo mongo, String databaseName) {
-		this(mongo, databaseName, UserCredentials.NO_CREDENTIALS, false);
+		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;
 	}
 
 	/**
 	 * 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 databaseName Database name, must not be {@literal null}.
+	 * @param userCredentials username and password must not be {@literal null}.
 	 */
-	public SimpleMongoDbFactory(Mongo mongo, String databaseName, UserCredentials credentials) {
-		this(mongo, databaseName, credentials, false);
+	public SimpleMongoDbFactory(Mongo mongo, String databaseName, UserCredentials userCredentials) {
+		this(mongo, databaseName);
+		this.username = userCredentials.getUsername();
+		this.password = userCredentials.getPassword();
 	}
 
 	/**
@@ -73,21 +84,7 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	 * @see MongoURI
 	 */
 	public SimpleMongoDbFactory(MongoURI uri) throws MongoException, UnknownHostException {
-		this(new Mongo(uri), uri.getDatabase(), new UserCredentials(uri.getUsername(), parseChars(uri.getPassword())), true);
-	}
-
-	private SimpleMongoDbFactory(Mongo mongo, String databaseName, UserCredentials credentials,
-			boolean mongoInstanceCreated) {
-
-		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(new Mongo(uri), uri.getDatabase(), new UserCredentials(uri.getUsername(), parseChars(uri.getPassword())));
 	}
 
 	/**
@@ -99,6 +96,10 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 		this.writeConcern = writeConcern;
 	}
 
+	public WriteConcern getWriteConcern() {
+		return writeConcern;
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.MongoDbFactory#getDb()
@@ -115,7 +116,7 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 
 		Assert.hasText(dbName, "Database name must not be empty.");
 
-		DB db = MongoDbUtils.getDB(mongo, dbName, credentials);
+		DB db = MongoDbUtils.getDB(mongo, dbName, username, password == null ? null : password.toCharArray());
 
 		if (writeConcern != null) {
 			db.setWriteConcern(writeConcern);
@@ -125,17 +126,17 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	}
 
 	/**
-	 * Clean up the Mongo instance if it was created by the factory itself.
-	 * 
-	 * @see DisposableBean#destroy()
+	 * Clean up the Mongo instance.
 	 */
 	public void destroy() throws Exception {
-		if (mongoInstanceCreated) {
-			mongo.close();
-		}
+		mongo.close();
 	}
 
-	private static String parseChars(char[] chars) {
-		return chars == null ? null : String.valueOf(chars);
+	public static String parseChars(char[] chars) {
+		if (chars == null) {
+			return null;
+		} else {
+			return String.valueOf(chars);
+		}
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 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.
@@ -13,25 +13,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.data.mongodb.core;
 
 import com.mongodb.WriteConcern;
 
 /**
- * A strategy interface to determine the {@link WriteConcern} to use for a given {@link MongoAction}. Return the passed
- * in default {@link WriteConcern} (a property on {@link MongoAction}) if no determination can be made.
+ * A strategy interface to determine the WriteConcern to use for a given MongoDbAction.
+ * 
+ * Return the passed in default WriteConcern (a property on MongoAction) if no determination can be made.
  * 
  * @author Mark Pollack
- * @author Oliver Gierke
+ * 
  */
 public interface WriteConcernResolver {
 
 	/**
-	 * Resolve the {@link WriteConcern} given the {@link MongoAction}.
+	 * Resolve the WriteConcern given the MongoAction
 	 * 
-	 * @param action describes the context of the Mongo action. Contains a default {@link WriteConcern} to use if one
-	 *          should not be resolved.
-	 * @return a {@link WriteConcern} based on the passed in {@link MongoAction} value, maybe {@literal null}.
+	 * @param action describes the context of the Mongo action. Contains a default WriteConcern to use if one should not
+	 *          be resolved.
+	 * @return a WriteConcern based on the passed in MongoAction value, maybe null
 	 */
 	WriteConcern resolve(MongoAction action);
 }

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

@@ -1,28 +1,5 @@
-/*
- * 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.
- * 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;
 
-/**
- * Enum to represent how strict the check of {@link com.mongodb.WriteResult} shall be. It can either be skipped entirely
- * (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, LOG, EXCEPTION
 }

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2013 the original author or authors.
+ * Copyright (c) 2011 by the original author(s).
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.data.mongodb.core.convert;
 
 import java.math.BigInteger;
@@ -22,7 +23,6 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.ConversionServiceFactory;
 import org.springframework.core.convert.support.GenericConversionService;
-import org.springframework.data.convert.EntityInstantiators;
 import org.springframework.data.mongodb.core.convert.MongoConverters.BigIntegerToObjectIdConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverters.ObjectIdToBigIntegerConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverters.ObjectIdToStringConverter;
@@ -32,14 +32,13 @@ import org.springframework.data.mongodb.core.convert.MongoConverters.StringToObj
  * Base class for {@link MongoConverter} implementations. Sets up a {@link GenericConversionService} and populates basic
  * converters. Allows registering {@link CustomConversions}.
  * 
- * @author Jon Brisbin
- * @author Oliver Gierke
+ * @author Jon Brisbin <jbrisbin@vmware.com>
+ * @author Oliver Gierke ogierke@vmware.com
  */
 public abstract class AbstractMongoConverter implements MongoConverter, InitializingBean {
 
 	protected final GenericConversionService conversionService;
 	protected CustomConversions conversions = new CustomConversions();
-	protected EntityInstantiators instantiators = new EntityInstantiators();
 
 	/**
 	 * Creates a new {@link AbstractMongoConverter} using the given {@link GenericConversionService}.
@@ -61,15 +60,6 @@ public abstract class AbstractMongoConverter implements MongoConverter, Initiali
 		this.conversions = conversions;
 	}
 
-	/**
-	 * Registers {@link EntityInstantiators} to customize entity instantiation.
-	 * 
-	 * @param instantiators
-	 */
-	public void setInstantiators(EntityInstantiators instantiators) {
-		this.instantiators = instantiators == null ? new EntityInstantiators() : instantiators;
-	}
-
 	/**
 	 * Registers additional converters that will be available when using the {@link ConversionService} directly (e.g. for
 	 * id conversion). These converters are not custom conversions as they'd introduce unwanted conversions (e.g.
@@ -93,14 +83,6 @@ public abstract class AbstractMongoConverter implements MongoConverter, Initiali
 		conversions.registerConvertersIn(conversionService);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.MongoWriter#convertToMongoType(java.lang.Object)
-	 */
-	public Object convertToMongoType(Object obj) {
-		return convertToMongoType(obj, null);
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.core.convert.MongoConverter#getConversionService()

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

@@ -22,8 +22,8 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.core.GenericTypeResolver;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.converter.Converter;
@@ -36,10 +36,10 @@ import org.springframework.data.convert.WritingConverter;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
 import org.springframework.data.mongodb.core.convert.MongoConverters.BigDecimalToStringConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverters.BigIntegerToStringConverter;
+import org.springframework.data.mongodb.core.convert.MongoConverters.BinaryToUUIDConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverters.StringToBigDecimalConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverters.StringToBigIntegerConverter;
-import org.springframework.data.mongodb.core.convert.MongoConverters.StringToURLConverter;
-import org.springframework.data.mongodb.core.convert.MongoConverters.URLToStringConverter;
+import org.springframework.data.mongodb.core.convert.MongoConverters.UUIDToBinaryConverter;
 import org.springframework.data.mongodb.core.mapping.MongoSimpleTypes;
 import org.springframework.util.Assert;
 
@@ -54,7 +54,7 @@ import org.springframework.util.Assert;
  */
 public class CustomConversions {
 
-	private static final Logger LOG = LoggerFactory.getLogger(CustomConversions.class);
+	private static final Log LOG = LogFactory.getLog(CustomConversions.class);
 	private static final String READ_CONVERTER_NOT_SIMPLE = "Registering converter from %s to %s as reading converter although it doesn't convert from a Mongo supported type! You might wanna check you annotation setup at the converter implementation.";
 	private static final String WRITE_CONVERTER_NOT_SIMPLE = "Registering converter from %s to %s as writing converter although it doesn't convert to a Mongo supported type! You might wanna check you annotation setup at the converter implementation.";
 
@@ -91,8 +91,8 @@ public class CustomConversions {
 		this.converters.add(StringToBigDecimalConverter.INSTANCE);
 		this.converters.add(BigIntegerToStringConverter.INSTANCE);
 		this.converters.add(StringToBigIntegerConverter.INSTANCE);
-		this.converters.add(URLToStringConverter.INSTANCE);
-		this.converters.add(StringToURLConverter.INSTANCE);
+		this.converters.add(UUIDToBinaryConverter.INSTANCE);
+		this.converters.add(BinaryToUUIDConverter.INSTANCE);
 		this.converters.addAll(converters);
 
 		for (Object c : this.converters) {
@@ -223,7 +223,7 @@ public class CustomConversions {
 
 	/**
 	 * Returns the target type we can write an onject of the given source type to. The returned type might be a subclass
-	 * oth the given expected type though. If {@code expectedTargetType} is {@literal null} we will simply return the
+	 * oth the given expected type though. If {@code expexctedTargetType} is {@literal null} we will simply return the
 	 * first target type matching or {@literal null} if no conversion can be found.
 	 * 
 	 * @param source must not be {@literal null}

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

@@ -0,0 +1,168 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.convert;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.springframework.data.mapping.PersistentEntity;
+import org.springframework.data.mapping.PersistentProperty;
+import org.springframework.data.mapping.PreferredConstructor;
+import org.springframework.data.mapping.PreferredConstructor.Parameter;
+import org.springframework.data.mapping.PropertyPath;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mapping.context.PersistentPropertyPath;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.util.TypeInformation;
+import org.springframework.util.Assert;
+
+/**
+ * Abstraction for a {@link PreferredConstructor} alongside mapping information.
+ * 
+ * @author Oliver Gierke
+ */
+class MappedConstructor {
+
+	private final Set<MappedConstructor.MappedParameter> parameters;
+
+	/**
+	 * Creates a new {@link MappedConstructor} from the given {@link MongoPersistentEntity} and {@link MappingContext}.
+	 * 
+	 * @param entity must not be {@literal null}.
+	 * @param context must not be {@literal null}.
+	 */
+	public MappedConstructor(MongoPersistentEntity<?> entity,
+			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> context) {
+
+		Assert.notNull(entity);
+		Assert.notNull(context);
+
+		this.parameters = new HashSet<MappedConstructor.MappedParameter>();
+
+		for (Parameter<?> parameter : entity.getPreferredConstructor().getParameters()) {
+			parameters.add(new MappedParameter(parameter, entity, context));
+		}
+	}
+
+	/**
+	 * Returns whether the given {@link PersistentProperty} is referenced in a constructor argument of the
+	 * {@link PersistentEntity} backing this {@link MappedConstructor}.
+	 * 
+	 * @param property must not be {@literal null}.
+	 * @return
+	 */
+	public boolean isConstructorParameter(PersistentProperty<?> property) {
+
+		Assert.notNull(property);
+
+		for (MappedConstructor.MappedParameter parameter : parameters) {
+			if (parameter.maps(property)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns the {@link MappedParameter} for the given {@link Parameter}.
+	 * 
+	 * @param parameter must not be {@literal null}.
+	 * @return
+	 */
+	public MappedParameter getFor(Parameter<?> parameter) {
+
+		for (MappedParameter mappedParameter : parameters) {
+			if (mappedParameter.parameter.equals(parameter)) {
+				return mappedParameter;
+			}
+		}
+
+		throw new IllegalStateException(String.format("Didn't find a MappedParameter for %s!", parameter.toString()));
+	}
+
+	/**
+	 * Abstraction of a {@link Parameter} alongside mapping information.
+	 * 
+	 * @author Oliver Gierke
+	 */
+	static class MappedParameter {
+
+		private final MongoPersistentProperty property;
+		private final Parameter<?> parameter;
+
+		/**
+		 * Creates a new {@link MappedParameter} for the given {@link Parameter}, {@link MongoPersistentProperty} and
+		 * {@link MappingContext}.
+		 * 
+		 * @param parameter must not be {@literal null}.
+		 * @param entity must not be {@literal null}.
+		 * @param context must not be {@literal null}.
+		 */
+		public MappedParameter(Parameter<?> parameter, MongoPersistentEntity<?> entity,
+				MappingContext<? extends MongoPersistentEntity<?>, ? extends MongoPersistentProperty> context) {
+
+			Assert.notNull(parameter);
+			Assert.notNull(entity);
+			Assert.notNull(context);
+
+			this.parameter = parameter;
+
+			PropertyPath propertyPath = PropertyPath.from(parameter.getName(), entity.getType());
+			PersistentPropertyPath<? extends MongoPersistentProperty> path = context.getPersistentPropertyPath(propertyPath);
+			this.property = path == null ? null : path.getLeafProperty();
+		}
+
+		/**
+		 * Returns whether there is a SpEL expression configured for this parameter.
+		 * 
+		 * @return
+		 */
+		public boolean hasSpELExpression() {
+			return parameter.getKey() != null;
+		}
+
+		/**
+		 * Returns the field name to be used to lookup the value which in turn shall be converted into the constructor
+		 * parameter.
+		 * 
+		 * @return
+		 */
+		public String getFieldName() {
+			return property.getFieldName();
+		}
+
+		/**
+		 * Returns the type of the property backing the {@link Parameter}.
+		 * 
+		 * @return
+		 */
+		public TypeInformation<?> getPropertyTypeInformation() {
+			return property.getTypeInformation();
+		}
+
+		/**
+		 * Returns whether the given {@link PersistentProperty} is mapped by the parameter.
+		 * 
+		 * @param property
+		 * @return
+		 */
+		public boolean maps(PersistentProperty<?> property) {
+			return this.property.equals(property);
+		}
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2013 by the original author(s).
+ * Copyright 2011 by the original author(s).
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,43 +15,44 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
+import java.lang.reflect.Array;
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.expression.BeanFactoryResolver;
 import org.springframework.core.CollectionFactory;
 import org.springframework.core.convert.ConversionException;
 import org.springframework.core.convert.support.ConversionServiceFactory;
-import org.springframework.data.convert.EntityInstantiator;
 import org.springframework.data.convert.TypeMapper;
 import org.springframework.data.mapping.Association;
 import org.springframework.data.mapping.AssociationHandler;
+import org.springframework.data.mapping.PreferredConstructor.Parameter;
 import org.springframework.data.mapping.PropertyHandler;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.model.BeanWrapper;
-import org.springframework.data.mapping.model.DefaultSpELExpressionEvaluator;
 import org.springframework.data.mapping.model.MappingException;
 import org.springframework.data.mapping.model.ParameterValueProvider;
-import org.springframework.data.mapping.model.PersistentEntityParameterValueProvider;
-import org.springframework.data.mapping.model.PropertyValueProvider;
-import org.springframework.data.mapping.model.SpELContext;
-import org.springframework.data.mapping.model.SpELExpressionEvaluator;
+import org.springframework.data.mapping.model.SpELAwareParameterValueProvider;
 import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.core.QueryMapper;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.TypeInformation;
+import org.springframework.expression.Expression;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
@@ -71,7 +72,7 @@ import com.mongodb.DBRef;
  */
 public class MappingMongoConverter extends AbstractMongoConverter implements ApplicationContextAware {
 
-	protected static final Logger log = LoggerFactory.getLogger(MappingMongoConverter.class);
+	protected static final Log log = LogFactory.getLog(MappingMongoConverter.class);
 
 	protected final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
 	protected final SpelExpressionParser spelExpressionParser = new SpelExpressionParser();
@@ -82,8 +83,6 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	protected MongoTypeMapper typeMapper;
 	protected String mapKeyDotReplacement = null;
 
-	private SpELContext spELContext;
-
 	/**
 	 * Creates a new {@link MappingMongoConverter} given the new {@link MongoDbFactory} and {@link MappingContext}.
 	 * 
@@ -103,8 +102,6 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		this.mappingContext = mappingContext;
 		this.typeMapper = new DefaultMongoTypeMapper(DefaultMongoTypeMapper.DEFAULT_TYPE_KEY, mappingContext);
 		this.idMapper = new QueryMapper(this);
-
-		this.spELContext = new SpELContext(DBObjectPropertyAccessor.INSTANCE);
 	}
 
 	/**
@@ -156,9 +153,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	 * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
 	 */
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-
 		this.applicationContext = applicationContext;
-		this.spELContext = new SpELContext(this.spELContext, applicationContext);
 	}
 
 	/*
@@ -169,12 +164,8 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		return read(ClassTypeInformation.from(clazz), dbo);
 	}
 
-	protected <S extends Object> S read(TypeInformation<S> type, DBObject dbo) {
-		return read(type, dbo, null);
-	}
-
 	@SuppressWarnings("unchecked")
-	protected <S extends Object> S read(TypeInformation<S> type, DBObject dbo, Object parent) {
+	protected <S extends Object> S read(TypeInformation<S> type, DBObject dbo) {
 
 		if (null == dbo) {
 			return null;
@@ -192,11 +183,11 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		}
 
 		if (typeToUse.isCollectionLike() && dbo instanceof BasicDBList) {
-			return (S) readCollectionOrArray(typeToUse, (BasicDBList) dbo, parent);
+			return (S) readCollectionOrArray(typeToUse, (BasicDBList) dbo);
 		}
 
 		if (typeToUse.isMap()) {
-			return (S) readMap(typeToUse, dbo, parent);
+			return (S) readMap(typeToUse, dbo);
 		}
 
 		// Retrieve persistent entity info
@@ -206,43 +197,37 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			throw new MappingException("No mapping metadata found for " + rawType.getName());
 		}
 
-		return read(persistentEntity, dbo, parent);
+		return read(persistentEntity, dbo);
 	}
 
-	private ParameterValueProvider<MongoPersistentProperty> getParameterProvider(MongoPersistentEntity<?> entity,
-			DBObject source, DefaultSpELExpressionEvaluator evaluator, Object parent) {
+	private <S extends Object> S read(final MongoPersistentEntity<S> entity, final DBObject dbo) {
 
-		MongoDbPropertyValueProvider provider = new MongoDbPropertyValueProvider(source, evaluator, parent);
-		PersistentEntityParameterValueProvider<MongoPersistentProperty> parameterProvider = new PersistentEntityParameterValueProvider<MongoPersistentProperty>(
-				entity, provider, parent);
-		parameterProvider.setSpELEvaluator(evaluator);
+		final StandardEvaluationContext spelCtx = new StandardEvaluationContext(dbo);
+		spelCtx.addPropertyAccessor(DBObjectPropertyAccessor.INSTANCE);
 
-		return parameterProvider;
-	}
+		if (applicationContext != null) {
+			spelCtx.setBeanResolver(new BeanFactoryResolver(applicationContext));
+		}
 
-	private <S extends Object> S read(final MongoPersistentEntity<S> entity, final DBObject dbo, Object parent) {
+		final MappedConstructor constructor = new MappedConstructor(entity, mappingContext);
 
-		final DefaultSpELExpressionEvaluator evaluator = new DefaultSpELExpressionEvaluator(dbo, spELContext);
+		SpELAwareParameterValueProvider delegate = new SpELAwareParameterValueProvider(spelExpressionParser, spelCtx);
+		ParameterValueProvider provider = new DelegatingParameterValueProvider(constructor, dbo, delegate);
 
-		ParameterValueProvider<MongoPersistentProperty> provider = getParameterProvider(entity, dbo, evaluator, parent);
-		EntityInstantiator instantiator = instantiators.getInstantiatorFor(entity);
-		S instance = instantiator.createInstance(entity, provider);
-
-		final BeanWrapper<MongoPersistentEntity<S>, S> wrapper = BeanWrapper.create(instance, conversionService);
-		final S result = wrapper.getBean();
+		final BeanWrapper<MongoPersistentEntity<S>, S> wrapper = BeanWrapper.create(entity, provider, conversionService);
 
 		// Set properties not already set in the constructor
 		entity.doWithProperties(new PropertyHandler<MongoPersistentProperty>() {
 			public void doWithPersistentProperty(MongoPersistentProperty prop) {
 
-				boolean isConstructorProperty = entity.isConstructorArgument(prop);
+				boolean isConstructorProperty = constructor.isConstructorParameter(prop);
 				boolean hasValueForProperty = dbo.containsField(prop.getFieldName());
 
 				if (!hasValueForProperty || isConstructorProperty) {
 					return;
 				}
 
-				Object obj = getValueInternal(prop, dbo, evaluator, result);
+				Object obj = getValueInternal(prop, dbo, spelCtx, prop.getSpelExpression());
 				wrapper.setProperty(prop, obj, useFieldAccessOnly);
 			}
 		});
@@ -251,30 +236,18 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		entity.doWithAssociations(new AssociationHandler<MongoPersistentProperty>() {
 			public void doWithAssociation(Association<MongoPersistentProperty> association) {
 				MongoPersistentProperty inverseProp = association.getInverse();
-				Object obj = getValueInternal(inverseProp, dbo, evaluator, result);
-
-				wrapper.setProperty(inverseProp, obj);
-
+				Object obj = getValueInternal(inverseProp, dbo, spelCtx, inverseProp.getSpelExpression());
+				try {
+					wrapper.setProperty(inverseProp, obj);
+				} catch (IllegalAccessException e) {
+					throw new MappingException(e.getMessage(), e);
+				} catch (InvocationTargetException e) {
+					throw new MappingException(e.getMessage(), e);
+				}
 			}
 		});
 
-		return result;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.MongoWriter#toDBRef(java.lang.Object, org.springframework.data.mongodb.core.mapping.MongoPersistentProperty)
-	 */
-	public DBRef toDBRef(Object object, MongoPersistentProperty referingProperty) {
-
-		org.springframework.data.mongodb.core.mapping.DBRef annotation = null;
-
-		if (referingProperty != null) {
-			annotation = referingProperty.getDBRef();
-			Assert.isTrue(annotation != null, "The referenced property has to be mapped with @DBRef!");
-		}
-
-		return createDBRef(object, annotation);
+		return wrapper.getBean();
 	}
 
 	/**
@@ -346,14 +319,13 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		}
 
 		final BeanWrapper<MongoPersistentEntity<Object>, Object> wrapper = BeanWrapper.create(obj, conversionService);
-		final MongoPersistentProperty idProperty = entity.getIdProperty();
 
+		// Write the ID
+		final MongoPersistentProperty idProperty = entity.getIdProperty();
 		if (!dbo.containsField("_id") && null != idProperty) {
 
-			boolean fieldAccessOnly = idProperty.usePropertyAccess() ? false : useFieldAccessOnly;
-
 			try {
-				Object id = wrapper.getProperty(idProperty, Object.class, fieldAccessOnly);
+				Object id = wrapper.getProperty(idProperty, Object.class, useFieldAccessOnly);
 				dbo.put("_id", idMapper.convertId(id));
 			} catch (ConversionException ignored) {
 			}
@@ -367,9 +339,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 					return;
 				}
 
-				boolean fieldAccessOnly = prop.usePropertyAccess() ? false : useFieldAccessOnly;
-
-				Object propertyObj = wrapper.getProperty(prop, prop.getType(), fieldAccessOnly);
+				Object propertyObj = wrapper.getProperty(prop, prop.getType(), useFieldAccessOnly);
 
 				if (null != propertyObj) {
 					if (!conversions.isSimpleType(propertyObj.getClass())) {
@@ -469,6 +439,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	 * 
 	 * @param collection must not be {@literal null}.
 	 * @param property must not be {@literal null}.
+	 * 
 	 * @return
 	 */
 	protected DBObject createCollection(Collection<?> collection, MongoPersistentProperty property) {
@@ -672,24 +643,12 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 
 	protected DBRef createDBRef(Object target, org.springframework.data.mongodb.core.mapping.DBRef dbref) {
 
-		Assert.notNull(target);
-
-		if (target instanceof DBRef) {
-			return (DBRef) target;
-		}
-
 		MongoPersistentEntity<?> targetEntity = mappingContext.getPersistentEntity(target.getClass());
-
-		if (null == targetEntity) {
-			throw new MappingException("No mapping metadata found for " + target.getClass());
+		if (null == targetEntity || null == targetEntity.getIdProperty()) {
+			return null;
 		}
 
 		MongoPersistentProperty idProperty = targetEntity.getIdProperty();
-
-		if (idProperty == null) {
-			throw new MappingException("No id property found on class " + targetEntity.getType());
-		}
-
 		BeanWrapper<MongoPersistentEntity<Object>, Object> wrapper = BeanWrapper.create(target, conversionService);
 		Object id = wrapper.getProperty(idProperty, Object.class, useFieldAccessOnly);
 
@@ -697,17 +656,69 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			throw new MappingException("Cannot create a reference to an object with a NULL id.");
 		}
 
-		DB db = mongoDbFactory.getDb();
-		db = dbref != null && StringUtils.hasText(dbref.db()) ? mongoDbFactory.getDb(dbref.db()) : db;
+		String collection = dbref.collection();
+		if ("".equals(collection)) {
+			collection = targetEntity.getCollection();
+		}
 
-		return new DBRef(db, targetEntity.getCollection(), idMapper.convertId(id));
+		String dbname = dbref.db();
+		DB db = StringUtils.hasText(dbname) ? mongoDbFactory.getDb(dbname) : mongoDbFactory.getDb();
+
+		return new DBRef(db, collection, idMapper.convertId(id));
 	}
 
-	protected Object getValueInternal(MongoPersistentProperty prop, DBObject dbo, SpELExpressionEvaluator eval,
-			Object parent) {
+	@SuppressWarnings("unchecked")
+	protected Object getValueInternal(MongoPersistentProperty prop, DBObject dbo, StandardEvaluationContext ctx,
+			String spelExpr) {
 
-		MongoDbPropertyValueProvider provider = new MongoDbPropertyValueProvider(dbo, spELContext, parent);
-		return provider.getPropertyValue(prop);
+		Object o;
+		if (null != spelExpr) {
+			Expression x = spelExpressionParser.parseExpression(spelExpr);
+			o = x.getValue(ctx);
+		} else {
+
+			Object sourceValue = dbo.get(prop.getFieldName());
+
+			if (sourceValue == null) {
+				return null;
+			}
+
+			Class<?> propertyType = prop.getType();
+
+			if (conversions.hasCustomReadTarget(sourceValue.getClass(), propertyType)) {
+				return conversionService.convert(sourceValue, propertyType);
+			}
+
+			if (sourceValue instanceof DBRef) {
+				sourceValue = ((DBRef) sourceValue).fetch();
+			}
+			if (sourceValue instanceof DBObject) {
+				if (prop.isMap()) {
+					return readMap(prop.getTypeInformation(), (DBObject) sourceValue);
+				} else if (prop.isArray() && sourceValue instanceof BasicDBObject
+						&& ((DBObject) sourceValue).keySet().size() == 0) {
+					// It's empty
+					return Array.newInstance(prop.getComponentType(), 0);
+				} else if (prop.isCollectionLike() && sourceValue instanceof BasicDBList) {
+					return readCollectionOrArray((TypeInformation<? extends Collection<?>>) prop.getTypeInformation(),
+							(BasicDBList) sourceValue);
+				}
+
+				TypeInformation<?> toType = typeMapper.readType((DBObject) sourceValue, prop.getTypeInformation());
+
+				// It's a complex object, have to read it in
+				if (toType != null) {
+					// TODO: why do we remove the type?
+					// dbo.removeField(CUSTOM_TYPE_KEY);
+					o = read(toType, (DBObject) sourceValue);
+				} else {
+					o = read(mappingContext.getPersistentEntity(prop.getTypeInformation()), (DBObject) sourceValue);
+				}
+			} else {
+				o = sourceValue;
+			}
+		}
+		return o;
 	}
 
 	/**
@@ -715,41 +726,32 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	 * 
 	 * @param targetType must not be {@literal null}.
 	 * @param sourceValue must not be {@literal null}.
-	 * @return the converted {@link Collection} or array, will never be {@literal null}.
+	 * @return the converted {@link Collections}, will never be {@literal null}.
 	 */
 	@SuppressWarnings("unchecked")
-	private Object readCollectionOrArray(TypeInformation<?> targetType, BasicDBList sourceValue, Object parent) {
+	private Collection<?> readCollectionOrArray(TypeInformation<?> targetType, BasicDBList sourceValue) {
 
 		Assert.notNull(targetType);
 
 		Class<?> collectionType = targetType.getType();
-
-		if (sourceValue.isEmpty()) {
-			return getPotentiallyConvertedSimpleRead(new HashSet<Object>(), collectionType);
-		}
-
 		collectionType = Collection.class.isAssignableFrom(collectionType) ? collectionType : List.class;
 
 		Collection<Object> items = targetType.getType().isArray() ? new ArrayList<Object>() : CollectionFactory
 				.createCollection(collectionType, sourceValue.size());
-		TypeInformation<?> componentType = targetType.getComponentType();
-		Class<?> rawComponentType = componentType == null ? null : componentType.getType();
 
 		for (int i = 0; i < sourceValue.size(); i++) {
-
 			Object dbObjItem = sourceValue.get(i);
-
 			if (dbObjItem instanceof DBRef) {
-				items.add(DBRef.class.equals(rawComponentType) ? dbObjItem : read(componentType, ((DBRef) dbObjItem).fetch(),
-						parent));
+				items.add(read(targetType.getComponentType(), ((DBRef) dbObjItem).fetch()));
 			} else if (dbObjItem instanceof DBObject) {
-				items.add(read(componentType, (DBObject) dbObjItem, parent));
+				items.add(read(targetType.getComponentType(), (DBObject) dbObjItem));
 			} else {
-				items.add(getPotentiallyConvertedSimpleRead(dbObjItem, rawComponentType));
+				TypeInformation<?> componentType = targetType.getComponentType();
+				items.add(getPotentiallyConvertedSimpleRead(dbObjItem, componentType == null ? null : componentType.getType()));
 			}
 		}
 
-		return getPotentiallyConvertedSimpleRead(items, targetType.getType());
+		return items;
 	}
 
 	/**
@@ -760,7 +762,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	 * @return
 	 */
 	@SuppressWarnings("unchecked")
-	protected Map<Object, Object> readMap(TypeInformation<?> type, DBObject dbObject, Object parent) {
+	protected Map<Object, Object> readMap(TypeInformation<?> type, DBObject dbObject) {
 
 		Assert.notNull(dbObject);
 
@@ -783,12 +785,9 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 
 			Object value = entry.getValue();
 			TypeInformation<?> valueType = type.getMapValueType();
-			Class<?> rawValueType = valueType == null ? null : valueType.getType();
 
 			if (value instanceof DBObject) {
-				map.put(key, read(valueType, (DBObject) value, parent));
-			} else if (value instanceof DBRef) {
-				map.put(key, DBRef.class.equals(rawValueType) ? value : read(valueType, ((DBRef) value).fetch()));
+				map.put(key, read(valueType, (DBObject) value));
 			} else {
 				Class<?> valueClass = valueType == null ? null : valueType.getType();
 				map.put(key, getPotentiallyConvertedSimpleRead(value, valueClass));
@@ -813,18 +812,14 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		return rootList;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.MongoWriter#convertToMongoType(java.lang.Object, org.springframework.data.util.TypeInformation)
-	 */
 	@SuppressWarnings("unchecked")
-	public Object convertToMongoType(Object obj, TypeInformation<?> typeInformation) {
+	public Object convertToMongoType(Object obj) {
 
 		if (obj == null) {
 			return null;
 		}
 
-		Class<?> target = conversions.getCustomWriteTarget(obj.getClass());
+		Class<?> target = conversions.getCustomWriteTarget(getClass());
 		if (target != null) {
 			return conversionService.convert(obj, target);
 		}
@@ -855,22 +850,17 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			return result;
 		}
 
+		if (obj instanceof List) {
+			return maybeConvertList((List<?>) obj);
+		}
+
 		if (obj.getClass().isArray()) {
 			return maybeConvertList(Arrays.asList((Object[]) obj));
 		}
 
-		if (obj instanceof Collection) {
-			return maybeConvertList((Collection<?>) obj);
-		}
-
 		DBObject newDbo = new BasicDBObject();
 		this.write(obj, newDbo);
-
-		if (typeInformation == null) {
-			return removeTypeInfoRecursively(newDbo);
-		}
-
-		return !obj.getClass().equals(typeInformation.getType()) ? newDbo : removeTypeInfoRecursively(newDbo);
+		return removeTypeInfoRecursively(newDbo);
 	}
 
 	public BasicDBList maybeConvertList(Iterable<?> source) {
@@ -918,53 +908,53 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		return dbObject;
 	}
 
-	private class MongoDbPropertyValueProvider implements PropertyValueProvider<MongoPersistentProperty> {
+	private class DelegatingParameterValueProvider implements ParameterValueProvider {
 
 		private final DBObject source;
-		private final SpELExpressionEvaluator evaluator;
-		private final Object parent;
+		private final ParameterValueProvider delegate;
+		private final MappedConstructor constructor;
 
-		public MongoDbPropertyValueProvider(DBObject source, SpELContext factory, Object parent) {
-			this(source, new DefaultSpELExpressionEvaluator(source, factory), parent);
-		}
-
-		public MongoDbPropertyValueProvider(DBObject source, DefaultSpELExpressionEvaluator evaluator, Object parent) {
+		/**
+		 * {@link ParameterValueProvider} to delegate source object lookup to a {@link SpELAwareParameterValueProvider} in
+		 * case a MappCon
+		 * 
+		 * @param constructor must not be {@literal null}.
+		 * @param source must not be {@literal null}.
+		 * @param delegate must not be {@literal null}.
+		 */
+		public DelegatingParameterValueProvider(MappedConstructor constructor, DBObject source,
+				SpELAwareParameterValueProvider delegate) {
 
+			Assert.notNull(constructor);
 			Assert.notNull(source);
-			Assert.notNull(evaluator);
+			Assert.notNull(delegate);
 
+			this.constructor = constructor;
 			this.source = source;
-			this.evaluator = evaluator;
-			this.parent = parent;
+			this.delegate = delegate;
 		}
 
 		/* 
 		 * (non-Javadoc)
-		 * @see org.springframework.data.convert.PropertyValueProvider#getPropertyValue(org.springframework.data.mapping.PersistentProperty)
+		 * @see org.springframework.data.mapping.model.ParameterValueProvider#getParameterValue(org.springframework.data.mapping.PreferredConstructor.Parameter)
 		 */
 		@SuppressWarnings("unchecked")
-		public <T> T getPropertyValue(MongoPersistentProperty property) {
+		public <T> T getParameterValue(Parameter<T> parameter) {
 
-			String expression = property.getSpelExpression();
-			Object value = expression != null ? evaluator.evaluate(expression) : source.get(property.getFieldName());
+			MappedConstructor.MappedParameter mappedParameter = constructor.getFor(parameter);
+			Object value = mappedParameter.hasSpELExpression() ? delegate.getParameterValue(parameter) : source
+					.get(mappedParameter.getFieldName());
 
-			if (value == null) {
-				return null;
-			}
+			TypeInformation<?> type = mappedParameter.getPropertyTypeInformation();
 
-			TypeInformation<?> type = property.getTypeInformation();
-			Class<?> rawType = type.getType();
-
-			if (conversions.hasCustomReadTarget(value.getClass(), rawType)) {
-				return (T) conversionService.convert(value, rawType);
-			} else if (value instanceof DBRef) {
-				return (T) (rawType.equals(DBRef.class) ? value : read(type, ((DBRef) value).fetch(), parent));
+			if (value instanceof DBRef) {
+				return (T) read(type, ((DBRef) value).fetch());
 			} else if (value instanceof BasicDBList) {
-				return (T) readCollectionOrArray(type, (BasicDBList) value, parent);
+				return (T) getPotentiallyConvertedSimpleRead(readCollectionOrArray(type, (BasicDBList) value), type.getType());
 			} else if (value instanceof DBObject) {
-				return (T) read(type, (DBObject) value, parent);
+				return (T) read(type, (DBObject) value);
 			} else {
-				return (T) getPotentiallyConvertedSimpleRead(value, rawType);
+				return (T) getPotentiallyConvertedSimpleRead(value, type.getType());
 			}
 		}
 	}

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

@@ -15,15 +15,18 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
+import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.net.MalformedURLException;
-import java.net.URL;
+import java.util.UUID;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.bson.BSON;
+import org.bson.types.Binary;
 import org.bson.types.ObjectId;
-import org.springframework.core.convert.ConversionFailedException;
-import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.converter.Converter;
+import org.springframework.data.mapping.model.MappingException;
 import org.springframework.util.StringUtils;
 
 /**
@@ -124,26 +127,50 @@ abstract class MongoConverters {
 		}
 	}
 
-	public static enum URLToStringConverter implements Converter<URL, String> {
+	/**
+	 * Custom {@link Converter} to convert {@link UUID}s into {@link Binary}s.
+	 * 
+	 * @author Oliver Gierke
+	 */
+	public static enum UUIDToBinaryConverter implements Converter<UUID, Binary> {
+
 		INSTANCE;
 
-		public String convert(URL source) {
-			return source == null ? null : source.toString();
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
+		 */
+		public Binary convert(UUID source) {
+
+			try {
+				return source == null ? null : new Binary(BSON.B_UUID, source.toString().getBytes("UTF-8"));
+			} catch (UnsupportedEncodingException e) {
+				throw new MappingException(String.format("Could nor convert UUID %s into Binary!", source.toString()), e);
+			}
 		}
 	}
 
-	public static enum StringToURLConverter implements Converter<String, URL> {
+	public static enum BinaryToUUIDConverter implements Converter<Binary, UUID> {
+
 		INSTANCE;
 
-		private static final TypeDescriptor SOURCE = TypeDescriptor.valueOf(String.class);
-		private static final TypeDescriptor TARGET = TypeDescriptor.valueOf(URL.class);
+		private static final Log LOG = LogFactory.getLog(BinaryToUUIDConverter.class);
 
-		public URL convert(String source) {
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
+		 */
+		public UUID convert(Binary source) {
+
+			if (BSON.B_UUID != source.getType()) {
+				LOG.warn(String.format("Source binary %s is not an UUID actually! Trying to read it nevertheless...",
+						source.toString()));
+			}
 
 			try {
-				return source == null ? null : new URL(source);
-			} catch (MalformedURLException e) {
-				throw new ConversionFailedException(SOURCE, TARGET, source, e);
+				return source == null ? null : UUID.fromString(new String(source.getData(), "UTF-8"));
+			} catch (UnsupportedEncodingException e) {
+				throw new MappingException(String.format("Could not convert Binary %s into UUID!", source.toString()), e);
 			}
 		}
 	}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 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.
@@ -16,11 +16,8 @@
 package org.springframework.data.mongodb.core.convert;
 
 import org.springframework.data.convert.EntityWriter;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.data.util.TypeInformation;
 
 import com.mongodb.DBObject;
-import com.mongodb.DBRef;
 
 /**
  * A MongoWriter is responsible for converting an object of type T to the native MongoDB representation DBObject.
@@ -36,28 +33,8 @@ public interface MongoWriter<T> extends EntityWriter<T, DBObject> {
 	 * Converts the given object into one Mongo will be able to store natively. If the given object can already be stored
 	 * as is, no conversion will happen.
 	 * 
-	 * @param obj can be {@literal null}.
+	 * @param obj
 	 * @return
 	 */
 	Object convertToMongoType(Object obj);
-
-	/**
-	 * Converts the given object into one Mongo will be able to store natively but retains the type information in case
-	 * the given {@link TypeInformation} differs from the given object type.
-	 * 
-	 * @param obj can be {@literal null}.
-	 * @param typeInformation can be {@literal null}.
-	 * @return
-	 */
-	Object convertToMongoType(Object obj, TypeInformation<?> typeInformation);
-
-	/**
-	 * Creates a {@link DBRef} to refer to the given object.
-	 * 
-	 * @param object the object to create a {@link DBRef} to link to. The object's type has to carry an id attribute.
-	 * @param referingProperty the client-side property referring to the object which might carry additional metadata for
-	 *          the {@link DBRef} object to create. Can be {@literal null}.
-	 * @return will never be {@literal null}.
-	 */
-	DBRef toDBRef(Object object, MongoPersistentProperty referingProperty);
 }

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

@@ -1,347 +0,0 @@
-/*
- * Copyright 2011-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.convert;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.bson.types.ObjectId;
-import org.springframework.core.convert.ConversionException;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.data.mapping.PersistentEntity;
-import org.springframework.data.mapping.PropertyPath;
-import org.springframework.data.mapping.PropertyReferenceException;
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.mapping.context.PersistentPropertyPath;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.util.Assert;
-
-import com.mongodb.BasicDBList;
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-import com.mongodb.DBRef;
-
-/**
- * A helper class to encapsulate any modifications of a Query object before it gets submitted to the database.
- * 
- * @author Jon Brisbin
- * @author Oliver Gierke
- */
-public class QueryMapper {
-
-	private static final List<String> DEFAULT_ID_NAMES = Arrays.asList("id", "_id");
-	private static final String N_OR_PATTERN = "\\$.*or";
-
-	private final ConversionService conversionService;
-	private final MongoConverter converter;
-	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
-
-	/**
-	 * Creates a new {@link QueryMapper} with the given {@link MongoConverter}.
-	 * 
-	 * @param converter must not be {@literal null}.
-	 */
-	public QueryMapper(MongoConverter converter) {
-
-		Assert.notNull(converter);
-
-		this.conversionService = converter.getConversionService();
-		this.converter = converter;
-		this.mappingContext = converter.getMappingContext();
-	}
-
-	/**
-	 * Replaces the property keys used in the given {@link DBObject} with the appropriate keys by using the
-	 * {@link PersistentEntity} metadata.
-	 * 
-	 * @param query must not be {@literal null}.
-	 * @param entity can be {@literal null}.
-	 * @return
-	 */
-	public DBObject getMappedObject(DBObject query, MongoPersistentEntity<?> entity) {
-
-		if (Keyword.isKeyword(query)) {
-			return getMappedKeyword(new Keyword(query), entity);
-		}
-
-		DBObject result = new BasicDBObject();
-
-		for (String key : query.keySet()) {
-
-			MongoPersistentProperty targetProperty = getTargetProperty(key, entity);
-			String newKey = determineKey(key, entity);
-			Object value = query.get(key);
-
-			result.put(newKey, getMappedValue(value, targetProperty, newKey));
-		}
-
-		return result;
-	}
-
-	/**
-	 * Returns the given {@link DBObject} representing a keyword by mapping the keyword's value.
-	 * 
-	 * @param query the {@link DBObject} representing a keyword (e.g. {@code $ne : … } )
-	 * @param entity
-	 * @return
-	 */
-	private DBObject getMappedKeyword(Keyword query, MongoPersistentEntity<?> entity) {
-
-		// $or/$nor
-		if (query.key.matches(N_OR_PATTERN)) {
-
-			Iterable<?> conditions = (Iterable<?>) query.value;
-			BasicDBList newConditions = new BasicDBList();
-
-			for (Object condition : conditions) {
-				newConditions.add(getMappedObject((DBObject) condition, entity));
-			}
-
-			return new BasicDBObject(query.key, newConditions);
-		}
-
-		return new BasicDBObject(query.key, convertSimpleOrDBObject(query.value, entity));
-	}
-
-	/**
-	 * Returns the mapped keyword considered defining a criteria for the given property.
-	 * 
-	 * @param keyword
-	 * @param property
-	 * @return
-	 */
-	public DBObject getMappedKeyword(Keyword keyword, MongoPersistentProperty property) {
-
-		if (property.isAssociation()) {
-			convertAssociation(keyword.value, property);
-		}
-
-		return new BasicDBObject(keyword.key, getMappedValue(keyword.value, property, keyword.key));
-	}
-
-	/**
-	 * Returns the mapped value for the given source object assuming it's a value for the given
-	 * {@link MongoPersistentProperty}.
-	 * 
-	 * @param source the source object to be mapped
-	 * @param property the property the value is a value for
-	 * @param newKey the key the value will be bound to eventually
-	 * @return
-	 */
-	private Object getMappedValue(Object source, MongoPersistentProperty property, String newKey) {
-
-		if (property == null) {
-			return convertSimpleOrDBObject(source, null);
-		}
-
-		if (property.isIdProperty() || "_id".equals(newKey)) {
-
-			if (source instanceof DBObject) {
-				DBObject valueDbo = (DBObject) source;
-				if (valueDbo.containsField("$in") || valueDbo.containsField("$nin")) {
-					String inKey = valueDbo.containsField("$in") ? "$in" : "$nin";
-					List<Object> ids = new ArrayList<Object>();
-					for (Object id : (Iterable<?>) valueDbo.get(inKey)) {
-						ids.add(convertId(id));
-					}
-					valueDbo.put(inKey, ids.toArray(new Object[ids.size()]));
-				} else if (valueDbo.containsField("$ne")) {
-					valueDbo.put("$ne", convertId(valueDbo.get("$ne")));
-				} else {
-					return getMappedObject((DBObject) source, null);
-				}
-
-				return valueDbo;
-
-			} else {
-				return convertId(source);
-			}
-		}
-
-		if (property.isAssociation()) {
-			return Keyword.isKeyword(source) ? getMappedKeyword(new Keyword(source), property) : convertAssociation(source,
-					property);
-		}
-
-		return convertSimpleOrDBObject(source, mappingContext.getPersistentEntity(property));
-	}
-
-	private MongoPersistentProperty getTargetProperty(String key, MongoPersistentEntity<?> entity) {
-
-		if (isIdKey(key, entity)) {
-			return entity.getIdProperty();
-		}
-
-		PersistentPropertyPath<MongoPersistentProperty> path = getPath(key, entity);
-		return path == null ? null : path.getLeafProperty();
-	}
-
-	private PersistentPropertyPath<MongoPersistentProperty> getPath(String key, MongoPersistentEntity<?> entity) {
-
-		if (entity == null) {
-			return null;
-		}
-
-		try {
-			PropertyPath path = PropertyPath.from(key, entity.getTypeInformation());
-			return mappingContext.getPersistentPropertyPath(path);
-		} catch (PropertyReferenceException e) {
-			return null;
-		}
-	}
-
-	/**
-	 * Returns the translated key assuming the given one is a propert (path) reference.
-	 * 
-	 * @param key the source key
-	 * @param entity the base entity
-	 * @return the translated key
-	 */
-	private String determineKey(String key, MongoPersistentEntity<?> entity) {
-
-		if (entity == null && DEFAULT_ID_NAMES.contains(key)) {
-			return "_id";
-		}
-
-		PersistentPropertyPath<MongoPersistentProperty> path = getPath(key, entity);
-		return path == null ? key : path.toDotPath(MongoPersistentProperty.PropertyToFieldNameConverter.INSTANCE);
-	}
-
-	/**
-	 * Retriggers mapping if the given source is a {@link DBObject} or simply invokes the
-	 * 
-	 * @param source
-	 * @param entity
-	 * @return
-	 */
-	private Object convertSimpleOrDBObject(Object source, MongoPersistentEntity<?> entity) {
-
-		if (source instanceof BasicDBList) {
-			return converter.convertToMongoType(source);
-		}
-
-		if (source instanceof DBObject) {
-			return getMappedObject((DBObject) source, entity);
-		}
-
-		return converter.convertToMongoType(source);
-	}
-
-	/**
-	 * Converts the given source assuming it's actually an association to anoter object.
-	 * 
-	 * @param source
-	 * @param property
-	 * @return
-	 */
-	private Object convertAssociation(Object source, MongoPersistentProperty property) {
-
-		if (property == null || !property.isAssociation()) {
-			return source;
-		}
-
-		if (source instanceof Iterable) {
-			BasicDBList result = new BasicDBList();
-			for (Object element : (Iterable<?>) source) {
-				result.add(element instanceof DBRef ? element : converter.toDBRef(element, property));
-			}
-			return result;
-		}
-
-		return source == null || source instanceof DBRef ? source : converter.toDBRef(source, property);
-	}
-
-	/**
-	 * Returns whether the given key will be considered an id key.
-	 * 
-	 * @param key
-	 * @param entity
-	 * @return
-	 */
-	private boolean isIdKey(String key, MongoPersistentEntity<?> entity) {
-
-		if (entity == null) {
-			return false;
-		}
-
-		MongoPersistentProperty idProperty = entity.getIdProperty();
-
-		if (idProperty != null) {
-			return idProperty.getName().equals(key) || idProperty.getFieldName().equals(key);
-		}
-
-		return DEFAULT_ID_NAMES.contains(key);
-	}
-
-	/**
-	 * Converts the given raw id value into either {@link ObjectId} or {@link String}.
-	 * 
-	 * @param id
-	 * @return
-	 */
-	public Object convertId(Object id) {
-
-		try {
-			return conversionService.convert(id, ObjectId.class);
-		} catch (ConversionException e) {
-			// Ignore
-		}
-
-		return converter.convertToMongoType(id);
-	}
-
-	/**
-	 * Value object to capture a query keyword representation.
-	 * 
-	 * @author Oliver Gierke
-	 */
-	private static class Keyword {
-
-		String key;
-		Object value;
-
-		Keyword(Object source) {
-
-			Assert.isInstanceOf(DBObject.class, source);
-
-			DBObject value = (DBObject) source;
-
-			Assert.isTrue(value.keySet().size() == 1, "Keyword must have a single key only!");
-
-			this.key = value.keySet().iterator().next();
-			this.value = value.get(key);
-		}
-
-		/**
-		 * Returns whether the given value actually represents a keyword. If this returns {@literal true} it's safe to call
-		 * the constructor.
-		 * 
-		 * @param value
-		 * @return
-		 */
-		static boolean isKeyword(Object value) {
-
-			if (!(value instanceof DBObject)) {
-				return false;
-			}
-
-			DBObject dbObject = (DBObject) value;
-			return dbObject.keySet().size() == 1 && dbObject.keySet().iterator().next().startsWith("$");
-		}
-	}
-}

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ * Copyright (c) 2011 by the original author(s).
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.data.mongodb.core.index;
 
-import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -24,29 +24,14 @@ import java.lang.annotation.Target;
 /**
  * Mark a class to use compound indexes.
  * 
- * @author Jon Brisbin
- * @author Oliver Gierke
+ * @author Jon Brisbin <jbrisbin@vmware.com>
  */
 @Target({ ElementType.TYPE })
-@Documented
 @Retention(RetentionPolicy.RUNTIME)
 public @interface CompoundIndex {
 
-	/**
-	 * The actual index definition in JSON format. The keys of the JSON document are the fields to be indexed, the values
-	 * define the index direction (1 for ascending, -1 for descending).
-	 * 
-	 * @return
-	 */
 	String def();
 
-	/**
-	 * It does not actually make sense to use that attribute as the direction has to be defined in the {@link #def()}
-	 * attribute actually.
-	 * 
-	 * @return
-	 */
-	@Deprecated
 	IndexDirection direction() default IndexDirection.ASCENDING;
 
 	boolean unique() default false;
@@ -55,18 +40,8 @@ public @interface CompoundIndex {
 
 	boolean dropDups() default false;
 
-	/**
-	 * The name of the index to be created.
-	 * 
-	 * @return
-	 */
 	String name() default "";
 
-	/**
-	 * The collection the index will be created in. Will default to the collection the annotated domain class will be
-	 * stored in.
-	 * 
-	 * @return
-	 */
 	String collection() default "";
+
 }

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

@@ -1,132 +0,0 @@
-/*
- * 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.
- * 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.index;
-
-import org.springframework.data.mongodb.core.query.Order;
-import org.springframework.util.Assert;
-import org.springframework.util.ObjectUtils;
-
-/**
- * Value object for an index field.
- * 
- * @author Oliver Gierke
- */
-public final class IndexField {
-
-	private final String key;
-	private final Order order;
-	private final boolean isGeo;
-
-	private IndexField(String key, Order order, boolean isGeo) {
-
-		Assert.hasText(key);
-		Assert.isTrue(order != null ^ isGeo);
-
-		this.key = key;
-		this.order = order;
-		this.isGeo = isGeo;
-	}
-
-	/**
-	 * Creates a default {@link IndexField} with the given key and {@link Order}.
-	 * 
-	 * @param key must not be {@literal null} or emtpy.
-	 * @param order must not be {@literal null}.
-	 * @return
-	 */
-	public static IndexField create(String key, Order order) {
-		Assert.notNull(order);
-		return new IndexField(key, order, false);
-	}
-
-	/**
-	 * Creates a geo {@link IndexField} for the given key.
-	 * 
-	 * @param key must not be {@literal null} or empty.
-	 * @return
-	 */
-	public static IndexField geo(String key) {
-		return new IndexField(key, null, true);
-	}
-
-	/**
-	 * @return the key
-	 */
-	public String getKey() {
-		return key;
-	}
-
-	/**
-	 * Returns the order of the {@link IndexField} or {@literal null} in case we have a geo index field.
-	 * 
-	 * @return the order
-	 */
-	public Order getOrder() {
-		return order;
-	}
-
-	/**
-	 * Returns whether the {@link IndexField} is a geo index field.
-	 * 
-	 * @return the isGeo
-	 */
-	public boolean isGeo() {
-		return isGeo;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object obj) {
-
-		if (this == obj) {
-			return true;
-		}
-
-		if (!(obj instanceof IndexField)) {
-			return false;
-		}
-
-		IndexField that = (IndexField) obj;
-
-		return this.key.equals(that.key) && ObjectUtils.nullSafeEquals(this.order, that.order) && this.isGeo == that.isGeo;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-
-		int result = 17;
-		result += 31 * ObjectUtils.nullSafeHashCode(key);
-		result += 31 * ObjectUtils.nullSafeHashCode(order);
-		result += 31 * ObjectUtils.nullSafeHashCode(isGeo);
-		return result;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return String.format("IndexField [ key: %s, order: %s, isGeo: %s]", key, order, isGeo);
-	}
-}

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

@@ -15,57 +15,33 @@
  */
 package org.springframework.data.mongodb.core.index;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.Map;
 
-import org.springframework.util.Assert;
-import org.springframework.util.ObjectUtils;
+import org.springframework.data.mongodb.core.query.Order;
 
 public class IndexInfo {
 
-	private final List<IndexField> indexFields;
+	private final Map<String, Order> fieldSpec;
 
-	private final String name;
-	private final boolean unique;
-	private final boolean dropDuplicates;
-	private final boolean sparse;
+	private String name;
 
-	public IndexInfo(List<IndexField> indexFields, String name, boolean unique, boolean dropDuplicates, boolean sparse) {
+	private boolean unique = false;
 
-		this.indexFields = Collections.unmodifiableList(indexFields);
+	private boolean dropDuplicates = false;
+
+	private boolean sparse = false;
+
+	public IndexInfo(Map<String, Order> fieldSpec, String name, boolean unique, boolean dropDuplicates, boolean sparse) {
+		super();
+		this.fieldSpec = fieldSpec;
 		this.name = name;
 		this.unique = unique;
 		this.dropDuplicates = dropDuplicates;
 		this.sparse = sparse;
 	}
 
-	/**
-	 * Returns the individual index fields of the index.
-	 * 
-	 * @return
-	 */
-	public List<IndexField> getIndexFields() {
-		return this.indexFields;
-	}
-
-	/**
-	 * Returns whether the index is covering exactly the fields given independently of the order.
-	 * 
-	 * @param keys must not be {@literal null}.
-	 * @return
-	 */
-	public boolean isIndexForFields(Collection<String> keys) {
-
-		Assert.notNull(keys);
-		List<String> indexKeys = new ArrayList<String>(indexFields.size());
-
-		for (IndexField field : indexFields) {
-			indexKeys.add(field.getKey());
-		}
-
-		return indexKeys.containsAll(keys);
+	public Map<String, Order> getFieldSpec() {
+		return fieldSpec;
 	}
 
 	public String getName() {
@@ -86,7 +62,7 @@ public class IndexInfo {
 
 	@Override
 	public String toString() {
-		return "IndexInfo [indexFields=" + indexFields + ", name=" + name + ", unique=" + unique + ", dropDuplicates="
+		return "IndexInfo [fieldSpec=" + fieldSpec + ", name=" + name + ", unique=" + unique + ", dropDuplicates="
 				+ dropDuplicates + ", sparse=" + sparse + "]";
 	}
 
@@ -95,7 +71,7 @@ public class IndexInfo {
 		final int prime = 31;
 		int result = 1;
 		result = prime * result + (dropDuplicates ? 1231 : 1237);
-		result = prime * result + ObjectUtils.nullSafeHashCode(indexFields);
+		result = prime * result + ((fieldSpec == null) ? 0 : fieldSpec.hashCode());
 		result = prime * result + ((name == null) ? 0 : name.hashCode());
 		result = prime * result + (sparse ? 1231 : 1237);
 		result = prime * result + (unique ? 1231 : 1237);
@@ -104,39 +80,34 @@ public class IndexInfo {
 
 	@Override
 	public boolean equals(Object obj) {
-		if (this == obj) {
+		if (this == obj)
 			return true;
-		}
-		if (obj == null) {
+		if (obj == null)
 			return false;
-		}
-		if (getClass() != obj.getClass()) {
+		if (getClass() != obj.getClass())
 			return false;
-		}
 		IndexInfo other = (IndexInfo) obj;
-		if (dropDuplicates != other.dropDuplicates) {
+		if (dropDuplicates != other.dropDuplicates)
 			return false;
-		}
-		if (indexFields == null) {
-			if (other.indexFields != null) {
+		if (fieldSpec == null) {
+			if (other.fieldSpec != null)
 				return false;
-			}
-		} else if (!indexFields.equals(other.indexFields)) {
+		} else if (!fieldSpec.equals(other.fieldSpec))
 			return false;
-		}
 		if (name == null) {
-			if (other.name != null) {
+			if (other.name != null)
 				return false;
-			}
-		} else if (!name.equals(other.name)) {
+		} else if (!name.equals(other.name))
 			return false;
-		}
-		if (sparse != other.sparse) {
+		if (sparse != other.sparse)
 			return false;
-		}
-		if (unique != other.unique) {
+		if (unique != other.unique)
 			return false;
-		}
 		return true;
 	}
+
+	/**
+	 * [{ "v" : 1 , "key" : { "_id" : 1} , "ns" : "database.person" , "name" : "_id_"}, { "v" : 1 , "key" : { "age" : -1}
+	 * , "ns" : "database.person" , "name" : "age_-1" , "unique" : true , "dropDups" : true}]
+	 */
 }

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ * Copyright (c) 2011 by the original author(s).
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,51 +13,37 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.data.mongodb.core.index;
 
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.data.mapping.context.MappingContextEvent;
-import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mapping.event.MappingContextEvent;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.data.mongodb.core.mapping.event.AfterLoadEvent;
-import org.springframework.data.mongodb.core.mapping.event.AfterSaveEvent;
-import org.springframework.util.Assert;
 
 /**
- * An implementation of ApplicationEventPublisher that will only fire {@link MappingContextEvent}s for use by the index
- * creator when MongoTemplate is used 'stand-alone', that is not declared inside a Spring {@link ApplicationContext}.
- * Declare {@link MongoTemplate} inside an {@link ApplicationContext} to enable the publishing of all persistence events
- * such as {@link AfterLoadEvent}, {@link AfterSaveEvent}, etc.
+ * An implementation of ApplicationEventPublisher that will only fire MappingContextEvents for use by the index creator
+ * when MongoTemplate is used 'stand-alone', that is not declared inside a Spring ApplicationContext.
  * 
- * @author Jon Brisbin
- * @author Oliver Gierke
+ * Declare MongoTemplate inside an ApplicationContext to enable the publishing of all persistence events such as
+ * {@link AfterLoadEvent}, {@link AfterSaveEvent}, etc.
+ * 
+ * @author Jon Brisbin <jbrisbin@vmware.com>
  */
 public class MongoMappingEventPublisher implements ApplicationEventPublisher {
 
-	private final MongoPersistentEntityIndexCreator indexCreator;
+	private MongoPersistentEntityIndexCreator indexCreator;
 
-	/**
-	 * Creates a new {@link MongoMappingEventPublisher} for the given {@link MongoPersistentEntityIndexCreator}.
-	 * 
-	 * @param indexCreator must not be {@literal null}.
-	 */
 	public MongoMappingEventPublisher(MongoPersistentEntityIndexCreator indexCreator) {
-
-		Assert.notNull(indexCreator);
 		this.indexCreator = indexCreator;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.ApplicationEventPublisher#publishEvent(org.springframework.context.ApplicationEvent)
-	 */
 	@SuppressWarnings("unchecked")
 	public void publishEvent(ApplicationEvent event) {
 		if (event instanceof MappingContextEvent) {
-			indexCreator.onApplicationEvent((MappingContextEvent<MongoPersistentEntity<?>, MongoPersistentProperty>) event);
+			indexCreator
+					.onApplicationEvent((MappingContextEvent<MongoPersistentEntity<MongoPersistentProperty>, MongoPersistentProperty>) event);
 		}
 	}
 }

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ * Copyright (c) 2011 by the original author(s).
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.data.mongodb.core.index;
 
 import java.lang.reflect.Field;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.context.ApplicationListener;
-import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.PropertyHandler;
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.mapping.context.MappingContextEvent;
+import org.springframework.data.mapping.event.MappingContextEvent;
 import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.core.mapping.BasicMongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
@@ -38,35 +38,32 @@ import com.mongodb.DBObject;
 import com.mongodb.util.JSON;
 
 /**
- * Component that inspects {@link MongoPersistentEntity} instances contained in the given {@link MongoMappingContext}
- * for indexing metadata and ensures the indexes to be available.
+ * Component that inspects {@link BasicMongoPersistentEntity} instances contained in the given
+ * {@link MongoMappingContext} for indexing metadata and ensures the indexes to be available.
  * 
- * @author Jon Brisbin
+ * @author Jon Brisbin <jbrisbin@vmware.com>
  * @author Oliver Gierke
  */
 public class MongoPersistentEntityIndexCreator implements
-		ApplicationListener<MappingContextEvent<MongoPersistentEntity<?>, MongoPersistentProperty>> {
+		ApplicationListener<MappingContextEvent<MongoPersistentEntity<MongoPersistentProperty>, MongoPersistentProperty>> {
 
-	private static final Logger log = LoggerFactory.getLogger(MongoPersistentEntityIndexCreator.class);
+	private static final Log log = LogFactory.getLog(MongoPersistentEntityIndexCreator.class);
 
 	private final Map<Class<?>, Boolean> classesSeen = new ConcurrentHashMap<Class<?>, Boolean>();
 	private final MongoDbFactory mongoDbFactory;
-	private final MongoMappingContext mappingContext;
 
 	/**
 	 * Creats a new {@link MongoPersistentEntityIndexCreator} for the given {@link MongoMappingContext} and
 	 * {@link MongoDbFactory}.
 	 * 
-	 * @param mappingContext must not be {@literal null}
-	 * @param mongoDbFactory must not be {@literal null}
+	 * @param mappingContext must not be {@@iteral null}
+	 * @param mongoDbFactory must not be {@@iteral null}
 	 */
 	public MongoPersistentEntityIndexCreator(MongoMappingContext mappingContext, MongoDbFactory mongoDbFactory) {
 
 		Assert.notNull(mongoDbFactory);
 		Assert.notNull(mappingContext);
-
 		this.mongoDbFactory = mongoDbFactory;
-		this.mappingContext = mappingContext;
 
 		for (MongoPersistentEntity<?> entity : mappingContext.getPersistentEntities()) {
 			checkForIndexes(entity);
@@ -77,18 +74,9 @@ public class MongoPersistentEntityIndexCreator implements
 	 * (non-Javadoc)
 	 * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.springframework.context.ApplicationEvent)
 	 */
-	public void onApplicationEvent(MappingContextEvent<MongoPersistentEntity<?>, MongoPersistentProperty> event) {
-
-		if (!event.wasEmittedBy(mappingContext)) {
-			return;
-		}
-
-		PersistentEntity<?, ?> entity = event.getPersistentEntity();
-
-		// Double check type as Spring infrastructure does not consider nested generics
-		if (entity instanceof MongoPersistentEntity) {
-			checkForIndexes(event.getPersistentEntity());
-		}
+	public void onApplicationEvent(
+			MappingContextEvent<MongoPersistentEntity<MongoPersistentProperty>, MongoPersistentProperty> event) {
+		checkForIndexes(event.getPersistentEntity());
 	}
 
 	protected void checkForIndexes(final MongoPersistentEntity<?> entity) {
@@ -102,12 +90,12 @@ public class MongoPersistentEntityIndexCreator implements
 			if (type.isAnnotationPresent(CompoundIndexes.class)) {
 				CompoundIndexes indexes = type.getAnnotation(CompoundIndexes.class);
 				for (CompoundIndex index : indexes.value()) {
-
-					String indexColl = StringUtils.hasText(index.collection()) ? index.collection() : entity.getCollection();
-					DBObject definition = (DBObject) JSON.parse(index.def());
-
-					ensureIndex(indexColl, index.name(), definition, index.unique(), index.dropDups(), index.sparse());
-
+					String indexColl = index.collection();
+					if ("".equals(indexColl)) {
+						indexColl = entity.getCollection();
+					}
+					ensureIndex(indexColl, index.name(), index.def(), index.direction(), index.unique(), index.dropDups(),
+							index.sparse());
 					if (log.isDebugEnabled()) {
 						log.debug("Created compound index " + index);
 					}
@@ -116,14 +104,10 @@ public class MongoPersistentEntityIndexCreator implements
 
 			entity.doWithProperties(new PropertyHandler<MongoPersistentProperty>() {
 				public void doWithPersistentProperty(MongoPersistentProperty persistentProperty) {
-
 					Field field = persistentProperty.getField();
-
 					if (field.isAnnotationPresent(Indexed.class)) {
-
 						Indexed index = field.getAnnotation(Indexed.class);
 						String name = index.name();
-
 						if (!StringUtils.hasText(name)) {
 							name = persistentProperty.getFieldName();
 						} else {
@@ -135,17 +119,11 @@ public class MongoPersistentEntityIndexCreator implements
 								}
 							}
 						}
-
 						String collection = StringUtils.hasText(index.collection()) ? index.collection() : entity.getCollection();
-						int direction = index.direction() == IndexDirection.ASCENDING ? 1 : -1;
-						DBObject definition = new BasicDBObject(persistentProperty.getFieldName(), direction);
-
-						ensureIndex(collection, name, definition, index.unique(), index.dropDups(), index.sparse());
-
+						ensureIndex(collection, name, null, index.direction(), index.unique(), index.dropDups(), index.sparse());
 						if (log.isDebugEnabled()) {
 							log.debug("Created property index " + index);
 						}
-
 					} else if (field.isAnnotationPresent(GeoSpatialIndexed.class)) {
 
 						GeoSpatialIndexed index = field.getAnnotation(GeoSpatialIndexed.class);
@@ -170,35 +148,21 @@ public class MongoPersistentEntityIndexCreator implements
 		}
 	}
 
-	/**
-	 * Returns whether the current index creator was registered for the given {@link MappingContext}.
-	 * 
-	 * @param context
-	 * @return
-	 */
-	public boolean isIndexCreatorFor(MappingContext<?, ?> context) {
-		return this.mappingContext.equals(context);
-	}
-
-	/**
-	 * Triggers the actual index creation.
-	 * 
-	 * @param collection the collection to create the index in
-	 * @param name the name of the index about to be created
-	 * @param indexDefinition the index definition
-	 * @param unique whether it shall be a unique index
-	 * @param dropDups whether to drop duplicates
-	 * @param sparse sparse or not
-	 */
-	protected void ensureIndex(String collection, String name, DBObject indexDefinition, boolean unique,
-			boolean dropDups, boolean sparse) {
-
+	protected void ensureIndex(String collection, final String name, final String def, final IndexDirection direction,
+			final boolean unique, final boolean dropDups, final boolean sparse) {
+		DBObject defObj;
+		if (null != def) {
+			defObj = (DBObject) JSON.parse(def);
+		} else {
+			defObj = new BasicDBObject();
+			defObj.put(name, (direction == IndexDirection.ASCENDING ? 1 : -1));
+		}
 		DBObject opts = new BasicDBObject();
 		opts.put("name", name);
 		opts.put("dropDups", dropDups);
 		opts.put("sparse", sparse);
 		opts.put("unique", unique);
-
-		mongoDbFactory.getDb().getCollection(collection).ensureIndex(indexDefinition, opts);
+		mongoDbFactory.getDb().getCollection(collection).ensureIndex(defObj, opts);
 	}
+
 }

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ * Copyright (c) 2011 by the original author(s).
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.data.mongodb.core.mapping;
 
 import java.util.Comparator;
@@ -22,8 +23,8 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.expression.BeanFactoryAccessor;
 import org.springframework.context.expression.BeanFactoryResolver;
+import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.model.BasicPersistentEntity;
-import org.springframework.data.mapping.model.MappingException;
 import org.springframework.data.mongodb.MongoCollectionUtils;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.expression.Expression;
@@ -33,12 +34,11 @@ import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.util.StringUtils;
 
 /**
- * MongoDB specific {@link MongoPersistentEntity} implementation that adds Mongo specific meta-data such as the
- * collection name and the like.
+ * Mongo specific {@link PersistentEntity} implementation that adds Mongo specific meta-data such as the collection name
+ * and the like.
  * 
- * @author Jon Brisbin
+ * @author Jon Brisbin <jbrisbin@vmware.com>
  * @author Oliver Gierke
- * @author Patryk Wasik
  */
 public class BasicMongoPersistentEntity<T> extends BasicPersistentEntity<T, MongoPersistentProperty> implements
 		MongoPersistentEntity<T>, ApplicationContextAware {
@@ -47,8 +47,6 @@ public class BasicMongoPersistentEntity<T> extends BasicPersistentEntity<T, Mong
 	private final SpelExpressionParser parser;
 	private final StandardEvaluationContext context;
 
-	private MongoPersistentProperty versionProperty;
-
 	/**
 	 * Creates a new {@link BasicMongoPersistentEntity} with the given {@link TypeInformation}. Will default the
 	 * collection name to the entities simple type name.
@@ -73,41 +71,20 @@ public class BasicMongoPersistentEntity<T> extends BasicPersistentEntity<T, Mong
 		}
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mapping.MutablePersistentEntity#addPersistentProperty(P)
-	 */
-	@Override
-	public void addPersistentProperty(MongoPersistentProperty property) {
-
-		if (property.isVersionProperty()) {
-
-			if (this.versionProperty != null) {
-				throw new MappingException(String.format(
-						"Attempt to add version property %s but already have property %s registered "
-								+ "as version. Check your mapping configuration!", property.getField(), versionProperty.getField()));
-			}
-
-			this.versionProperty = property;
-		}
-
-		super.addPersistentProperty(property);
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
 	 */
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-
 		context.addPropertyAccessor(new BeanFactoryAccessor());
 		context.setBeanResolver(new BeanFactoryResolver(applicationContext));
 		context.setRootObject(applicationContext);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentEntity#getCollection()
+	/**
+	 * Returns the collection the entity should be stored in.
+	 * 
+	 * @return
 	 */
 	public String getCollection() {
 
@@ -115,22 +92,6 @@ public class BasicMongoPersistentEntity<T> extends BasicPersistentEntity<T, Mong
 		return expression.getValue(context, String.class);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentEntity#getVersionProperty()
-	 */
-	public MongoPersistentProperty getVersionProperty() {
-		return versionProperty;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentEntity#hasVersionProperty()
-	 */
-	public boolean hasVersionProperty() {
-		return getVersionProperty() != null;
-	}
-
 	/**
 	 * {@link Comparator} implementation inspecting the {@link MongoPersistentProperty}'s order.
 	 * 

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ * Copyright (c) 2011 by the original author(s).
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     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,
@@ -21,34 +21,30 @@ import java.math.BigInteger;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.bson.types.ObjectId;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.data.mapping.Association;
 import org.springframework.data.mapping.model.AnnotationBasedPersistentProperty;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
-import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 
 import com.mongodb.DBObject;
 
 /**
- * MongoDB specific {@link org.springframework.data.mapping.MongoPersistentProperty} implementation.
+ * Mongo specific {@link org.springframework.data.mapping.PersistentProperty} implementation.
  * 
  * @author Oliver Gierke
- * @author Patryk Wasik
  */
 public class BasicMongoPersistentProperty extends AnnotationBasedPersistentProperty<MongoPersistentProperty> implements
 		MongoPersistentProperty {
 
-	private static final Logger LOG = LoggerFactory.getLogger(BasicMongoPersistentProperty.class);
+	private static final Log LOG = LogFactory.getLog(BasicMongoPersistentProperty.class);
 
 	private static final String ID_FIELD_NAME = "_id";
 	private static final Set<Class<?>> SUPPORTED_ID_TYPES = new HashSet<Class<?>>();
 	private static final Set<String> SUPPORTED_ID_PROPERTY_NAMES = new HashSet<String>();
 
-	private static final Field CAUSE_FIELD;
-
 	static {
 		SUPPORTED_ID_TYPES.add(ObjectId.class);
 		SUPPORTED_ID_TYPES.add(String.class);
@@ -56,8 +52,6 @@ public class BasicMongoPersistentProperty extends AnnotationBasedPersistentPrope
 
 		SUPPORTED_ID_PROPERTY_NAMES.add("id");
 		SUPPORTED_ID_PROPERTY_NAMES.add("_id");
-
-		CAUSE_FIELD = ReflectionUtils.findField(Throwable.class, "cause");
 	}
 
 	/**
@@ -93,7 +87,6 @@ public class BasicMongoPersistentProperty extends AnnotationBasedPersistentPrope
 	 */
 	@Override
 	public boolean isIdProperty() {
-
 		if (super.isIdProperty()) {
 			return true;
 		}
@@ -118,9 +111,8 @@ public class BasicMongoPersistentProperty extends AnnotationBasedPersistentPrope
 		return annotation != null && StringUtils.hasText(annotation.value()) ? annotation.value() : field.getName();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#getFieldOrder()
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.core.mapping.MongoPersistentProperty#getFieldOrder()
 	 */
 	public int getFieldOrder() {
 		org.springframework.data.mongodb.core.mapping.Field annotation = getField().getAnnotation(
@@ -128,44 +120,25 @@ public class BasicMongoPersistentProperty extends AnnotationBasedPersistentPrope
 		return annotation != null ? annotation.order() : Integer.MAX_VALUE;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mapping.model.AbstractPersistentProperty#createAssociation()
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mapping.AbstractPersistentProperty#createAssociation()
 	 */
 	@Override
 	protected Association<MongoPersistentProperty> createAssociation() {
 		return new Association<MongoPersistentProperty>(this, null);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#isDbReference()
-	 */
+	/* (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.core.mapping.MongoPersistentProperty#isDbReference()
+		 */
 	public boolean isDbReference() {
 		return getField().isAnnotationPresent(DBRef.class);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#getDBRef()
-	 */
+	/* (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.core.mapping.MongoPersistentProperty#getDBRef()
+		 */
 	public DBRef getDBRef() {
 		return getField().getAnnotation(DBRef.class);
 	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#isVersionProperty()
-	 */
-	public boolean isVersionProperty() {
-		return getField().isAnnotationPresent(Version.class);
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#usePropertyAccess()
-	 */
-	public boolean usePropertyAccess() {
-		return CAUSE_FIELD.equals(getField());
-	}
 }

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ * Copyright (c) 2011 by the original author(s).
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     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,
@@ -28,7 +28,6 @@ import org.springframework.data.mapping.model.SimpleTypeHolder;
 public class CachingMongoPersistentProperty extends BasicMongoPersistentProperty {
 
 	private Boolean isIdProperty;
-	private Boolean isAssociation;
 	private String fieldName;
 
 	/**
@@ -58,18 +57,6 @@ public class CachingMongoPersistentProperty extends BasicMongoPersistentProperty
 		return this.isIdProperty;
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.BasicMongoPersistentProperty#isAssociation()
-	 */
-	@Override
-	public boolean isAssociation() {
-		if (this.isAssociation == null) {
-			this.isAssociation = super.isAssociation();
-		}
-		return this.isAssociation;
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.mapping.BasicMongoPersistentProperty#getFieldName()

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 by the original author(s).
+ * Copyright (c) 2011 by the original author(s).
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.data.mongodb.core.mapping;
 
-import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -24,21 +24,19 @@ import java.lang.annotation.Target;
 import org.springframework.data.annotation.Reference;
 
 /**
- * An annotation that indicates the annotated field is to be stored using a {@link com.mongodb.DBRef}.
+ * An annotation that indicates the annotated field is to be stored using a com.mongodb.DBRef
  * 
- * @author Jon Brisbin
- * @authot Oliver Gierke
+ * @author Jon Brisbin <jbrisbin@vmware.com>
  */
-@Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.FIELD })
 @Reference
 public @interface DBRef {
 
-	/**
-	 * The database the referred entity resides in.
-	 * 
-	 * @return
-	 */
+	String collection() default "";
+
+	String id() default "";
+
 	String db() default "";
+
 }

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ * Copyright (c) 2011 by the original author(s).
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.data.mongodb.core.mapping;
 
 import java.beans.PropertyDescriptor;
@@ -22,16 +23,12 @@ import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.data.mapping.context.AbstractMappingContext;
-import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
 import org.springframework.data.util.TypeInformation;
 
 /**
- * Default implementation of a {@link MappingContext} for MongoDB using {@link BasicMongoPersistentEntity} and
- * {@link BasicMongoPersistentProperty} as primary abstractions.
- * 
- * @author Jon Brisbin
- * @author Oliver Gierke
+ * @author Jon Brisbin <jbrisbin@vmware.com>
+ * @author Oliver Gierke ogierke@vmware.com
  */
 public class MongoMappingContext extends AbstractMappingContext<BasicMongoPersistentEntity<?>, MongoPersistentProperty>
 		implements ApplicationContextAware {
@@ -45,15 +42,6 @@ public class MongoMappingContext extends AbstractMappingContext<BasicMongoPersis
 		setSimpleTypeHolder(MongoSimpleTypes.HOLDER);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mapping.context.AbstractMappingContext#shouldCreatePersistentEntityFor(org.springframework.data.util.TypeInformation)
-	 */
-	@Override
-	protected boolean shouldCreatePersistentEntityFor(TypeInformation<?> type) {
-		return !MongoSimpleTypes.HOLDER.isSimpleType(type.getType());
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mapping.AbstractMappingContext#createPersistentProperty(java.lang.reflect.Field, java.beans.PropertyDescriptor, org.springframework.data.mapping.MutablePersistentEntity, org.springframework.data.mapping.SimpleTypeHolder)
@@ -84,10 +72,7 @@ public class MongoMappingContext extends AbstractMappingContext<BasicMongoPersis
 	 * (non-Javadoc)
 	 * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
 	 */
-	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-
 		this.context = applicationContext;
-		super.setApplicationContext(applicationContext);
 	}
 }

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

@@ -1,49 +1,12 @@
-/*
- * Copyright 2011-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.data.mongodb.core.mapping;
 
 import org.springframework.data.mapping.PersistentEntity;
 
 /**
- * MongoDB specific {@link PersistentEntity} abstraction.
  * 
  * @author Oliver Gierke
- * @author Patryk Wasik
  */
 public interface MongoPersistentEntity<T> extends PersistentEntity<T, MongoPersistentProperty> {
 
-	/**
-	 * Returns the collection the entity shall be persisted to.
-	 * 
-	 * @return
-	 */
 	String getCollection();
-
-	/**
-	 * Returns the {@link MongoPersistentProperty} that represents the version attribute of an entity. Will not be
-	 * {@literal null} if {@link #hasVersionProperty()}.
-	 * 
-	 * @return
-	 */
-	MongoPersistentProperty getVersionProperty();
-
-	/**
-	 * Returns whether the entity has a property representing the version of the entity.
-	 * 
-	 * @return
-	 */
-	boolean hasVersionProperty();
 }

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ * Copyright (c) 2011 by the original author(s).
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     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,
@@ -19,10 +19,9 @@ import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.mapping.PersistentProperty;
 
 /**
- * MongoDB specific {@link org.springframework.data.mapping.PersistentProperty} extension.
+ * Mongo specific {@link org.springframework.data.mapping.PersistentProperty} implementation.
  * 
  * @author Oliver Gierke
- * @author Patryk Wasik
  */
 public interface MongoPersistentProperty extends PersistentProperty<MongoPersistentProperty> {
 
@@ -56,13 +55,6 @@ public interface MongoPersistentProperty extends PersistentProperty<MongoPersist
 	 */
 	DBRef getDBRef();
 
-	/**
-	 * Returns whether the property is representing the version attribute of an entity.
-	 * 
-	 * @return
-	 */
-	boolean isVersionProperty();
-
 	/**
 	 * Simple {@link Converter} implementation to transform a {@link MongoPersistentProperty} into its field name.
 	 * 
@@ -80,12 +72,4 @@ public interface MongoPersistentProperty extends PersistentProperty<MongoPersist
 			return source.getFieldName();
 		}
 	}
-
-	/**
-	 * Returns whether property access shall be used for reading the property value. This means it will use the getter
-	 * instead of field access.
-	 * 
-	 * @return
-	 */
-	boolean usePropertyAccess();
 }

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

@@ -19,7 +19,6 @@ import java.math.BigInteger;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.UUID;
 import java.util.regex.Pattern;
 
 import org.bson.types.Binary;
@@ -53,7 +52,6 @@ public abstract class MongoSimpleTypes {
 		simpleTypes.add(DBObject.class);
 		simpleTypes.add(Pattern.class);
 		simpleTypes.add(Binary.class);
-		simpleTypes.add(UUID.class);
 		MONGO_SIMPLE_TYPES = Collections.unmodifiableSet(simpleTypes);
 	}
 

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2012-2012 the original author or authors.
+ * Copyright (c) 2011 by the original author(s).
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     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,
@@ -29,25 +29,22 @@ import org.springframework.data.mongodb.MongoCollectionUtils;
 import org.springframework.data.util.TypeInformation;
 
 /**
- * @deprecated use {@link MongoMappingContext} instead.
+ * 
  * @author Oliver Gierke
  */
-@Deprecated
 public class SimpleMongoMappingContext extends
 		AbstractMappingContext<SimpleMongoMappingContext.SimpleMongoPersistentEntity<?>, MongoPersistentProperty> {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mapping.context.AbstractMappingContext#createPersistentEntity(org.springframework.data.util.TypeInformation)
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mapping.BasicMappingContext#createPersistentEntity(org.springframework.data.util.TypeInformation)
 	 */
 	@Override
 	protected <T> SimpleMongoPersistentEntity<T> createPersistentEntity(TypeInformation<T> typeInformation) {
 		return new SimpleMongoPersistentEntity<T>(typeInformation);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mapping.context.AbstractMappingContext#createPersistentProperty(java.lang.reflect.Field, java.beans.PropertyDescriptor, org.springframework.data.mapping.model.MutablePersistentEntity, org.springframework.data.mapping.model.SimpleTypeHolder)
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mapping.BasicMappingContext#createPersistentProperty(java.lang.reflect.Field, java.beans.PropertyDescriptor, org.springframework.data.util.TypeInformation, org.springframework.data.mapping.BasicPersistentEntity)
 	 */
 	@Override
 	protected SimplePersistentProperty createPersistentProperty(Field field, PropertyDescriptor descriptor,
@@ -115,21 +112,6 @@ public class SimpleMongoMappingContext extends
 		public DBRef getDBRef() {
 			return null;
 		}
-
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.core.mapping.MongoPersistentProperty#isVersion()
-		 */
-		public boolean isVersionProperty() {
-			return false;
-		}
-
-		/* 
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#usePropertyAccess()
-		 */
-		public boolean usePropertyAccess() {
-			return false;
-		}
 	}
 
 	static class SimpleMongoPersistentEntity<T> extends BasicPersistentEntity<T, MongoPersistentProperty> implements
@@ -148,20 +130,5 @@ public class SimpleMongoMappingContext extends
 		public String getCollection() {
 			return MongoCollectionUtils.getPreferredCollectionName(getType());
 		}
-
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.core.mapping.MongoPersistentEntity#getVersionProperty()
-		 */
-		public MongoPersistentProperty getVersionProperty() {
-			return null;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentEntity#hasVersionProperty()
-		 */
-		public boolean hasVersionProperty() {
-			return false;
-		}
 	}
 }

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

@@ -1,36 +0,0 @@
-/*
- * 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.
- * 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.mapping;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Demarcates a property to be used as version field to implement optimistic locking on entities.
- * 
- * @since 1.4
- * @author Patryk Wasik
- */
-@Documented
-@Target({ FIELD })
-@Retention(RUNTIME)
-public @interface Version {
-
-}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AbstractMongoEventListener.java

@@ -15,13 +15,12 @@
  */
 package org.springframework.data.mongodb.core.mapping.event;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.mongodb.DBObject;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.context.ApplicationListener;
 import org.springframework.core.GenericTypeResolver;
 
-import com.mongodb.DBObject;
-
 /**
  * Base class to implement domain class specific {@link ApplicationListener}s.
  * 
@@ -30,7 +29,7 @@ import com.mongodb.DBObject;
  */
 public abstract class AbstractMongoEventListener<E> implements ApplicationListener<MongoMappingEvent<?>> {
 
-	private static final Logger LOG = LoggerFactory.getLogger(AbstractMongoEventListener.class);
+	protected final Log LOG = LogFactory.getLog(getClass());
 	private final Class<?> domainClass;
 
 	/**

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/LoggingEventListener.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ * Copyright (c) 2011 by the original author(s).
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     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,
@@ -15,31 +15,22 @@
  */
 package org.springframework.data.mongodb.core.mapping.event;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.mongodb.DBObject;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * @author Jon Brisbin <jbrisbin@vmware.com>
  */
 public class LoggingEventListener extends AbstractMongoEventListener<Object> {
 
-	private static final Logger log = LoggerFactory.getLogger(LoggingEventListener.class);
+	private Log log = LogFactory.getLog(getClass());
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onBeforeConvert(java.lang.Object)
-	 */
 	@Override
 	public void onBeforeConvert(Object source) {
 		log.info("onBeforeConvert: " + source);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onBeforeSave(java.lang.Object, com.mongodb.DBObject)
-	 */
 	@Override
 	public void onBeforeSave(Object source, DBObject dbo) {
 		try {
@@ -48,30 +39,19 @@ public class LoggingEventListener extends AbstractMongoEventListener<Object> {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onAfterSave(java.lang.Object, com.mongodb.DBObject)
-	 */
 	@Override
 	public void onAfterSave(Object source, DBObject dbo) {
 		log.info("onAfterSave: " + source + ", " + dbo);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onAfterLoad(com.mongodb.DBObject)
-	 */
 	@Override
 	public void onAfterLoad(DBObject dbo) {
 		log.info("onAfterLoad: " + dbo);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onAfterConvert(com.mongodb.DBObject, java.lang.Object)
-	 */
 	@Override
 	public void onAfterConvert(DBObject dbo, Object source) {
 		log.info("onAfterConvert: " + dbo + ", " + source);
 	}
+
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListener.java

@@ -1,68 +0,0 @@
-/*
- * 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.
- * 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.mapping.event;
-
-import java.util.Set;
-
-import javax.validation.ConstraintViolationException;
-import javax.validation.Validator;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.util.Assert;
-
-import com.mongodb.DBObject;
-
-/**
- * javax.validation dependant entities validator. When it is registered as Spring component its automatically invoked
- * before entities are saved in database.
- * 
- * @author Maciej Walkowiak
- */
-public class ValidatingMongoEventListener extends AbstractMongoEventListener<Object> {
-
-	private static final Logger LOG = LoggerFactory.getLogger(ValidatingMongoEventListener.class);
-
-	private final Validator validator;
-
-	/**
-	 * Creates a new {@link ValidatingMongoEventListener} using the given {@link Validator}.
-	 * 
-	 * @param validator must not be {@literal null}.
-	 */
-	public ValidatingMongoEventListener(Validator validator) {
-		Assert.notNull(validator);
-		this.validator = validator;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onBeforeSave(java.lang.Object, com.mongodb.DBObject)
-	 */
-	@Override
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	public void onBeforeSave(Object source, DBObject dbo) {
-
-		LOG.debug("Validating object: {}", source);
-		Set violations = validator.validate(source);
-
-		if (!violations.isEmpty()) {
-
-			LOG.info("During object: {} validation violations found: {}", source, violations);
-			throw new ConstraintViolationException(violations);
-		}
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 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,39 +26,33 @@ import com.mongodb.DBObject;
  * Collects the results of performing a MapReduce operations.
  * 
  * @author Mark Pollack
- * @author Oliver Gierke
- * @param <T> The class in which the results are mapped onto, accessible via an iterator.
+ * 
+ * @param <T> The class in which the results are mapped onto, accessible via an interator.
  */
 public class MapReduceResults<T> implements Iterable<T> {
 
 	private final List<T> mappedResults;
-	private final DBObject rawResults;
-	private final String outputCollection;
-	private final MapReduceTiming mapReduceTiming;
-	private final MapReduceCounts mapReduceCounts;
 
-	/**
-	 * Creates a new {@link MapReduceResults} from the given mapped results and the raw one.
-	 * 
-	 * @param mappedResults must not be {@literal null}.
-	 * @param rawResults must not be {@literal null}.
-	 */
+	private DBObject rawResults;
+
+	private MapReduceTiming mapReduceTiming;
+
+	private MapReduceCounts mapReduceCounts;
+
+	private String outputCollection;
+
 	public MapReduceResults(List<T> mappedResults, DBObject rawResults) {
-
 		Assert.notNull(mappedResults);
 		Assert.notNull(rawResults);
-
 		this.mappedResults = mappedResults;
 		this.rawResults = rawResults;
-		this.mapReduceTiming = parseTiming(rawResults);
-		this.mapReduceCounts = parseCounts(rawResults);
-		this.outputCollection = parseOutputCollection(rawResults);
+		parseTiming(rawResults);
+		parseCounts(rawResults);
+		if (rawResults.get("result") != null) {
+			this.outputCollection = (String) rawResults.get("result");
+		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Iterable#iterator()
-	 */
 	public Iterator<T> iterator() {
 		return mappedResults.iterator();
 	}
@@ -79,71 +73,28 @@ public class MapReduceResults<T> implements Iterable<T> {
 		return rawResults;
 	}
 
-	private MapReduceTiming parseTiming(DBObject rawResults) {
-
+	protected void parseTiming(DBObject rawResults) {
 		DBObject timing = (DBObject) rawResults.get("timing");
-
-		if (timing == null) {
-			return new MapReduceTiming(-1, -1, -1);
+		if (timing != null) {
+			if (timing.get("mapTime") != null && timing.get("emitLoop") != null && timing.get("total") != null) {
+				mapReduceTiming = new MapReduceTiming((Long) timing.get("mapTime"), (Integer) timing.get("emitLoop"),
+						(Integer) timing.get("total"));
+			}
+		} else {
+			mapReduceTiming = new MapReduceTiming(-1, -1, -1);
 		}
-
-		if (timing.get("mapTime") != null && timing.get("emitLoop") != null && timing.get("total") != null) {
-			return new MapReduceTiming(getAsLong(timing, "mapTime"), getAsLong(timing, "emitLoop"),
-					getAsLong(timing, "total"));
-		}
-
-		return new MapReduceTiming(-1, -1, -1);
 	}
 
-	/**
-	 * Returns the value of the source's field with the given key as {@link Long}.
-	 * 
-	 * @param source
-	 * @param key
-	 * @return
-	 */
-	private Long getAsLong(DBObject source, String key) {
-		Object raw = source.get(key);
-		return raw instanceof Long ? (Long) raw : (Integer) raw;
-	}
-
-	/**
-	 * Parses the raw {@link DBObject} result into a {@link MapReduceCounts} value object.
-	 * 
-	 * @param rawResults
-	 * @return
-	 */
-	private MapReduceCounts parseCounts(DBObject rawResults) {
-
+	protected void parseCounts(DBObject rawResults) {
 		DBObject counts = (DBObject) rawResults.get("counts");
-
-		if (counts == null) {
-			return new MapReduceCounts(-1, -1, -1);
+		if (counts != null) {
+			if (counts.get("input") != null && counts.get("emit") != null && counts.get("output") != null) {
+				mapReduceCounts = new MapReduceCounts((Integer) counts.get("input"), (Integer) counts.get("emit"),
+						(Integer) counts.get("output"));
+			}
+		} else {
+			mapReduceCounts = new MapReduceCounts(-1, -1, -1);
 		}
-
-		if (counts.get("input") != null && counts.get("emit") != null && counts.get("output") != null) {
-			return new MapReduceCounts((Integer) counts.get("input"), (Integer) counts.get("emit"),
-					(Integer) counts.get("output"));
-		}
-
-		return new MapReduceCounts(-1, -1, -1);
 	}
 
-	/**
-	 * Parses the output collection from the raw {@link DBObject} result.
-	 * 
-	 * @param rawResults
-	 * @return
-	 */
-	private String parseOutputCollection(DBObject rawResults) {
-
-		Object resultField = rawResults.get("result");
-
-		if (resultField == null) {
-			return null;
-		}
-
-		return resultField instanceof DBObject ? ((DBObject) resultField).get("collection").toString() : resultField
-				.toString();
-	}
 }

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

@@ -15,24 +15,20 @@
  */
 package org.springframework.data.mongodb.core.query;
 
-import static org.springframework.util.ObjectUtils.*;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.regex.Pattern;
 
-import org.bson.BSON;
+import org.bson.types.BasicBSONList;
 import org.springframework.data.mongodb.InvalidMongoDbApiUsageException;
 import org.springframework.data.mongodb.core.geo.Circle;
 import org.springframework.data.mongodb.core.geo.Point;
 import org.springframework.data.mongodb.core.geo.Shape;
 import org.springframework.util.Assert;
-import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 
-import com.mongodb.BasicDBList;
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
 
@@ -101,17 +97,13 @@ public class Criteria implements CriteriaDefinition {
 			throw new InvalidMongoDbApiUsageException(
 					"Multiple 'is' values declared. You need to use 'and' with multiple criteria");
 		}
-		if (lastOperatorWasNot()) {
+		if (this.criteria.size() > 0 && "$not".equals(this.criteria.keySet().toArray()[this.criteria.size() - 1])) {
 			throw new InvalidMongoDbApiUsageException("Invalid query: 'not' can't be used with 'is' - use 'ne' instead.");
 		}
 		this.isValue = o;
 		return this;
 	}
 
-	private boolean lastOperatorWasNot() {
-		return this.criteria.size() > 0 && "$not".equals(this.criteria.keySet().toArray()[this.criteria.size() - 1]);
-	}
-
 	/**
 	 * Creates a criterion using the $ne operator
 	 * 
@@ -277,11 +269,7 @@ public class Criteria implements CriteriaDefinition {
 	 * @return
 	 */
 	public Criteria not() {
-		return not(null);
-	}
-
-	private Criteria not(Object value) {
-		criteria.put("$not", value);
+		criteria.put("$not", null);
 		return this;
 	}
 
@@ -292,7 +280,8 @@ public class Criteria implements CriteriaDefinition {
 	 * @return
 	 */
 	public Criteria regex(String re) {
-		return regex(re, null);
+		criteria.put("$regex", re);
+		return this;
 	}
 
 	/**
@@ -303,32 +292,13 @@ public class Criteria implements CriteriaDefinition {
 	 * @return
 	 */
 	public Criteria regex(String re, String options) {
-		return regex(toPattern(re, options));
-	}
-
-	/**
-	 * Syntactical sugar for {@link #is(Object)} making obvious that we create a regex predicate.
-	 * 
-	 * @param pattern
-	 * @return
-	 */
-	public Criteria regex(Pattern pattern) {
-
-		Assert.notNull(pattern);
-
-		if (lastOperatorWasNot()) {
-			return not(pattern);
+		criteria.put("$regex", re);
+		if (StringUtils.hasText(options)) {
+			criteria.put("$options", options);
 		}
-
-		this.isValue = pattern;
 		return this;
 	}
 
-	private Pattern toPattern(String regex, String options) {
-		Assert.notNull(regex);
-		return Pattern.compile(regex, options == null ? 0 : BSON.regexFlags(options));
-	}
-
 	/**
 	 * Creates a geospatial criterion using a $within $center operation. This is only available for Mongo 1.7 and higher.
 	 * 
@@ -400,7 +370,7 @@ public class Criteria implements CriteriaDefinition {
 	 * @param criteria
 	 */
 	public Criteria orOperator(Criteria... criteria) {
-		BasicDBList bsonList = createCriteriaList(criteria);
+		BasicBSONList bsonList = createCriteriaList(criteria);
 		criteriaChain.add(new Criteria("$or").is(bsonList));
 		return this;
 	}
@@ -411,7 +381,7 @@ public class Criteria implements CriteriaDefinition {
 	 * @param criteria
 	 */
 	public Criteria norOperator(Criteria... criteria) {
-		BasicDBList bsonList = createCriteriaList(criteria);
+		BasicBSONList bsonList = createCriteriaList(criteria);
 		criteriaChain.add(new Criteria("$nor").is(bsonList));
 		return this;
 	}
@@ -422,7 +392,7 @@ public class Criteria implements CriteriaDefinition {
 	 * @param criteria
 	 */
 	public Criteria andOperator(Criteria... criteria) {
-		BasicDBList bsonList = createCriteriaList(criteria);
+		BasicBSONList bsonList = createCriteriaList(criteria);
 		criteriaChain.add(new Criteria("$and").is(bsonList));
 		return this;
 	}
@@ -432,9 +402,11 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.query.CriteriaDefinition#getCriteriaObject()
-	 */
+		 * (non-Javadoc)
+		 *
+		 * @see org.springframework.datastore.document.mongodb.query.Criteria#
+		 * getCriteriaObject(java.lang.String)
+		 */
 	public DBObject getCriteriaObject() {
 		if (this.criteriaChain.size() == 1) {
 			return criteriaChain.get(0).getSingleCriteriaObject();
@@ -454,17 +426,16 @@ public class Criteria implements CriteriaDefinition {
 		DBObject dbo = new BasicDBObject();
 		boolean not = false;
 		for (String k : this.criteria.keySet()) {
-			Object value = this.criteria.get(k);
 			if (not) {
 				DBObject notDbo = new BasicDBObject();
-				notDbo.put(k, value);
+				notDbo.put(k, this.criteria.get(k));
 				dbo.put("$not", notDbo);
 				not = false;
 			} else {
-				if ("$not".equals(k) && value == null) {
+				if ("$not".equals(k)) {
 					not = true;
 				} else {
-					dbo.put(k, value);
+					dbo.put(k, this.criteria.get(k));
 				}
 			}
 		}
@@ -478,8 +449,8 @@ public class Criteria implements CriteriaDefinition {
 		return queryCriteria;
 	}
 
-	private BasicDBList createCriteriaList(Criteria[] criteria) {
-		BasicDBList bsonList = new BasicDBList();
+	private BasicBSONList createCriteriaList(Criteria[] criteria) {
+		BasicBSONList bsonList = new BasicBSONList();
 		for (Criteria c : criteria) {
 			bsonList.add(c.getCriteriaObject());
 		}
@@ -497,82 +468,4 @@ public class Criteria implements CriteriaDefinition {
 		}
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object obj) {
-
-		if (this == obj) {
-			return true;
-		}
-
-		if (obj == null || !getClass().equals(obj.getClass())) {
-			return false;
-		}
-
-		Criteria that = (Criteria) obj;
-
-		if (this.criteriaChain.size() != that.criteriaChain.size()) {
-			return false;
-		}
-
-		for (int i = 0; i < this.criteriaChain.size(); i++) {
-
-			Criteria left = this.criteriaChain.get(i);
-			Criteria right = that.criteriaChain.get(i);
-
-			if (!simpleCriteriaEquals(left, right)) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	private boolean simpleCriteriaEquals(Criteria left, Criteria right) {
-
-		boolean keyEqual = left.key == null ? right.key == null : left.key.equals(right.key);
-		boolean criteriaEqual = left.criteria.equals(right.criteria);
-		boolean valueEqual = isEqual(left.isValue, right.isValue);
-
-		return keyEqual && criteriaEqual && valueEqual;
-	}
-
-	/**
-	 * Checks the given objects for equality. Handles {@link Pattern} and arrays correctly.
-	 * 
-	 * @param left
-	 * @param right
-	 * @return
-	 */
-	private boolean isEqual(Object left, Object right) {
-
-		if (left == null) {
-			return right == null;
-		}
-
-		if (left instanceof Pattern) {
-			return right instanceof Pattern ? ((Pattern) left).pattern().equals(((Pattern) right).pattern()) : false;
-		}
-
-		return ObjectUtils.nullSafeEquals(left, right);
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-
-		int result = 17;
-
-		result += nullSafeHashCode(key);
-		result += criteria.hashCode();
-		result += nullSafeHashCode(isValue);
-
-		return result;
-	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.
@@ -13,22 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.mongodb.core;
+package org.springframework.data.mongodb.core.query;
 
-import org.springframework.data.mongodb.core.mapping.Version;
+import java.util.ArrayList;
+import java.util.List;
 
-public class PersonWithVersionPropertyOfTypeInteger {
+public class OrQuery extends Query {
 
-	String id;
-	String firstName;
-	int age;
-
-	@Version
-	Integer version;
-
-	@Override
-	public String toString() {
-		return "PersonWithVersionPropertyOfTypeInteger [id=" + id + ", firstName=" + firstName + ", age=" + age
-				+ ", version=" + version + "]";
+	public OrQuery(Query... q) {
+		super(getOrCriteria(q));
 	}
+
+	private static Criteria getOrCriteria(Query[] queries) {
+		List<Criteria> criteriaList = new ArrayList<Criteria>();
+		for (Query q : queries) {
+			criteriaList.addAll(q.getCriteria());
+		}
+		return new Criteria(criteriaList, "$or");
+	}
+
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 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,32 +15,21 @@
  */
 package org.springframework.data.mongodb.core.query;
 
-import static org.springframework.data.mongodb.core.query.SerializationUtils.*;
-import static org.springframework.util.ObjectUtils.*;
-
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.InvalidMongoDbApiUsageException;
 import org.springframework.util.Assert;
 
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
 
-/**
- * @author Thomas Risberg
- * @author Oliver Gierke
- */
 public class Query {
 
 	private LinkedHashMap<String, Criteria> criteria = new LinkedHashMap<String, Criteria>();
 	private Field fieldSpec;
-	private Sort coreSort;
-	@SuppressWarnings("deprecation")
-	private org.springframework.data.mongodb.core.query.Sort sort;
+	private Sort sort;
 	private int skip;
 	private int limit;
 	private String hint;
@@ -104,61 +93,14 @@ public class Query {
 		return this;
 	}
 
-	/**
-	 * Returns a {@link org.springframework.data.mongodb.core.query.Sort} instance to define ordering properties.
-	 * 
-	 * @deprecated use {@link #with(Sort)} instead
-	 * @return
-	 */
-	@Deprecated
-	public org.springframework.data.mongodb.core.query.Sort sort() {
+	public Sort sort() {
 		if (this.sort == null) {
-			this.sort = new org.springframework.data.mongodb.core.query.Sort();
+			this.sort = new Sort();
 		}
 
 		return this.sort;
 	}
 
-	/**
-	 * Sets the given pagination information on the {@link Query} instance. Will transparently set {@code skip} and
-	 * {@code limit} as well as applying the {@link Sort} instance defined with the {@link Pageable}.
-	 * 
-	 * @param pageable
-	 * @return
-	 */
-	public Query with(Pageable pageable) {
-
-		if (pageable == null) {
-			return this;
-		}
-
-		this.limit = pageable.getPageSize();
-		this.skip = pageable.getOffset();
-
-		return with(pageable.getSort());
-	}
-
-	/**
-	 * Adds a {@link Sort} to the {@link Query} instance.
-	 * 
-	 * @param sort
-	 * @return
-	 */
-	public Query with(Sort sort) {
-
-		if (sort == null) {
-			return this;
-		}
-
-		if (this.coreSort == null) {
-			this.coreSort = sort;
-		} else {
-			this.coreSort = this.coreSort.and(sort);
-		}
-
-		return this;
-	}
-
 	public DBObject getQueryObject() {
 		DBObject dbo = new BasicDBObject();
 		for (String k : criteria.keySet()) {
@@ -176,26 +118,11 @@ public class Query {
 		return fieldSpec.getFieldsObject();
 	}
 
-	@SuppressWarnings("deprecation")
 	public DBObject getSortObject() {
-
-		if (this.coreSort == null && this.sort == null) {
+		if (this.sort == null) {
 			return null;
 		}
-
-		DBObject dbo = new BasicDBObject();
-
-		if (this.coreSort != null) {
-			for (org.springframework.data.domain.Sort.Order order : this.coreSort) {
-				dbo.put(order.getProperty(), order.isAscending() ? 1 : -1);
-			}
-		}
-
-		if (this.sort != null) {
-			dbo.putAll(this.sort.getSortObject());
-		}
-
-		return dbo;
+		return this.sort.getSortObject();
 	}
 
 	public int getSkip() {
@@ -213,60 +140,4 @@ public class Query {
 	protected List<Criteria> getCriteria() {
 		return new ArrayList<Criteria>(this.criteria.values());
 	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return String.format("Query: %s, Fields: %s, Sort: %s", serializeToJsonSafely(getQueryObject()),
-				serializeToJsonSafely(getFieldsObject()), serializeToJsonSafely(getSortObject()));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object obj) {
-
-		if (this == obj) {
-			return true;
-		}
-
-		if (obj == null || !getClass().equals(obj.getClass())) {
-			return false;
-		}
-
-		Query that = (Query) obj;
-
-		boolean criteriaEqual = this.criteria.equals(that.criteria);
-		boolean fieldsEqual = this.fieldSpec == null ? that.fieldSpec == null : this.fieldSpec.equals(that.fieldSpec);
-		boolean sortEqual = this.sort == null ? that.sort == null : this.sort.equals(that.sort);
-		boolean hintEqual = this.hint == null ? that.hint == null : this.hint.equals(that.hint);
-		boolean skipEqual = this.skip == that.skip;
-		boolean limitEqual = this.limit == that.limit;
-
-		return criteriaEqual && fieldsEqual && sortEqual && hintEqual && skipEqual && limitEqual;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-
-		int result = 17;
-
-		result += 31 * criteria.hashCode();
-		result += 31 * nullSafeHashCode(fieldSpec);
-		result += 31 * nullSafeHashCode(sort);
-		result += 31 * nullSafeHashCode(hint);
-		result += 31 * skip;
-		result += 31 * limit;
-
-		return result;
-	}
 }

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

@@ -1,110 +0,0 @@
-/*
- * 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.
- * 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.query;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.springframework.core.convert.converter.Converter;
-
-import com.mongodb.DBObject;
-import com.mongodb.util.JSON;
-
-/**
- * Utility methods for JSON serialization.
- * 
- * @author Oliver Gierke
- */
-public abstract class SerializationUtils {
-
-	private SerializationUtils() {
-
-	}
-
-	/**
-	 * Serializes the given object into pseudo-JSON meaning it's trying to create a JSON representation as far as possible
-	 * but falling back to the given object's {@link Object#toString()} method if it's not serializable. Useful for
-	 * printing raw {@link DBObject}s containing complex values before actually converting them into Mongo native types.
-	 * 
-	 * @param value
-	 * @return
-	 */
-	public static String serializeToJsonSafely(Object value) {
-
-		if (value == null) {
-			return null;
-		}
-
-		try {
-			return JSON.serialize(value);
-		} catch (Exception e) {
-			if (value instanceof Collection) {
-				return toString((Collection<?>) value);
-			} else if (value instanceof Map) {
-				return toString((Map<?, ?>) value);
-			} else if (value instanceof DBObject) {
-				return toString(((DBObject) value).toMap());
-			} else {
-				return String.format("{ $java : %s }", value.toString());
-			}
-		}
-	}
-
-	private static String toString(Map<?, ?> source) {
-		return iterableToDelimitedString(source.entrySet(), "{ ", " }", new Converter<Entry<?, ?>, Object>() {
-			public Object convert(Entry<?, ?> source) {
-				return String.format("\"%s\" : %s", source.getKey(), serializeToJsonSafely(source.getValue()));
-			}
-		});
-	}
-
-	private static String toString(Collection<?> source) {
-		return iterableToDelimitedString(source, "[ ", " ]", new Converter<Object, Object>() {
-			public Object convert(Object source) {
-				return serializeToJsonSafely(source);
-			}
-		});
-	}
-
-	/**
-	 * Creates a string representation from the given {@link Iterable} prepending the postfix, applying the given
-	 * {@link Converter} to each element before adding it to the result {@link String}, concatenating each element with
-	 * {@literal ,} and applying the postfix.
-	 * 
-	 * @param source
-	 * @param prefix
-	 * @param postfix
-	 * @param transformer
-	 * @return
-	 */
-	private static <T> String iterableToDelimitedString(Iterable<T> source, String prefix, String postfix,
-			Converter<? super T, Object> transformer) {
-
-		StringBuilder builder = new StringBuilder(prefix);
-		Iterator<T> iterator = source.iterator();
-
-		while (iterator.hasNext()) {
-			builder.append(transformer.convert(iterator.next()));
-			if (iterator.hasNext()) {
-				builder.append(", ");
-			}
-		}
-
-		return builder.append(postfix).toString();
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 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.
@@ -21,15 +21,6 @@ import java.util.Map;
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
 
-/**
- * Helper class to define sorting criterias for a Query instance.
- * 
- * @author Thomas Risberg
- * @author Oliver Gierke
- * @deprecated use {@link org.springframework.data.domain.Sort} instead. See
- *             {@link Query#with(org.springframework.data.domain.Sort)}.
- */
-@Deprecated
 public class Sort {
 
 	private Map<String, Order> fieldSpec = new LinkedHashMap<String, Order>();
@@ -49,7 +40,7 @@ public class Sort {
 	public DBObject getSortObject() {
 		DBObject dbo = new BasicDBObject();
 		for (String k : fieldSpec.keySet()) {
-			dbo.put(k, fieldSpec.get(k).equals(Order.ASCENDING) ? 1 : -1);
+			dbo.put(k, (fieldSpec.get(k).equals(Order.ASCENDING) ? 1 : -1));
 		}
 		return dbo;
 	}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 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,23 +15,13 @@
  */
 package org.springframework.data.mongodb.core.query;
 
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
-import java.util.List;
-
-import org.springframework.dao.InvalidDataAccessApiUsageException;
 
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
+import org.springframework.dao.InvalidDataAccessApiUsageException;
 
-/**
- * Class to easily construct MongoDB update clauses.
- * 
- * @author Thomas Risberg
- * @author Mark Pollack
- * @author Oliver Gierke
- */
 public class Update {
 
 	public enum Position {
@@ -50,31 +40,6 @@ public class Update {
 		return new Update().set(key, value);
 	}
 
-	/**
-	 * Creates an {@link Update} instance from the given {@link DBObject}. Allows to explicitly exlude fields from making
-	 * it into the created {@link Update} object.
-	 * 
-	 * @param object the source {@link DBObject} to create the update from.
-	 * @param exclude the fields to exclude.
-	 * @return
-	 */
-	public static Update fromDBObject(DBObject object, String... exclude) {
-
-		Update update = new Update();
-		List<String> excludeList = Arrays.asList(exclude);
-
-		for (String key : object.keySet()) {
-
-			if (excludeList.contains(key)) {
-				continue;
-			}
-
-			update.set(key, object.get(key));
-		}
-
-		return update;
-	}
-
 	/**
 	 * Update using the $set update modifier
 	 * 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/AntPath.java

@@ -1,106 +0,0 @@
-/*
- * Copyright 2011 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.gridfs;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.springframework.util.Assert;
-
-/**
- * Value object to abstract Ant paths.
- * 
- * @author Oliver Gierke
- */
-class AntPath {
-
-	private static final String PREFIX_DELIMITER = ":";
-	private static final Pattern WILDCARD_PATTERN = Pattern.compile("\\?|\\*\\*|\\*");
-
-	private final String path;
-
-	/**
-	 * Creates a new {@link AntPath} from the given path.
-	 * 
-	 * @param path must not be {@literal null}.
-	 */
-	public AntPath(String path) {
-		Assert.notNull(path);
-		this.path = path;
-	}
-
-	/**
-	 * Returns whether the path is a pattern.
-	 * 
-	 * @return
-	 */
-	public boolean isPattern() {
-		String path = stripPrefix(this.path);
-		return (path.indexOf('*') != -1 || path.indexOf('?') != -1);
-	}
-
-	private static String stripPrefix(String path) {
-		int index = path.indexOf(PREFIX_DELIMITER);
-		return (index > -1 ? path.substring(index + 1) : path);
-	}
-
-	/**
-	 * Returns the regular expression equivalent of this Ant path.
-	 * 
-	 * @return
-	 */
-	public String toRegex() {
-
-		StringBuilder patternBuilder = new StringBuilder();
-		Matcher m = WILDCARD_PATTERN.matcher(path);
-		int end = 0;
-
-		while (m.find()) {
-
-			patternBuilder.append(quote(path, end, m.start()));
-			String match = m.group();
-
-			if ("?".equals(match)) {
-				patternBuilder.append('.');
-			} else if ("**".equals(match)) {
-				patternBuilder.append(".*");
-			} else if ("*".equals(match)) {
-				patternBuilder.append("[^/]*");
-			}
-
-			end = m.end();
-		}
-
-		patternBuilder.append(quote(path, end, path.length()));
-		return patternBuilder.toString();
-	}
-
-	private static String quote(String s, int start, int end) {
-		if (start == end) {
-			return "";
-		}
-		return Pattern.quote(s.substring(start, end));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return path;
-	}
-}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsCriteria.java

@@ -1,73 +0,0 @@
-/*
- * Copyright 2011 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.gridfs;
-
-import org.springframework.data.mongodb.core.query.Criteria;
-
-/**
- * GridFs-specific helper class to define {@link Criteria}s.
- * 
- * @author Oliver Gierke
- */
-public class GridFsCriteria extends Criteria {
-
-	/**
-	 * Creates a new {@link GridFsCriteria} for the given key.
-	 * 
-	 * @param key
-	 */
-	public GridFsCriteria(String key) {
-		super(key);
-	}
-
-	/**
-	 * Creates a {@link GridFsCriteria} for restrictions on the file's metadata.
-	 * 
-	 * @return
-	 */
-	public static GridFsCriteria whereMetaData() {
-		return new GridFsCriteria("metadata");
-	}
-
-	/**
-	 * Creates a {@link GridFsCriteria} for restrictions on a single file's metadata item.
-	 * 
-	 * @param metadataKey
-	 * @return
-	 */
-	public static GridFsCriteria whereMetaData(String metadataKey) {
-		String extension = metadataKey == null ? "" : "." + metadataKey;
-		return new GridFsCriteria(String.format("metadata%s", extension));
-	}
-
-	/**
-	 * Creates a {@link GridFsCriteria} for restrictions on the file's name.
-	 * 
-	 * @return
-	 */
-	public static GridFsCriteria whereFilename() {
-		return new GridFsCriteria("filename");
-	}
-
-	/**
-	 * Creates a {@link GridFsCriteria} for restrictions on the file's content type.
-	 * 
-	 * @return
-	 */
-	public static GridFsCriteria whereContentType() {
-		return new GridFsCriteria("contentType");
-	}
-}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsOperations.java

@@ -1,108 +0,0 @@
-/*
- * Copyright 2011 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.gridfs;
-
-import java.io.InputStream;
-import java.util.List;
-
-import org.springframework.core.io.support.ResourcePatternResolver;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.mongodb.core.query.Query;
-
-import com.mongodb.DBObject;
-import com.mongodb.gridfs.GridFSDBFile;
-import com.mongodb.gridfs.GridFSFile;
-
-/**
- * Collection of operations to store and read files from MongoDB GridFS.
- * 
- * @author Oliver Gierke
- */
-public interface GridFsOperations extends ResourcePatternResolver {
-
-	/**
-	 * Stores the given content into a file with the given name.
-	 * 
-	 * @param content must not be {@literal null}.
-	 * @param filename must not be {@literal null} or empty.
-	 * @return the {@link GridFSFile} just created
-	 */
-	GridFSFile store(InputStream content, String filename);
-
-	/**
-	 * Stores the given content into a file with the given name using the given metadata. The metadata object will be
-	 * marshalled before writing.
-	 * 
-	 * @param content must not be {@literal null}.
-	 * @param filename must not be {@literal null} or empty.
-	 * @param metadata
-	 * @return the {@link GridFSFile} just created
-	 */
-	GridFSFile store(InputStream content, String filename, Object metadata);
-
-	/**
-	 * Stores the given content into a file with the given name using the given metadata.
-	 * 
-	 * @param content must not be {@literal null}.
-	 * @param filename must not be {@literal null} or empty.
-	 * @param metadata must not be {@literal null}.
-	 * @return the {@link GridFSFile} just created
-	 */
-	GridFSFile store(InputStream content, String filename, DBObject metadata);
-
-	/**
-	 * Returns all files matching the given query. Note, that currently {@link Sort} criterias defined at the
-	 * {@link Query} will not be regarded as MongoDB does not support ordering for GridFS file access.
-	 * 
-	 * @see https://jira.mongodb.org/browse/JAVA-431
-	 * @param query
-	 * @return
-	 */
-	List<GridFSDBFile> find(Query query);
-
-	/**
-	 * Returns a single file matching the given query or {@literal null} in case no file matches.
-	 * 
-	 * @param query
-	 * @return
-	 */
-	GridFSDBFile findOne(Query query);
-
-	/**
-	 * Deletes all files matching the given {@link Query}.
-	 * 
-	 * @param query
-	 */
-	void delete(Query query);
-
-	/**
-	 * Returns all {@link GridFsResource} with the given file name.
-	 * 
-	 * @param filename
-	 * @return
-	 * @see ResourcePatternResolver#getResource(String)
-	 */
-	GridFsResource getResource(String filename);
-
-	/**
-	 * Returns all {@link GridFsResource}s matching the given file name pattern.
-	 * 
-	 * @param filenamePattern
-	 * @return
-	 * @see ResourcePatternResolver#getResources(String)
-	 */
-	GridFsResource[] getResources(String filenamePattern);
-}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsResource.java

@@ -1,88 +0,0 @@
-/*
- * Copyright 2011 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.gridfs;
-
-import java.io.IOException;
-
-import org.springframework.core.io.InputStreamResource;
-import org.springframework.core.io.Resource;
-
-import com.mongodb.gridfs.GridFSDBFile;
-
-/**
- * {@link GridFSDBFile} based {@link Resource} implementation.
- * 
- * @author Oliver Gierke
- */
-public class GridFsResource extends InputStreamResource {
-
-	private final GridFSDBFile file;
-
-	/**
-	 * Creates a new {@link GridFsResource} from the given {@link GridFSDBFile}.
-	 * 
-	 * @param file must not be {@literal null}.
-	 */
-	public GridFsResource(GridFSDBFile file) {
-		super(file.getInputStream());
-		this.file = file;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.io.AbstractResource#contentLength()
-	 */
-	@Override
-	public long contentLength() throws IOException {
-		return file.getLength();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.io.AbstractResource#getFilename()
-	 */
-	@Override
-	public String getFilename() throws IllegalStateException {
-		return file.getFilename();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.io.AbstractResource#lastModified()
-	 */
-	@Override
-	public long lastModified() throws IOException {
-		return file.getUploadDate().getTime();
-	}
-
-	/**
-	 * Returns the {@link Resource}'s id.
-	 * 
-	 * @return
-	 */
-	public Object getId() {
-		return file.getId();
-	}
-
-	/**
-	 * Returns the {@link Resource}'s content type.
-	 * 
-	 * @return
-	 */
-	public String getContentType() {
-		return file.getContentType();
-	}
-}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsTemplate.java

@@ -1,194 +0,0 @@
-/*
- * Copyright 2011 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.gridfs;
-
-import static org.springframework.data.mongodb.core.query.Query.*;
-import static org.springframework.data.mongodb.gridfs.GridFsCriteria.*;
-
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.core.io.support.ResourcePatternResolver;
-import org.springframework.data.mongodb.MongoDbFactory;
-import org.springframework.data.mongodb.core.convert.MongoConverter;
-import org.springframework.data.mongodb.core.convert.QueryMapper;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DB;
-import com.mongodb.DBObject;
-import com.mongodb.gridfs.GridFS;
-import com.mongodb.gridfs.GridFSDBFile;
-import com.mongodb.gridfs.GridFSFile;
-import com.mongodb.gridfs.GridFSInputFile;
-
-/**
- * {@link GridFsOperations} implementation to store content into MongoDB GridFS.
- * 
- * @author Oliver Gierke
- */
-public class GridFsTemplate implements GridFsOperations, ResourcePatternResolver {
-
-	private final MongoDbFactory dbFactory;
-	private final String bucket;
-	private final MongoConverter converter;
-	private final QueryMapper queryMapper;
-
-	/**
-	 * Creates a new {@link GridFsTemplate} using the given {@link MongoDbFactory} and {@link MongoConverter}.
-	 * 
-	 * @param dbFactory must not be {@literal null}.
-	 * @param converter must not be {@literal null}.
-	 */
-	public GridFsTemplate(MongoDbFactory dbFactory, MongoConverter converter) {
-		this(dbFactory, converter, null);
-	}
-
-	/**
-	 * Creates a new {@link GridFsTemplate} using the given {@link MongoDbFactory} and {@link MongoConverter}.
-	 * 
-	 * @param dbFactory must not be {@literal null}.
-	 * @param converter must not be {@literal null}.
-	 * @param bucket
-	 */
-	public GridFsTemplate(MongoDbFactory dbFactory, MongoConverter converter, String bucket) {
-
-		Assert.notNull(dbFactory);
-		Assert.notNull(converter);
-
-		this.dbFactory = dbFactory;
-		this.converter = converter;
-		this.bucket = bucket;
-
-		this.queryMapper = new QueryMapper(converter);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#store(java.io.InputStream, java.lang.String)
-	 */
-	public GridFSFile store(InputStream content, String filename) {
-		return store(content, filename, (Object) null);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#store(java.io.InputStream, java.lang.String, java.lang.Object)
-	 */
-	public GridFSFile store(InputStream content, String filename, Object metadata) {
-
-		DBObject dbObject = new BasicDBObject();
-		converter.write(metadata, dbObject);
-		return store(content, filename, dbObject);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#store(java.io.InputStream, java.lang.String, com.mongodb.DBObject)
-	 */
-	public GridFSFile store(InputStream content, String filename, DBObject metadata) {
-
-		Assert.notNull(content);
-		Assert.hasText(filename);
-		Assert.notNull(metadata);
-
-		GridFSInputFile file = getGridFs().createFile(content);
-		file.setFilename(filename);
-		file.setMetaData(metadata);
-		file.save();
-
-		return file;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#find(com.mongodb.DBObject)
-	 */
-	public List<GridFSDBFile> find(Query query) {
-		return getGridFs().find(getMappedQuery(query));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#findOne(com.mongodb.DBObject)
-	 */
-	public GridFSDBFile findOne(Query query) {
-		return getGridFs().findOne(getMappedQuery(query));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#delete(org.springframework.data.mongodb.core.query.Query)
-	 */
-	public void delete(Query query) {
-		getGridFs().remove(getMappedQuery(query));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.io.ResourceLoader#getClassLoader()
-	 */
-	public ClassLoader getClassLoader() {
-		return dbFactory.getClass().getClassLoader();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.io.ResourceLoader#getResource(java.lang.String)
-	 */
-	public GridFsResource getResource(String location) {
-		return new GridFsResource(findOne(query(whereFilename().is(location))));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.io.support.ResourcePatternResolver#getResources(java.lang.String)
-	 */
-	public GridFsResource[] getResources(String locationPattern) {
-
-		if (!StringUtils.hasText(locationPattern)) {
-			return new GridFsResource[0];
-		}
-
-		AntPath path = new AntPath(locationPattern);
-
-		if (path.isPattern()) {
-
-			List<GridFSDBFile> files = find(query(whereFilename().regex(path.toRegex())));
-			List<GridFsResource> resources = new ArrayList<GridFsResource>(files.size());
-
-			for (GridFSDBFile file : files) {
-				resources.add(new GridFsResource(file));
-			}
-
-			return resources.toArray(new GridFsResource[resources.size()]);
-		}
-
-		return new GridFsResource[] { getResource(locationPattern) };
-	}
-
-	private DBObject getMappedQuery(Query query) {
-		return query == null ? null : queryMapper.getMappedObject(query.getQueryObject(), null);
-	}
-
-	private GridFS getGridFs() {
-		DB db = dbFactory.getDb();
-		return bucket == null ? new GridFS(db) : new GridFS(db, bucket);
-	}
-}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/AbstractMonitor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-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,15 +15,13 @@
  */
 package org.springframework.data.mongodb.monitor;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.authentication.UserCredentials;
-import org.springframework.data.mongodb.core.MongoDbUtils;
-
 import com.mongodb.CommandResult;
 import com.mongodb.DB;
 import com.mongodb.Mongo;
 import com.mongodb.MongoException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.data.mongodb.core.MongoDbUtils;
 
 /**
  * Base class to encapsulate common configuration settings when connecting to a database
@@ -32,7 +30,7 @@ import com.mongodb.MongoException;
  */
 public abstract class AbstractMonitor {
 
-	private final Logger logger = LoggerFactory.getLogger(getClass());
+	private final Log logger = LogFactory.getLog(getClass());
 
 	protected Mongo mongo;
 	private String username;
@@ -53,6 +51,7 @@ public abstract class AbstractMonitor {
 	 * @param password The password to use
 	 */
 	public void setPassword(String password) {
+
 		this.password = password;
 	}
 
@@ -66,6 +65,6 @@ public abstract class AbstractMonitor {
 	}
 
 	public DB getDb(String databaseName) {
-		return MongoDbUtils.getDB(mongo, databaseName, new UserCredentials(username, password));
+		return MongoDbUtils.getDB(mongo, databaseName, username, password == null ? null : password.toCharArray());
 	}
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/MongoRepository.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 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.
@@ -32,19 +32,22 @@ public interface MongoRepository<T, ID extends Serializable> extends PagingAndSo
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#save(java.lang.Iterable)
+	 * 
+	 * @see org.springframework.data.repository.Repository#save(java.lang.Iterable)
 	 */
-	<S extends T> List<S> save(Iterable<S> entites);
+	List<T> save(Iterable<? extends T> entites);
 
 	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#findAll()
-	 */
+	  * (non-Javadoc)
+	  *
+	  * @see org.springframework.data.repository.Repository#findAll()
+	  */
 	List<T> findAll();
 
 	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.PagingAndSortingRepository#findAll(org.springframework.data.domain.Sort)
-	 */
+	  * (non-Javadoc)
+	  *
+	  * @see org.springframework.data.repository.PagingAndSortingRepository#findAll(org.springframework.data.domain.Sort)
+	  */
 	List<T> findAll(Sort sort);
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/MongoRepositoryBean.java

@@ -1,76 +0,0 @@
-/*
- * 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.
- * 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.repository.cdi;
-
-import java.lang.annotation.Annotation;
-import java.util.Set;
-
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-
-import org.springframework.data.mongodb.core.MongoOperations;
-import org.springframework.data.mongodb.repository.support.MongoRepositoryFactory;
-import org.springframework.data.repository.cdi.CdiRepositoryBean;
-import org.springframework.util.Assert;
-
-/**
- * {@link CdiRepositoryBean} to create Mongo repository instances.
- * 
- * @author Oliver Gierke
- */
-public class MongoRepositoryBean<T> extends CdiRepositoryBean<T> {
-
-	private final Bean<MongoOperations> operations;
-
-	/**
-	 * Creates a new {@link MongoRepositoryBean}.
-	 * 
-	 * @param operations must not be {@literal null}.
-	 * @param qualifiers must not be {@literal null}.
-	 * @param repositoryType must not be {@literal null}.
-	 * @param beanManager must not be {@literal null}.
-	 */
-	public MongoRepositoryBean(Bean<MongoOperations> operations, Set<Annotation> qualifiers, Class<T> repositoryType,
-			BeanManager beanManager) {
-
-		super(qualifiers, repositoryType, beanManager);
-
-		Assert.notNull(operations);
-		this.operations = operations;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see javax.enterprise.inject.spi.Bean#getScope()
-	 */
-	public Class<? extends Annotation> getScope() {
-		return operations.getScope();
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.cdi.CdiRepositoryBean#create(javax.enterprise.context.spi.CreationalContext, java.lang.Class)
-	 */
-	@Override
-	protected T create(CreationalContext<T> creationalContext, Class<T> repositoryType) {
-
-		MongoOperations mongoOperations = getDependencyInstance(operations, MongoOperations.class);
-		MongoRepositoryFactory factory = new MongoRepositoryFactory(mongoOperations);
-
-		return factory.getRepository(repositoryType);
-	}
-}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/MongoRepositoryExtension.java

@@ -1,111 +0,0 @@
-/*
- * Copyright 2011 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.repository.cdi;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.UnsatisfiedResolutionException;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.ProcessBean;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.mongodb.core.MongoOperations;
-import org.springframework.data.repository.cdi.CdiRepositoryExtensionSupport;
-
-/**
- * CDI extension to export Mongo repositories.
- * 
- * @author Oliver Gierke
- */
-public class MongoRepositoryExtension extends CdiRepositoryExtensionSupport {
-
-	private static final Logger LOG = LoggerFactory.getLogger(MongoRepositoryExtension.class);
-
-	private final Map<Set<Annotation>, Bean<MongoOperations>> mongoOperations = new HashMap<Set<Annotation>, Bean<MongoOperations>>();
-
-	public MongoRepositoryExtension() {
-		LOG.info("Activating CDI extension for Spring Data MongoDB repositories.");
-	}
-
-	@SuppressWarnings("unchecked")
-	<X> void processBean(@Observes ProcessBean<X> processBean) {
-
-		Bean<X> bean = processBean.getBean();
-
-		for (Type type : bean.getTypes()) {
-			if (type instanceof Class<?> && MongoOperations.class.isAssignableFrom((Class<?>) type)) {
-				if (LOG.isDebugEnabled()) {
-					LOG.debug(String.format("Discovered %s with qualifiers %s.", MongoOperations.class.getName(),
-							bean.getQualifiers()));
-				}
-
-				// Store the EntityManager bean using its qualifiers.
-				mongoOperations.put(new HashSet<Annotation>(bean.getQualifiers()), (Bean<MongoOperations>) bean);
-			}
-		}
-	}
-
-	void afterBeanDiscovery(@Observes AfterBeanDiscovery afterBeanDiscovery, BeanManager beanManager) {
-
-		for (Entry<Class<?>, Set<Annotation>> entry : getRepositoryTypes()) {
-
-			Class<?> repositoryType = entry.getKey();
-			Set<Annotation> qualifiers = entry.getValue();
-
-			// Create the bean representing the repository.
-			Bean<?> repositoryBean = createRepositoryBean(repositoryType, qualifiers, beanManager);
-
-			if (LOG.isInfoEnabled()) {
-				LOG.info(String.format("Registering bean for %s with qualifiers %s.", repositoryType.getName(), qualifiers));
-			}
-
-			// Register the bean to the container.
-			afterBeanDiscovery.addBean(repositoryBean);
-		}
-	}
-
-	/**
-	 * Creates a {@link Bean}.
-	 * 
-	 * @param <T> The type of the repository.
-	 * @param repositoryType The class representing the repository.
-	 * @param beanManager The BeanManager instance.
-	 * @return The bean.
-	 */
-	private <T> Bean<T> createRepositoryBean(Class<T> repositoryType, Set<Annotation> qualifiers, BeanManager beanManager) {
-
-		// Determine the MongoOperations bean which matches the qualifiers of the repository.
-		Bean<MongoOperations> mongoOperations = this.mongoOperations.get(qualifiers);
-
-		if (mongoOperations == null) {
-			throw new UnsatisfiedResolutionException(String.format("Unable to resolve a bean for '%s' with qualifiers %s.",
-					MongoOperations.class.getName(), qualifiers));
-		}
-
-		// Construct and return the repository bean.
-		return new MongoRepositoryBean<T>(mongoOperations, qualifiers, repositoryType, beanManager);
-	}
-}

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

@@ -1,122 +0,0 @@
-/*
- * 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.
- * 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.repository.config;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.context.annotation.ComponentScan.Filter;
-import org.springframework.context.annotation.Import;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.repository.support.MongoRepositoryFactoryBean;
-import org.springframework.data.repository.query.QueryLookupStrategy;
-import org.springframework.data.repository.query.QueryLookupStrategy.Key;
-
-/**
- * Annotation to activate MongoDB repositories. If no base package is configured through either {@link #value()},
- * {@link #basePackages()} or {@link #basePackageClasses()} it will trigger scanning of the package of annotated class.
- * 
- * @author Oliver Gierke
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Inherited
-@Import(MongoRepositoriesRegistrar.class)
-public @interface EnableMongoRepositories {
-
-	/**
-	 * Alias for the {@link #basePackages()} attribute. Allows for more concise annotation declarations e.g.:
-	 * {@code @EnableJpaRepositories("org.my.pkg")} instead of {@code @EnableJpaRepositories(basePackages="org.my.pkg")}.
-	 */
-	String[] value() default {};
-
-	/**
-	 * Base packages to scan for annotated components. {@link #value()} is an alias for (and mutually exclusive with) this
-	 * attribute. Use {@link #basePackageClasses()} for a type-safe alternative to String-based package names.
-	 */
-	String[] basePackages() default {};
-
-	/**
-	 * Type-safe alternative to {@link #basePackages()} for specifying the packages to scan for annotated components. The
-	 * package of each class specified will be scanned. Consider creating a special no-op marker class or interface in
-	 * each package that serves no purpose other than being referenced by this attribute.
-	 */
-	Class<?>[] basePackageClasses() default {};
-
-	/**
-	 * Specifies which types are eligible for component scanning. Further narrows the set of candidate components from
-	 * everything in {@link #basePackages()} to everything in the base packages that matches the given filter or filters.
-	 */
-	Filter[] includeFilters() default {};
-
-	/**
-	 * Specifies which types are not eligible for component scanning.
-	 */
-	Filter[] excludeFilters() default {};
-
-	/**
-	 * Returns the postfix to be used when looking up custom repository implementations. Defaults to {@literal Impl}. So
-	 * for a repository named {@code PersonRepository} the corresponding implementation class will be looked up scanning
-	 * for {@code PersonRepositoryImpl}.
-	 * 
-	 * @return
-	 */
-	String repositoryImplementationPostfix() default "";
-
-	/**
-	 * Configures the location of where to find the Spring Data named queries properties file. Will default to
-	 * {@code META-INFO/mongo-named-queries.properties}.
-	 * 
-	 * @return
-	 */
-	String namedQueriesLocation() default "";
-
-	/**
-	 * Returns the key of the {@link QueryLookupStrategy} to be used for lookup queries for query methods. Defaults to
-	 * {@link Key#CREATE_IF_NOT_FOUND}.
-	 * 
-	 * @return
-	 */
-	Key queryLookupStrategy() default Key.CREATE_IF_NOT_FOUND;
-
-	/**
-	 * Returns the {@link FactoryBean} class to be used for each repository instance. Defaults to
-	 * {@link MongoRepositoryFactoryBean}.
-	 * 
-	 * @return
-	 */
-	Class<?> repositoryFactoryBeanClass() default MongoRepositoryFactoryBean.class;
-
-	/**
-	 * Configures the name of the {@link MongoTemplate} bean to be used with the repositories detected.
-	 * 
-	 * @return
-	 */
-	String mongoTemplateRef() default "mongoTemplate";
-
-	/**
-	 * Whether to automatically create indexes for query methods defined in the repository interface.
-	 * 
-	 * @return
-	 */
-	boolean createIndexesForQueryMethods() default false;
-}

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

@@ -1,48 +0,0 @@
-/*
- * 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.
- * 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.repository.config;
-
-import java.lang.annotation.Annotation;
-
-import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
-import org.springframework.data.repository.config.RepositoryBeanDefinitionRegistrarSupport;
-import org.springframework.data.repository.config.RepositoryConfigurationExtension;
-
-/**
- * Mongo-specific {@link ImportBeanDefinitionRegistrar}.
- * 
- * @author Oliver Gierke
- */
-class MongoRepositoriesRegistrar extends RepositoryBeanDefinitionRegistrarSupport {
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryBeanDefinitionRegistrarSupport#getAnnotation()
-	 */
-	@Override
-	protected Class<? extends Annotation> getAnnotation() {
-		return EnableMongoRepositories.class;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryBeanDefinitionRegistrarSupport#getExtension()
-	 */
-	@Override
-	protected RepositoryConfigurationExtension getExtension() {
-		return new MongoRepositoryConfigurationExtension();
-	}
-}

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

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.repository.config;
+
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.data.mongodb.repository.config.SimpleMongoRepositoryConfiguration.MongoRepositoryConfiguration;
+import org.springframework.data.repository.config.AbstractRepositoryConfigDefinitionParser;
+import org.w3c.dom.Element;
+
+/**
+ * {@link org.springframework.beans.factory.xml.BeanDefinitionParser} to create Mongo DB repositories from classpath
+ * scanning or manual definition.
+ * 
+ * @author Oliver Gierke
+ */
+public class MongoRepositoryConfigParser extends
+		AbstractRepositoryConfigDefinitionParser<SimpleMongoRepositoryConfiguration, MongoRepositoryConfiguration> {
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.config.AbstractRepositoryConfigDefinitionParser#getGlobalRepositoryConfigInformation(org.w3c.dom.Element)
+	 */
+	@Override
+	protected SimpleMongoRepositoryConfiguration getGlobalRepositoryConfigInformation(Element element) {
+
+		return new SimpleMongoRepositoryConfiguration(element);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.config.AbstractRepositoryConfigDefinitionParser#postProcessBeanDefinition(org.springframework.data.repository.config.SingleRepositoryConfigInformation, org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.beans.factory.support.BeanDefinitionRegistry, java.lang.Object)
+	 */
+	@Override
+	protected void postProcessBeanDefinition(MongoRepositoryConfiguration context, BeanDefinitionBuilder builder,
+			BeanDefinitionRegistry registry, Object beanSource) {
+
+		builder.addPropertyReference("mongoOperations", context.getMongoTemplateRef());
+		builder.addPropertyValue("createIndexesForQueryMethods", context.getCreateQueryIndexes());
+	}
+}

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

@@ -1,80 +0,0 @@
-/*
- * 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.
- * 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.repository.config;
-
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.core.annotation.AnnotationAttributes;
-import org.springframework.data.config.ParsingUtils;
-import org.springframework.data.mongodb.repository.support.MongoRepositoryFactoryBean;
-import org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource;
-import org.springframework.data.repository.config.RepositoryConfigurationExtension;
-import org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport;
-import org.springframework.data.repository.config.XmlRepositoryConfigurationSource;
-import org.w3c.dom.Element;
-
-/**
- * {@link RepositoryConfigurationExtension} for MongoDB.
- * 
- * @author Oliver Gierke
- */
-public class MongoRepositoryConfigurationExtension extends RepositoryConfigurationExtensionSupport {
-
-	private static final String MONGO_TEMPLATE_REF = "mongo-template-ref";
-	private static final String CREATE_QUERY_INDEXES = "create-query-indexes";
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getModulePrefix()
-	 */
-	@Override
-	protected String getModulePrefix() {
-		return "mongo";
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtension#getRepositoryFactoryClassName()
-	 */
-	public String getRepositoryFactoryClassName() {
-		return MongoRepositoryFactoryBean.class.getName();
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#postProcess(org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.data.repository.config.XmlRepositoryConfigurationSource)
-	 */
-	@Override
-	public void postProcess(BeanDefinitionBuilder builder, XmlRepositoryConfigurationSource config) {
-
-		Element element = config.getElement();
-
-		ParsingUtils.setPropertyReference(builder, element, MONGO_TEMPLATE_REF, "mongoOperations");
-		ParsingUtils.setPropertyValue(builder, element, CREATE_QUERY_INDEXES, "createIndexesForQueryMethods");
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#postProcess(org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource)
-	 */
-	@Override
-	public void postProcess(BeanDefinitionBuilder builder, AnnotationRepositoryConfigurationSource config) {
-
-		AnnotationAttributes attributes = config.getAttributes();
-
-		builder.addPropertyReference("mongoOperations", attributes.getString("mongoTemplateRef"));
-		builder.addPropertyValue("createIndexesForQueryMethods", attributes.getBoolean("createIndexesForQueryMethods"));
-	}
-}

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

@@ -0,0 +1,196 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.repository.config;
+
+import org.springframework.data.mongodb.repository.support.MongoRepositoryFactoryBean;
+import org.springframework.data.repository.config.AutomaticRepositoryConfigInformation;
+import org.springframework.data.repository.config.ManualRepositoryConfigInformation;
+import org.springframework.data.repository.config.RepositoryConfig;
+import org.springframework.data.repository.config.SingleRepositoryConfigInformation;
+import org.springframework.util.StringUtils;
+import org.w3c.dom.Element;
+
+/**
+ * {@link RepositoryConfig} implementation to create {@link MongoRepositoryConfiguration} instances for both automatic
+ * and manual configuration.
+ * 
+ * @author Oliver Gierke
+ */
+public class SimpleMongoRepositoryConfiguration
+		extends
+		RepositoryConfig<SimpleMongoRepositoryConfiguration.MongoRepositoryConfiguration, SimpleMongoRepositoryConfiguration> {
+
+	private static final String MONGO_TEMPLATE_REF = "mongo-template-ref";
+	private static final String CREATE_QUERY_INDEXES = "create-query-indexes";
+	private static final String DEFAULT_MONGO_TEMPLATE_REF = "mongoTemplate";
+
+	/**
+	 * Creates a new {@link SimpleMongoRepositoryConfiguration} for the given {@link Element}.
+	 * 
+	 * @param repositoriesElement
+	 */
+	protected SimpleMongoRepositoryConfiguration(Element repositoriesElement) {
+
+		super(repositoriesElement, MongoRepositoryFactoryBean.class.getName());
+	}
+
+	/**
+	 * Returns the bean name of the {@link org.springframework.data.mongodb.core.core.MongoTemplate} to be referenced.
+	 * 
+	 * @return
+	 */
+	public String getMongoTemplateRef() {
+
+		String templateRef = getSource().getAttribute(MONGO_TEMPLATE_REF);
+		return StringUtils.hasText(templateRef) ? templateRef : DEFAULT_MONGO_TEMPLATE_REF;
+	}
+
+	/**
+	 * Returns whether to create indexes for query methods.
+	 * 
+	 * @return
+	 */
+	public boolean getCreateQueryIndexes() {
+
+		String createQueryIndexes = getSource().getAttribute(CREATE_QUERY_INDEXES);
+		return StringUtils.hasText(createQueryIndexes) ? Boolean.parseBoolean(createQueryIndexes) : false;
+	}
+
+	/*
+	* (non-Javadoc)
+	*
+	* @see
+	* org.springframework.data.repository.config.GlobalRepositoryConfigInformation
+	* #getAutoconfigRepositoryInformation(java.lang.String)
+	*/
+	public MongoRepositoryConfiguration getAutoconfigRepositoryInformation(String interfaceName) {
+
+		return new AutomaticMongoRepositoryConfiguration(interfaceName, this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.config.RepositoryConfig#getNamedQueriesLocation()
+	 */
+	public String getNamedQueriesLocation() {
+		return "classpath*:META-INF/mongo-named-queries.properties";
+	}
+
+	/*
+	* (non-Javadoc)
+	*
+	* @see org.springframework.data.repository.config.RepositoryConfig#
+	* createSingleRepositoryConfigInformationFor(org.w3c.dom.Element)
+	*/
+	@Override
+	protected MongoRepositoryConfiguration createSingleRepositoryConfigInformationFor(Element element) {
+
+		return new ManualMongoRepositoryConfiguration(element, this);
+	}
+
+	/**
+	 * Simple interface for configuration values specific to Mongo repositories.
+	 * 
+	 * @author Oliver Gierke
+	 */
+	public interface MongoRepositoryConfiguration extends
+			SingleRepositoryConfigInformation<SimpleMongoRepositoryConfiguration> {
+
+		String getMongoTemplateRef();
+
+		boolean getCreateQueryIndexes();
+	}
+
+	/**
+	 * Implements manual lookup of the additional attributes.
+	 * 
+	 * @author Oliver Gierke
+	 */
+	private static class ManualMongoRepositoryConfiguration extends
+			ManualRepositoryConfigInformation<SimpleMongoRepositoryConfiguration> implements MongoRepositoryConfiguration {
+
+		/**
+		 * Creates a new {@link ManualMongoRepositoryConfiguration} for the given {@link Element} and parent.
+		 * 
+		 * @param element
+		 * @param parent
+		 */
+		public ManualMongoRepositoryConfiguration(Element element, SimpleMongoRepositoryConfiguration parent) {
+
+			super(element, parent);
+		}
+
+		/*
+		* (non-Javadoc)
+		*
+		* @see org.springframework.data.mongodb.repository.config.
+		* SimpleMongoRepositoryConfiguration
+		* .MongoRepositoryConfiguration#getMongoTemplateRef()
+		*/
+		public String getMongoTemplateRef() {
+
+			return getAttribute(MONGO_TEMPLATE_REF);
+		}
+
+		/* (non-Javadoc)
+		 * @see org.springframework.data.mongodb.config.SimpleMongoRepositoryConfiguration.MongoRepositoryConfiguration#getCreateQueryIndexes()
+		 */
+		public boolean getCreateQueryIndexes() {
+
+			String attribute = getAttribute(CREATE_QUERY_INDEXES);
+			return attribute == null ? false : Boolean.parseBoolean(attribute);
+		}
+	}
+
+	/**
+	 * Implements the lookup of the additional attributes during automatic configuration.
+	 * 
+	 * @author Oliver Gierke
+	 */
+	private static class AutomaticMongoRepositoryConfiguration extends
+			AutomaticRepositoryConfigInformation<SimpleMongoRepositoryConfiguration> implements MongoRepositoryConfiguration {
+
+		/**
+		 * Creates a new {@link AutomaticMongoRepositoryConfiguration} for the given interface and parent.
+		 * 
+		 * @param interfaceName
+		 * @param parent
+		 */
+		public AutomaticMongoRepositoryConfiguration(String interfaceName, SimpleMongoRepositoryConfiguration parent) {
+
+			super(interfaceName, parent);
+		}
+
+		/*
+		* (non-Javadoc)
+		*
+		* @see org.springframework.data.mongodb.repository.config.
+		* SimpleMongoRepositoryConfiguration
+		* .MongoRepositoryConfiguration#getMongoTemplateRef()
+		*/
+		public String getMongoTemplateRef() {
+
+			return getParent().getMongoTemplateRef();
+		}
+
+		/* (non-Javadoc)
+		 * @see org.springframework.data.mongodb.config.SimpleMongoRepositoryConfiguration.MongoRepositoryConfiguration#getCreateQueryIndexes()
+		 */
+		public boolean getCreateQueryIndexes() {
+			return getParent().getCreateQueryIndexes();
+		}
+	}
+}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractMongoQuery.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 the original author or authors.
+ * Copyright 2002-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,6 +15,8 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
+import static org.springframework.data.mongodb.repository.query.QueryUtils.*;
+
 import java.util.List;
 
 import org.springframework.data.domain.PageImpl;
@@ -83,7 +85,7 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 		} else if (method.isGeoNearQuery()) {
 			return new GeoNearExecution(accessor).execute(query);
 		} else if (method.isCollectionQuery()) {
-			return new CollectionExecution(accessor.getPageable()).execute(query);
+			return new CollectionExecution().execute(query);
 		} else if (method.isPageQuery()) {
 			return new PagedExecution(accessor.getPageable()).execute(query);
 		} else {
@@ -117,7 +119,7 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 
 		protected List<?> readCollection(Query query) {
 
-			MongoEntityMetadata<?> metadata = method.getEntityInformation();
+			MongoEntityInformation<?, ?> metadata = method.getEntityInformation();
 
 			String collectionName = metadata.getCollectionName();
 			return operations.find(query, metadata.getJavaType(), collectionName);
@@ -131,19 +133,13 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 	 */
 	class CollectionExecution extends Execution {
 
-		private final Pageable pageable;
-
-		CollectionExecution(Pageable pageable) {
-			this.pageable = pageable;
-		}
-
 		/*
 		 * (non-Javadoc)
 		 * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery.Execution#execute(org.springframework.data.mongodb.core.query.Query)
 		 */
 		@Override
 		public Object execute(Query query) {
-			return readCollection(query.with(pageable));
+			return readCollection(query);
 		}
 	}
 
@@ -175,10 +171,11 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 		@SuppressWarnings({ "rawtypes", "unchecked" })
 		Object execute(Query query) {
 
-			MongoEntityMetadata<?> metadata = method.getEntityInformation();
+			MongoEntityInformation<?, ?> metadata = method.getEntityInformation();
 			long count = operations.count(query, metadata.getCollectionName());
 
-			List<?> result = operations.find(query.with(pageable), metadata.getJavaType(), metadata.getCollectionName());
+			List<?> result = operations.find(applyPagination(query, pageable), metadata.getJavaType(),
+					metadata.getCollectionName());
 
 			return new PageImpl(result, pageable, count);
 		}
@@ -198,8 +195,8 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 		@Override
 		Object execute(Query query) {
 
-			MongoEntityMetadata<?> metadata = method.getEntityInformation();
-			return operations.findOne(query, metadata.getJavaType());
+			MongoEntityInformation<?, ?> entityInformation = method.getEntityInformation();
+			return operations.findOne(query, entityInformation.getJavaType());
 		}
 	}
 
@@ -236,8 +233,8 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 		 */
 		Object execute(Query query, Query countQuery) {
 
-			MongoEntityMetadata<?> metadata = method.getEntityInformation();
-			long count = operations.count(countQuery, metadata.getCollectionName());
+			MongoEntityInformation<?, ?> information = method.getEntityInformation();
+			long count = operations.count(countQuery, information.getCollectionName());
 
 			return new GeoPage<Object>(doExecuteQuery(query), accessor.getPageable(), count);
 		}
@@ -257,8 +254,9 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 				nearQuery.maxDistance(maxDistance);
 			}
 
-			MongoEntityMetadata<?> metadata = method.getEntityInformation();
-			return (GeoResults<Object>) operations.geoNear(nearQuery, metadata.getJavaType(), metadata.getCollectionName());
+			MongoEntityInformation<?, ?> entityInformation = method.getEntityInformation();
+			return (GeoResults<Object>) operations.geoNear(nearQuery, entityInformation.getJavaType(),
+					entityInformation.getCollectionName());
 		}
 
 		private boolean isListOfGeoResult() {

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ConvertingParameterAccessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2013 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.
@@ -15,24 +15,15 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.Iterator;
-import java.util.List;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.convert.MongoWriter;
 import org.springframework.data.mongodb.core.geo.Distance;
 import org.springframework.data.mongodb.core.geo.Point;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.repository.query.ParameterAccessor;
-import org.springframework.data.util.TypeInformation;
 import org.springframework.util.Assert;
-import org.springframework.util.CollectionUtils;
-
-import com.mongodb.DBRef;
 
 /**
  * Custom {@link ParameterAccessor} that uses a {@link MongoWriter} to serialize parameters into Mongo format.
@@ -86,12 +77,12 @@ public class ConvertingParameterAccessor implements MongoParameterAccessor {
 		return delegate.getSort();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.ParameterAccessor#getBindableValue(int)
-	 */
+	/* (non-Javadoc)
+	  * @see org.springframework.data.repository.query.ParameterAccessor#getBindableParameter(int)
+	  */
 	public Object getBindableValue(int index) {
-		return getConvertedValue(delegate.getBindableValue(index), null);
+
+		return getConvertedValue(delegate.getBindableValue(index));
 	}
 
 	/*
@@ -102,8 +93,7 @@ public class ConvertingParameterAccessor implements MongoParameterAccessor {
 		return delegate.getMaxDistance();
 	}
 
-	/* 
-	 * (non-Javadoc)
+	/* (non-Javadoc)
 	 * @see org.springframework.data.mongodb.repository.MongoParameterAccessor#getGeoNearLocation()
 	 */
 	public Point getGeoNearLocation() {
@@ -113,20 +103,11 @@ public class ConvertingParameterAccessor implements MongoParameterAccessor {
 	/**
 	 * Converts the given value with the underlying {@link MongoWriter}.
 	 * 
-	 * @param value can be {@literal null}.
-	 * @param typeInformation can be {@literal null}.
+	 * @param value
 	 * @return
 	 */
-	private Object getConvertedValue(Object value, TypeInformation<?> typeInformation) {
-		return writer.convertToMongoType(value, typeInformation == null ? null : typeInformation.getActualType());
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.ParameterAccessor#hasBindableNullValue()
-	 */
-	public boolean hasBindableNullValue() {
-		return delegate.hasBindableNullValue();
+	private Object getConvertedValue(Object value) {
+		return writer.convertToMongoType(value);
 	}
 
 	/**
@@ -148,86 +129,42 @@ public class ConvertingParameterAccessor implements MongoParameterAccessor {
 		}
 
 		/*
-		 * (non-Javadoc)
-		 * @see java.util.Iterator#hasNext()
-		 */
+		   * (non-Javadoc)
+		   *
+		   * @see java.util.Iterator#hasNext()
+		   */
 		public boolean hasNext() {
 			return delegate.hasNext();
 		}
 
 		/*
-		 * (non-Javadoc)
-		 * @see java.util.Iterator#next()
-		 */
+		   * (non-Javadoc)
+		   *
+		   * @see java.util.Iterator#next()
+		   */
 		public Object next() {
+
 			return delegate.next();
 		}
 
-		/* 
-		 * (non-Javadoc)
+		/* (non-Javadoc)
 		 * @see org.springframework.data.mongodb.repository.ConvertingParameterAccessor.PotentiallConvertingIterator#nextConverted()
 		 */
-		public Object nextConverted(MongoPersistentProperty property) {
+		public Object nextConverted() {
 
-			Object next = next();
-
-			if (next == null) {
-				return null;
-			}
-
-			if (property.isAssociation()) {
-				if (next.getClass().isArray() || next instanceof Iterable) {
-
-					List<DBRef> dbRefs = new ArrayList<DBRef>();
-					for (Object element : asCollection(next)) {
-						dbRefs.add(writer.toDBRef(element, property));
-					}
-
-					return dbRefs;
-				} else {
-					return writer.toDBRef(next, property);
-				}
-			}
-
-			return getConvertedValue(next, property.getTypeInformation());
+			return getConvertedValue(next());
 		}
 
 		/*
-		 * (non-Javadoc)
-		 * @see java.util.Iterator#remove()
-		 */
+		   * (non-Javadoc)
+		   *
+		   * @see java.util.Iterator#remove()
+		   */
 		public void remove() {
 			delegate.remove();
 		}
 	}
 
-	/**
-	 * Returns the given object as {@link Collection}. Will do a copy of it if it implements {@link Iterable} or is an
-	 * array. Will return an empty {@link Collection} in case {@literal null} is given. Will wrap all other types into a
-	 * single-element collction
-	 * 
-	 * @param source
-	 * @return
-	 */
-	private static Collection<?> asCollection(Object source) {
-
-		if (source instanceof Iterable) {
-
-			List<Object> result = new ArrayList<Object>();
-			for (Object element : (Iterable<?>) source) {
-				result.add(element);
-			}
-
-			return result;
-		}
-
-		if (source == null) {
-			return Collections.emptySet();
-		}
-
-		return source.getClass().isArray() ? CollectionUtils.arrayToList(source) : Collections.singleton(source);
-	}
-
 	/**
 	 * Custom {@link Iterator} that adds a method to access elements in a converted manner.
 	 * 
@@ -240,6 +177,6 @@ public class ConvertingParameterAccessor implements MongoParameterAccessor {
 		 * 
 		 * @return
 		 */
-		Object nextConverted(MongoPersistentProperty property);
+		Object nextConverted();
 	}
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/EntityInformationCreator.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.repository.query;
+
+import java.io.Serializable;
+
+/**
+ * Interface for components being able to provide {@link EntityInformationCreator} for a given {@link Class}.
+ * 
+ * @author Oliver Gierke
+ */
+public interface EntityInformationCreator {
+
+	/**
+	 * Returns a {@link MongoEntityInformation} for the given domain class.
+	 * 
+	 * @param domainClass the domain class to create the {@link MongoEntityInformation} for, must not be {@literal null}.
+	 * @return
+	 */
+	<T, ID extends Serializable> MongoEntityInformation<T, ID> getEntityInformation(Class<T> domainClass);
+
+	/**
+	 * Returns a {@link MongoEntityInformation} for the given domain class and class to retrieve the collection to query
+	 * against from.
+	 * 
+	 * @param domainClass the domain class to create the {@link MongoEntityInformation} for, must not be {@literal null}.
+	 * @param collectionClass the class to derive the collection from queries to retrieve the domain classes from shall be
+	 *          ran against, must not be {@literal null}.
+	 * @return
+	 */
+	<T, ID extends Serializable> MongoEntityInformation<T, ID> getEntityInformation(Class<T> domainClass,
+			Class<?> collectionClass);
+
+}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoEntityMetadata.java

@@ -1,33 +0,0 @@
-/*
- * 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.
- * 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.repository.query;
-
-import org.springframework.data.repository.core.EntityMetadata;
-
-/**
- * Extension of {@link EntityMetadata} to additionally expose the collection name an entity shall be persisted to.
- * 
- * @author Oliver Gierke
- */
-public interface MongoEntityMetadata<T> extends EntityMetadata<T> {
-
-	/**
-	 * Returns the name of the collection the entity shall be persisted to.
-	 * 
-	 * @return
-	 */
-	String getCollectionName();
-}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryCreator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 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.
@@ -20,8 +20,8 @@ import static org.springframework.data.mongodb.core.query.Criteria.*;
 import java.util.Collection;
 import java.util.Iterator;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.context.PersistentPropertyPath;
@@ -31,6 +31,7 @@ import org.springframework.data.mongodb.core.geo.Shape;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.CriteriaDefinition;
+import org.springframework.data.mongodb.core.query.OrQuery;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor.PotentiallyConvertingIterator;
 import org.springframework.data.repository.query.parser.AbstractQueryCreator;
@@ -44,9 +45,9 @@ import org.springframework.util.Assert;
  * 
  * @author Oliver Gierke
  */
-class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
+class MongoQueryCreator extends AbstractQueryCreator<Query, Query> {
 
-	private static final Logger LOG = LoggerFactory.getLogger(MongoQueryCreator.class);
+	private static final Log LOG = LogFactory.getLog(MongoQueryCreator.class);
 	private final MongoParameterAccessor accessor;
 	private final boolean isGeoNearQuery;
 
@@ -87,114 +88,110 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
 	}
 
 	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.parser.AbstractQueryCreator#create(org.springframework.data.repository.query.parser.Part, java.util.Iterator)
-	 */
+	* (non-Javadoc)
+	* @see org.springframework.data.repository.query.parser.AbstractQueryCreator#create(org.springframework.data.repository.query.parser.Part, java.util.Iterator)
+	*/
 	@Override
-	protected Criteria create(Part part, Iterator<Object> iterator) {
+	protected Query create(Part part, Iterator<Object> iterator) {
 
 		if (isGeoNearQuery && part.getType().equals(Type.NEAR)) {
 			return null;
 		}
 
 		PersistentPropertyPath<MongoPersistentProperty> path = context.getPersistentPropertyPath(part.getProperty());
-		MongoPersistentProperty property = path.getLeafProperty();
-		Criteria criteria = from(part.getType(), property,
+		Criteria criteria = from(part.getType(),
 				where(path.toDotPath(MongoPersistentProperty.PropertyToFieldNameConverter.INSTANCE)),
 				(PotentiallyConvertingIterator) iterator);
 
-		return criteria;
+		return new Query(criteria);
 	}
 
 	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.parser.AbstractQueryCreator#and(org.springframework.data.repository.query.parser.Part, java.lang.Object, java.util.Iterator)
-	 */
+	* (non-Javadoc)
+	* @see org.springframework.data.repository.query.parser.AbstractQueryCreator#and(org.springframework.data.repository.query.parser.Part, java.lang.Object, java.util.Iterator)
+	*/
 	@Override
-	protected Criteria and(Part part, Criteria base, Iterator<Object> iterator) {
+	protected Query and(Part part, Query base, Iterator<Object> iterator) {
 
 		if (base == null) {
 			return create(part, iterator);
 		}
 
-		PersistentPropertyPath<MongoPersistentProperty> path = context.getPersistentPropertyPath(part.getProperty());
-		MongoPersistentProperty property = path.getLeafProperty();
+		PersistentPropertyPath<MongoPersistentProperty> path2 = context.getPersistentPropertyPath(part.getProperty());
 
-		return from(part.getType(), property,
-				base.and(path.toDotPath(MongoPersistentProperty.PropertyToFieldNameConverter.INSTANCE)),
+		Criteria criteria = from(part.getType(),
+				where(path2.toDotPath(MongoPersistentProperty.PropertyToFieldNameConverter.INSTANCE)),
 				(PotentiallyConvertingIterator) iterator);
+		return base.addCriteria(criteria);
 	}
 
 	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.parser.AbstractQueryCreator#or(java.lang.Object, java.lang.Object)
-	 */
+	* (non-Javadoc)
+	*
+	* @see
+	* org.springframework.data.repository.query.parser.AbstractQueryCreator
+	* #or(java.lang.Object, java.lang.Object)
+	*/
 	@Override
-	protected Criteria or(Criteria base, Criteria criteria) {
-
-		Criteria result = new Criteria();
-		return result.orOperator(base, criteria);
+	protected Query or(Query base, Query query) {
+		return new OrQuery(new Query[] { base, query });
 	}
 
 	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.parser.AbstractQueryCreator#complete(java.lang.Object, org.springframework.data.domain.Sort)
-	 */
+	* (non-Javadoc)
+	*
+	* @see
+	* org.springframework.data.repository.query.parser.AbstractQueryCreator
+	* #complete(java.lang.Object, org.springframework.data.domain.Sort)
+	*/
 	@Override
-	protected Query complete(Criteria criteria, Sort sort) {
+	protected Query complete(Query query, Sort sort) {
 
-		if (criteria == null) {
+		if (query == null) {
 			return null;
 		}
 
-		Query query = new Query(criteria).with(sort);
+		QueryUtils.applySorting(query, sort);
 
 		if (LOG.isDebugEnabled()) {
-			LOG.debug("Created query " + query);
+			LOG.debug("Created query " + query.getQueryObject());
 		}
 
 		return query;
 	}
 
 	/**
-	 * Populates the given {@link CriteriaDefinition} depending on the {@link Part} given.
+	 * Populates the given {@link CriteriaDefinition} depending on the {@link Type} given.
 	 * 
-	 * @param part
-	 * @param property
+	 * @param type
 	 * @param criteria
 	 * @param parameters
 	 * @return
 	 */
-	private Criteria from(Type type, MongoPersistentProperty property, Criteria criteria,
-			PotentiallyConvertingIterator parameters) {
+	private Criteria from(Type type, Criteria criteria, PotentiallyConvertingIterator parameters) {
 
 		switch (type) {
-		case AFTER:
 		case GREATER_THAN:
-			return criteria.gt(parameters.nextConverted(property));
+			return criteria.gt(parameters.nextConverted());
 		case GREATER_THAN_EQUAL:
-			return criteria.gte(parameters.nextConverted(property));
-		case BEFORE:
+			return criteria.gte(parameters.nextConverted());
 		case LESS_THAN:
-			return criteria.lt(parameters.nextConverted(property));
+			return criteria.lt(parameters.nextConverted());
 		case LESS_THAN_EQUAL:
-			return criteria.lte(parameters.nextConverted(property));
+			return criteria.lte(parameters.nextConverted());
 		case BETWEEN:
-			return criteria.gt(parameters.nextConverted(property)).lt(parameters.nextConverted(property));
+			return criteria.gt(parameters.nextConverted()).lt(parameters.nextConverted());
 		case IS_NOT_NULL:
 			return criteria.ne(null);
 		case IS_NULL:
 			return criteria.is(null);
 		case NOT_IN:
-			return criteria.nin(nextAsArray(parameters, property));
+			return criteria.nin(nextAsArray(parameters));
 		case IN:
-			return criteria.in(nextAsArray(parameters, property));
+			return criteria.in(nextAsArray(parameters));
 		case LIKE:
-		case STARTING_WITH:
-		case ENDING_WITH:
-		case CONTAINING:
 			String value = parameters.next().toString();
-			return criteria.regex(toLikeRegex(value, type));
+			return criteria.regex(toLikeRegex(value));
 		case REGEX:
 			return criteria.regex(parameters.next().toString());
 		case EXISTS:
@@ -225,9 +222,9 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
 			Object parameter = parameters.next();
 			return criteria.within((Shape) parameter);
 		case SIMPLE_PROPERTY:
-			return criteria.is(parameters.nextConverted(property));
+			return criteria.is(parameters.nextConverted());
 		case NEGATING_SIMPLE_PROPERTY:
-			return criteria.ne(parameters.nextConverted(property));
+			return criteria.not().is(parameters.nextConverted());
 		}
 
 		throw new IllegalArgumentException("Unsupported keyword!");
@@ -253,8 +250,8 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
 				parameter.getClass()));
 	}
 
-	private Object[] nextAsArray(PotentiallyConvertingIterator iterator, MongoPersistentProperty property) {
-		Object next = iterator.nextConverted(property);
+	private Object[] nextAsArray(PotentiallyConvertingIterator iterator) {
+		Object next = iterator.nextConverted();
 
 		if (next instanceof Collection) {
 			return ((Collection<?>) next).toArray();
@@ -265,20 +262,8 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
 		return new Object[] { next };
 	}
 
-	private String toLikeRegex(String source, Type type) {
-
-		switch (type) {
-		case STARTING_WITH:
-			source = source + "*";
-			break;
-		case ENDING_WITH:
-			source = "*" + source;
-			break;
-		case CONTAINING:
-			source = "*" + source + "*";
-			break;
-		}
+	private String toLikeRegex(String source) {
 
 		return source.replaceAll("\\*", ".*");
 	}
-}
+}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryMethod.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ * Copyright 2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,12 +20,9 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.geo.GeoPage;
 import org.springframework.data.mongodb.core.geo.GeoResult;
 import org.springframework.data.mongodb.core.geo.GeoResults;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.repository.Query;
 import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.query.Parameters;
@@ -36,7 +33,8 @@ import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
- * Mongo specific implementation of {@link QueryMethod}.
+ * TODO - Extract methods for {@link #getAnnotatedQuery()} into superclass as it is currently copied from Spring Data
+ * JPA
  * 
  * @author Oliver Gierke
  */
@@ -47,24 +45,19 @@ public class MongoQueryMethod extends QueryMethod {
 			.asList(GeoResult.class, GeoResults.class, GeoPage.class);
 
 	private final Method method;
-	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
-
-	private MongoEntityMetadata<?> metadata;
+	private final MongoEntityInformation<?, ?> entityInformation;
 
 	/**
 	 * Creates a new {@link MongoQueryMethod} from the given {@link Method}.
 	 * 
 	 * @param method
 	 */
-	public MongoQueryMethod(Method method, RepositoryMetadata metadata,
-			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
-
+	public MongoQueryMethod(Method method, RepositoryMetadata metadata, EntityInformationCreator entityInformationCreator) {
 		super(method, metadata);
-
-		Assert.notNull(mappingContext, "MappingContext must not be null!");
-
+		Assert.notNull(entityInformationCreator, "DefaultEntityInformationCreator must not be null!");
 		this.method = method;
-		this.mappingContext = mappingContext;
+		this.entityInformation = entityInformationCreator.getEntityInformation(metadata.getReturnedDomainClass(method),
+				getDomainClass());
 	}
 
 	/*
@@ -108,30 +101,14 @@ public class MongoQueryMethod extends QueryMethod {
 		return StringUtils.hasText(value) ? value : null;
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.query.QueryMethod#getEntityInformation()
 	 */
 	@Override
-	@SuppressWarnings("unchecked")
-	public MongoEntityMetadata<?> getEntityInformation() {
+	public MongoEntityInformation<?, ?> getEntityInformation() {
 
-		if (metadata == null) {
-
-			Class<?> returnedObjectType = getReturnedObjectType();
-			Class<?> domainClass = getDomainClass();
-
-			MongoPersistentEntity<?> returnedEntity = mappingContext.getPersistentEntity(getReturnedObjectType());
-			MongoPersistentEntity<?> managedEntity = mappingContext.getPersistentEntity(domainClass);
-			returnedEntity = returnedEntity == null ? managedEntity : returnedEntity;
-			MongoPersistentEntity<?> collectionEntity = domainClass.isAssignableFrom(returnedObjectType) ? returnedEntity
-					: managedEntity;
-
-			this.metadata = new SimpleMongoEntityMetadata<Object>((Class<Object>) returnedEntity.getType(),
-					collectionEntity.getCollection());
-		}
-
-		return this.metadata;
+		return entityInformation;
 	}
 
 	/*
@@ -144,11 +121,12 @@ public class MongoQueryMethod extends QueryMethod {
 	}
 
 	/**
-	 * Returns whether te query is a geo near query.
+	 * Returns whether te query is a geoNear query.
 	 * 
 	 * @return
 	 */
 	public boolean isGeoNearQuery() {
+
 		return isGeoNearQuery(this.method);
 	}
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/QueryUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 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,13 +15,12 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
+import com.mongodb.DBCursor;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Order;
 import org.springframework.data.mongodb.core.query.Query;
 
-import com.mongodb.DBCursor;
-
 /**
  * Collection of utility methods to apply sorting and pagination to a {@link DBCursor}.
  * 
@@ -37,12 +36,10 @@ public abstract class QueryUtils {
 	 * Applies the given {@link Pageable} to the given {@link Query}. Will do nothing if {@link Pageable} is
 	 * {@literal null}.
 	 * 
-	 * @deprecated use {@link Query#with(Pageable)}.
-	 * @param query must not be {@literal null}.
+	 * @param query
 	 * @param pageable
 	 * @return
 	 */
-	@Deprecated
 	public static Query applyPagination(Query query, Pageable pageable) {
 
 		if (pageable == null) {
@@ -52,18 +49,16 @@ public abstract class QueryUtils {
 		query.limit(pageable.getPageSize());
 		query.skip(pageable.getOffset());
 
-		return query.with(pageable.getSort());
+		return applySorting(query, pageable.getSort());
 	}
 
 	/**
 	 * Applies the given {@link Sort} to the {@link Query}. Will do nothing if {@link Sort} is {@literal null}.
 	 * 
-	 * @deprecated use {@link Query#with(Pageable)}.
-	 * @param query must not be {@literal null}.
+	 * @param query
 	 * @param sort
 	 * @return
 	 */
-	@Deprecated
 	public static Query applySorting(Query query, Sort sort) {
 
 		if (sort == null) {

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/SimpleMongoEntityMetadata.java

@@ -1,60 +0,0 @@
-/*
- * 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.
- * 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.repository.query;
-
-import org.springframework.util.Assert;
-
-/**
- * Bean based implementation of {@link MongoEntityMetadata}.
- * 
- * @author Oliver Gierke
- */
-class SimpleMongoEntityMetadata<T> implements MongoEntityMetadata<T> {
-
-	private final Class<T> type;
-	private final String collectionName;
-
-	/**
-	 * Creates a new {@link SimpleMongoEntityMetadata} using the given type and collection name.
-	 * 
-	 * @param type must not be {@literal null}.
-	 * @param collectionName must not be {@literal null} or empty.
-	 */
-	public SimpleMongoEntityMetadata(Class<T> type, String collectionName) {
-
-		Assert.notNull(type, "Type must not be null!");
-		Assert.hasText(collectionName, "Collection name must not be null or empty!");
-
-		this.type = type;
-		this.collectionName = collectionName;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.EntityMetadata#getJavaType()
-	 */
-	public Class<T> getJavaType() {
-		return type;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.MongoEntityMetadata#getCollectionName()
-	 */
-	public String getCollectionName() {
-		return collectionName;
-	}
-}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/StringBasedMongoQuery.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 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.
@@ -18,14 +18,13 @@ package org.springframework.data.mongodb.repository.query;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.bson.types.ObjectId;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.core.query.Query;
 
-import com.mongodb.util.JSON;
-
 /**
  * Query to use a plain JSON String to create the {@link Query} to actually execute.
  * 
@@ -34,7 +33,7 @@ import com.mongodb.util.JSON;
 public class StringBasedMongoQuery extends AbstractMongoQuery {
 
 	private static final Pattern PLACEHOLDER = Pattern.compile("\\?(\\d+)");
-	private static final Logger LOG = LoggerFactory.getLogger(StringBasedMongoQuery.class);
+	private static final Log LOG = LogFactory.getLog(StringBasedMongoQuery.class);
 
 	private final String query;
 	private final String fieldSpec;
@@ -56,9 +55,12 @@ public class StringBasedMongoQuery extends AbstractMongoQuery {
 	}
 
 	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#createQuery(org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor)
-	 */
+	  * (non-Javadoc)
+	  *
+	  * @see
+	  * org.springframework.data.mongodb.repository.AbstractMongoQuery#createQuery(org.springframework.data.
+	  * repository.query.SimpleParameterAccessor, org.springframework.data.mongodb.core.core.support.convert.MongoConverter)
+	  */
 	@Override
 	protected Query createQuery(ConvertingParameterAccessor accessor) {
 
@@ -73,7 +75,7 @@ public class StringBasedMongoQuery extends AbstractMongoQuery {
 			query = new BasicQuery(queryString);
 		}
 
-		query.with(accessor.getSort());
+		QueryUtils.applySorting(query, accessor.getSort());
 
 		if (LOG.isDebugEnabled()) {
 			LOG.debug(String.format("Created query %s", query.getQueryObject()));
@@ -97,6 +99,17 @@ public class StringBasedMongoQuery extends AbstractMongoQuery {
 	}
 
 	private String getParameterWithIndex(ConvertingParameterAccessor accessor, int index) {
-		return JSON.serialize(accessor.getBindableValue(index));
+
+		Object parameter = accessor.getBindableValue(index);
+
+		if (parameter == null) {
+			return "null";
+		} else if (parameter instanceof String || parameter.getClass().isEnum()) {
+			return String.format("\"%s\"", parameter);
+		} else if (parameter instanceof ObjectId) {
+			return String.format("{ '$oid' : '%s' }", parameter);
+		}
+
+		return parameter.toString();
 	}
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/DefaultEntityInformationCreator.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.repository.support;
+
+import java.io.Serializable;
+
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.mongodb.repository.query.EntityInformationCreator;
+import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
+import org.springframework.util.Assert;
+
+/**
+ * Simple {@link EntityInformationCreator} to to create {@link MongoEntityInformation} instances based on a
+ * {@link MappingContext}.
+ * 
+ * @author Oliver Gierke
+ */
+public class DefaultEntityInformationCreator implements EntityInformationCreator {
+
+	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
+
+	public DefaultEntityInformationCreator(
+			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
+		Assert.notNull(mappingContext);
+		this.mappingContext = mappingContext;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.repository.support.EntityInformationCreator#getEntityInformation(java.lang.Class)
+	 */
+	public <T, ID extends Serializable> MongoEntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
+		return getEntityInformation(domainClass, null);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.repository.support.EntityInformationCreator#getEntityInformation(java.lang.Class, java.lang.Class)
+	 */
+	@SuppressWarnings("unchecked")
+	public <T, ID extends Serializable> MongoEntityInformation<T, ID> getEntityInformation(Class<T> domainClass,
+			Class<?> collectionClass) {
+
+		MongoPersistentEntity<T> persistentEntity = (MongoPersistentEntity<T>) mappingContext
+				.getPersistentEntity(domainClass);
+		String customCollectionName = collectionClass == null ? null : mappingContext.getPersistentEntity(collectionClass)
+				.getCollection();
+
+		return new MappingMongoEntityInformation<T, ID>(persistentEntity, customCollectionName);
+	}
+}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 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.
@@ -19,13 +19,13 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.index.Index;
 import org.springframework.data.mongodb.core.query.Order;
-import org.springframework.data.mongodb.repository.query.MongoEntityMetadata;
+import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
 import org.springframework.data.mongodb.repository.query.PartTreeMongoQuery;
 import org.springframework.data.mongodb.repository.query.QueryUtils;
 import org.springframework.data.repository.core.support.QueryCreationListener;
@@ -43,7 +43,7 @@ import org.springframework.util.Assert;
 class IndexEnsuringQueryCreationListener implements QueryCreationListener<PartTreeMongoQuery> {
 
 	private static final Set<Type> GEOSPATIAL_TYPES = new HashSet<Type>(Arrays.asList(Type.NEAR, Type.WITHIN));
-	private static final Logger LOG = LoggerFactory.getLogger(IndexEnsuringQueryCreationListener.class);
+	private static final Log LOG = LogFactory.getLog(IndexEnsuringQueryCreationListener.class);
 
 	private final MongoOperations operations;
 
@@ -85,7 +85,7 @@ class IndexEnsuringQueryCreationListener implements QueryCreationListener<PartTr
 			}
 		}
 
-		MongoEntityMetadata<?> metadata = query.getQueryMethod().getEntityInformation();
+		MongoEntityInformation<?, ?> metadata = query.getQueryMethod().getEntityInformation();
 		operations.indexOps(metadata.getCollectionName()).ensureIndex(index);
 		LOG.debug(String.format("Created %s!", index));
 	}
@@ -99,4 +99,4 @@ class IndexEnsuringQueryCreationListener implements QueryCreationListener<PartTr
 		org.springframework.data.domain.Sort.Order order = sort.getOrderFor(property);
 		return order == null ? Order.DESCENDING : order.isAscending() ? Order.ASCENDING : Order.DESCENDING;
 	}
-}
+}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 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.
@@ -21,11 +21,10 @@ import java.io.Serializable;
 import java.lang.reflect.Method;
 
 import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.mapping.model.MappingException;
 import org.springframework.data.mongodb.core.MongoOperations;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.data.mongodb.repository.query.EntityInformationCreator;
 import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
 import org.springframework.data.mongodb.repository.query.MongoQueryMethod;
 import org.springframework.data.mongodb.repository.query.PartTreeMongoQuery;
@@ -47,18 +46,20 @@ import org.springframework.util.Assert;
 public class MongoRepositoryFactory extends RepositoryFactorySupport {
 
 	private final MongoOperations mongoOperations;
-	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
+	private final EntityInformationCreator entityInformationCreator;
 
 	/**
-	 * Creates a new {@link MongoRepositoryFactory} with the given {@link MongoOperations}.
+	 * Creates a new {@link MongoRepositoryFactory} with the given {@link MongoTemplate} and {@link MappingContext}.
 	 * 
-	 * @param mongoOperations must not be {@literal null}
+	 * @param template must not be {@literal null}
+	 * @param mappingContext
 	 */
 	public MongoRepositoryFactory(MongoOperations mongoOperations) {
 
 		Assert.notNull(mongoOperations);
 		this.mongoOperations = mongoOperations;
-		this.mappingContext = mongoOperations.getConverter().getMappingContext();
+		this.entityInformationCreator = new DefaultEntityInformationCreator(mongoOperations.getConverter()
+				.getMappingContext());
 	}
 
 	/*
@@ -80,7 +81,7 @@ public class MongoRepositoryFactory extends RepositoryFactorySupport {
 	protected Object getTargetRepository(RepositoryMetadata metadata) {
 
 		Class<?> repositoryInterface = metadata.getRepositoryInterface();
-		MongoEntityInformation<?, Serializable> entityInformation = getEntityInformation(metadata.getDomainType());
+		MongoEntityInformation<?, Serializable> entityInformation = getEntityInformation(metadata.getDomainClass());
 
 		if (isQueryDslRepository(repositoryInterface)) {
 			return new QueryDslMongoRepository(entityInformation, mongoOperations);
@@ -116,7 +117,7 @@ public class MongoRepositoryFactory extends RepositoryFactorySupport {
 		 */
 		public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, NamedQueries namedQueries) {
 
-			MongoQueryMethod queryMethod = new MongoQueryMethod(method, metadata, mappingContext);
+			MongoQueryMethod queryMethod = new MongoQueryMethod(method, metadata, entityInformationCreator);
 			String namedQueryName = queryMethod.getNamedQueryName();
 
 			if (namedQueries.hasQuery(namedQueryName)) {
@@ -135,16 +136,7 @@ public class MongoRepositoryFactory extends RepositoryFactorySupport {
 	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getEntityInformation(java.lang.Class)
 	 */
 	@Override
-	@SuppressWarnings("unchecked")
 	public <T, ID extends Serializable> MongoEntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
-
-		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(domainClass);
-
-		if (entity == null) {
-			throw new MappingException(String.format("Could not lookup mapping metadata for domain class %s!",
-					domainClass.getName()));
-		}
-
-		return new MappingMongoEntityInformation<T, ID>((MongoPersistentEntity<T>) entity);
+		return entityInformationCreator.getEntityInformation(domainClass);
 	}
-}
+}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QueryDslMongoRepository.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 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.
@@ -17,14 +17,20 @@ package org.springframework.data.mongodb.repository.support;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.regex.Pattern;
 
+import org.apache.commons.collections15.Transformer;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Order;
+import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
 import org.springframework.data.querydsl.EntityPathResolver;
 import org.springframework.data.querydsl.QueryDslPredicateExecutor;
@@ -32,10 +38,15 @@ import org.springframework.data.querydsl.SimpleEntityPathResolver;
 import org.springframework.data.repository.core.EntityMetadata;
 import org.springframework.util.Assert;
 
+import com.mongodb.DBCollection;
+import com.mongodb.DBObject;
 import com.mysema.query.mongodb.MongodbQuery;
+import com.mysema.query.mongodb.MongodbSerializer;
 import com.mysema.query.types.EntityPath;
 import com.mysema.query.types.Expression;
 import com.mysema.query.types.OrderSpecifier;
+import com.mysema.query.types.Path;
+import com.mysema.query.types.PathMetadata;
 import com.mysema.query.types.Predicate;
 import com.mysema.query.types.path.PathBuilder;
 
@@ -47,6 +58,7 @@ import com.mysema.query.types.path.PathBuilder;
 public class QueryDslMongoRepository<T, ID extends Serializable> extends SimpleMongoRepository<T, ID> implements
 		QueryDslPredicateExecutor<T> {
 
+	private final MongodbSerializer serializer;
 	private final PathBuilder<T> builder;
 
 	/**
@@ -57,6 +69,7 @@ public class QueryDslMongoRepository<T, ID extends Serializable> extends SimpleM
 	 * @param template
 	 */
 	public QueryDslMongoRepository(MongoEntityInformation<T, ID> entityInformation, MongoOperations mongoOperations) {
+
 		this(entityInformation, mongoOperations, SimpleEntityPathResolver.INSTANCE);
 	}
 
@@ -75,27 +88,40 @@ public class QueryDslMongoRepository<T, ID extends Serializable> extends SimpleM
 		Assert.notNull(resolver);
 		EntityPath<T> path = resolver.createPath(entityInformation.getJavaType());
 		this.builder = new PathBuilder<T>(path.getType(), path.getMetadata());
+		this.serializer = new SpringDataMongodbSerializer(mongoOperations.getConverter());
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#findOne(com.mysema.query.types.Predicate)
+	 * 
+	 * @see
+	 * org.springframework.data.mongodb.repository.QueryDslExecutor
+	 * #findOne(com.mysema.query.types.Predicate)
 	 */
 	public T findOne(Predicate predicate) {
+
 		return createQueryFor(predicate).uniqueResult();
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#findAll(com.mysema.query.types.Predicate)
+	 * 
+	 * @see
+	 * org.springframework.data.mongodb.repository.QueryDslExecutor
+	 * #findAll(com.mysema.query.types.Predicate)
 	 */
 	public List<T> findAll(Predicate predicate) {
+
 		return createQueryFor(predicate).list();
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#findAll(com.mysema.query.types.Predicate, com.mysema.query.types.OrderSpecifier<?>[])
+	 * 
+	 * @see
+	 * org.springframework.data.mongodb.repository.QueryDslExecutor
+	 * #findAll(com.mysema.query.types.Predicate,
+	 * com.mysema.query.types.OrderSpecifier<?>[])
 	 */
 	public List<T> findAll(Predicate predicate, OrderSpecifier<?>... orders) {
 
@@ -104,7 +130,11 @@ public class QueryDslMongoRepository<T, ID extends Serializable> extends SimpleM
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#findAll(com.mysema.query.types.Predicate, org.springframework.data.domain.Pageable)
+	 * 
+	 * @see
+	 * org.springframework.data.mongodb.repository.QueryDslExecutor
+	 * #findAll(com.mysema.query.types.Predicate,
+	 * org.springframework.data.domain.Pageable)
 	 */
 	public Page<T> findAll(Predicate predicate, Pageable pageable) {
 
@@ -116,9 +146,13 @@ public class QueryDslMongoRepository<T, ID extends Serializable> extends SimpleM
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#count(com.mysema.query.types.Predicate)
+	 * 
+	 * @see
+	 * org.springframework.data.mongodb.repository.QueryDslExecutor
+	 * #count(com.mysema.query.types.Predicate)
 	 */
 	public long count(Predicate predicate) {
+
 		return createQueryFor(predicate).count();
 	}
 
@@ -130,9 +164,13 @@ public class QueryDslMongoRepository<T, ID extends Serializable> extends SimpleM
 	 */
 	private MongodbQuery<T> createQueryFor(Predicate predicate) {
 
-		Class<T> domainType = getEntityInformation().getJavaType();
-
-		MongodbQuery<T> query = new SpringDataMongodbQuery<T>(getMongoOperations(), domainType);
+		DBCollection collection = getMongoOperations().getCollection(getEntityInformation().getCollectionName());
+		MongodbQuery<T> query = new MongodbQuery<T>(collection, new Transformer<DBObject, T>() {
+			public T transform(DBObject input) {
+				Class<T> type = getEntityInformation().getJavaType();
+				return getMongoOperations().getConverter().read(type, input);
+			}
+		}, serializer);
 		return query.where(predicate);
 	}
 
@@ -187,4 +225,40 @@ public class QueryDslMongoRepository<T, ID extends Serializable> extends SimpleM
 		return new OrderSpecifier(order.isAscending() ? com.mysema.query.types.Order.ASC
 				: com.mysema.query.types.Order.DESC, property);
 	}
+
+	/**
+	 * Custom {@link MongodbSerializer} to take mapping information into account when building keys for constraints.
+	 * 
+	 * @author Oliver Gierke
+	 */
+	static class SpringDataMongodbSerializer extends MongodbSerializer {
+
+		private final MongoConverter converter;
+		private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
+
+		/**
+		 * Creates a new {@link SpringDataMongodbSerializer} for the given {@link MappingContext}.
+		 * 
+		 * @param mappingContext
+		 */
+		public SpringDataMongodbSerializer(MongoConverter converter) {
+			this.mappingContext = converter.getMappingContext();
+			this.converter = converter;
+		}
+
+		@Override
+		protected String getKeyForPath(Path<?> expr, PathMetadata<?> metadata) {
+
+			Path<?> parent = metadata.getParent();
+			MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(parent.getType());
+			MongoPersistentProperty property = entity.getPersistentProperty(metadata.getExpression().toString());
+			return property == null ? super.getKeyForPath(expr, metadata) : property.getFieldName();
+		}
+
+		@Override
+		protected DBObject asDBObject(String key, Object value) {
+
+			return super.asDBObject(key, value instanceof Pattern ? value : converter.convertToMongoType(value));
+		}
+	}
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslRepositorySupport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 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.
@@ -15,12 +15,16 @@
  */
 package org.springframework.data.mongodb.repository.support;
 
+import org.apache.commons.collections15.Transformer;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.util.Assert;
 
+import com.mongodb.DBCollection;
+import com.mongodb.DBObject;
 import com.mysema.query.mongodb.MongodbQuery;
+import com.mysema.query.mongodb.MongodbSerializer;
 import com.mysema.query.types.EntityPath;
 
 /**
@@ -32,6 +36,7 @@ public abstract class QuerydslRepositorySupport {
 
 	private final MongoOperations template;
 	private final MappingContext<? extends MongoPersistentEntity<?>, ?> context;
+	private final MongodbSerializer serializer;
 
 	/**
 	 * Creates a new {@link QuerydslRepositorySupport} for the given {@link MongoOperations}.
@@ -39,11 +44,10 @@ public abstract class QuerydslRepositorySupport {
 	 * @param operations must not be {@literal null}
 	 */
 	public QuerydslRepositorySupport(MongoOperations operations) {
-
 		Assert.notNull(operations);
-
 		this.template = operations;
 		this.context = operations.getConverter().getMappingContext();
+		this.serializer = new MongodbSerializer();
 	}
 
 	/**
@@ -71,6 +75,11 @@ public abstract class QuerydslRepositorySupport {
 		Assert.notNull(path);
 		Assert.hasText(collection);
 
-		return new SpringDataMongodbQuery<T>(template, path.getType(), collection);
+		DBCollection dbCollection = template.getCollection(collection);
+		return new MongodbQuery<T>(dbCollection, new Transformer<DBObject, T>() {
+			public T transform(DBObject input) {
+				return template.getConverter().read(path.getType(), input);
+			}
+		}, serializer);
 	}
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SimpleMongoRepository.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 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.
@@ -20,9 +20,7 @@ import static org.springframework.data.mongodb.core.query.Criteria.*;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -32,8 +30,9 @@ import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
+import org.springframework.data.mongodb.repository.query.QueryUtils;
+import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.util.Assert;
 
 /**
@@ -41,7 +40,7 @@ import org.springframework.util.Assert;
  * 
  * @author Oliver Gierke
  */
-public class SimpleMongoRepository<T, ID extends Serializable> implements MongoRepository<T, ID> {
+public class SimpleMongoRepository<T, ID extends Serializable> implements PagingAndSortingRepository<T, ID> {
 
 	private final MongoOperations mongoOperations;
 	private final MongoEntityInformation<T, ID> entityInformation;
@@ -64,7 +63,7 @@ public class SimpleMongoRepository<T, ID extends Serializable> implements MongoR
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.CrudRepository#save(java.lang.Object)
 	 */
-	public <S extends T> S save(S entity) {
+	public T save(T entity) {
 
 		Assert.notNull(entity, "Entity must not be null!");
 
@@ -76,13 +75,13 @@ public class SimpleMongoRepository<T, ID extends Serializable> implements MongoR
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.CrudRepository#save(java.lang.Iterable)
 	 */
-	public <S extends T> List<S> save(Iterable<S> entities) {
+	public List<T> save(Iterable<? extends T> entities) {
 
 		Assert.notNull(entities, "The given Iterable of entities not be null!");
 
-		List<S> result = new ArrayList<S>();
+		List<T> result = new ArrayList<T>();
 
-		for (S entity : entities) {
+		for (T entity : entities) {
 			save(entity);
 			result.add(entity);
 		}
@@ -114,11 +113,8 @@ public class SimpleMongoRepository<T, ID extends Serializable> implements MongoR
 	public boolean exists(ID id) {
 
 		Assert.notNull(id, "The given id must not be null!");
-
-		final Query idQuery = getIdQuery(id);
-		idQuery.fields();
-
-		return mongoOperations.findOne(idQuery, entityInformation.getJavaType(), entityInformation.getCollectionName()) != null;
+		return mongoOperations.findOne(new Query(Criteria.where("_id").is(id)), Object.class,
+				entityInformation.getCollectionName()) != null;
 	}
 
 	/*
@@ -175,23 +171,10 @@ public class SimpleMongoRepository<T, ID extends Serializable> implements MongoR
 	 * @see org.springframework.data.repository.CrudRepository#findAll()
 	 */
 	public List<T> findAll() {
+
 		return findAll(new Query());
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#findAll(java.lang.Iterable)
-	 */
-	public Iterable<T> findAll(Iterable<ID> ids) {
-
-		Set<ID> parameters = new HashSet<ID>();
-		for (ID id : ids) {
-			parameters.add(id);
-		}
-
-		return findAll(new Query(new Criteria(entityInformation.getIdAttribute()).in(parameters)));
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.PagingAndSortingRepository#findAll(org.springframework.data.domain.Pageable)
@@ -199,7 +182,7 @@ public class SimpleMongoRepository<T, ID extends Serializable> implements MongoR
 	public Page<T> findAll(final Pageable pageable) {
 
 		Long count = count();
-		List<T> list = findAll(new Query().with(pageable));
+		List<T> list = findAll(QueryUtils.applyPagination(new Query(), pageable));
 
 		return new PageImpl<T>(list, pageable, count);
 	}
@@ -208,8 +191,9 @@ public class SimpleMongoRepository<T, ID extends Serializable> implements MongoR
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.PagingAndSortingRepository#findAll(org.springframework.data.domain.Sort)
 	 */
-	public List<T> findAll(Sort sort) {
-		return findAll(new Query().with(sort));
+	public List<T> findAll(final Sort sort) {
+
+		return findAll(QueryUtils.applySorting(new Query(), sort));
 	}
 
 	private List<T> findAll(Query query) {