DATAMONGO-456 - Fixed <db-factory /> element documentation in XSD.

If the entity being removed using MongoTemplate.remove(object, collectionName) contained an id that could be converted into an ObjectID it wasn't removed correctly currently. This was caused by the fact that the intermediate call didn't hand over the entity type and thus the id conversion failed. This in turn caused the query not to match the previous saved object.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,9 +0,0 @@
-Thank you for proposing a pull request. This template will guide you through the essential steps necessary for a pull request.
-Make sure that:
-
-- [ ] You have read the [Spring Data contribution guidelines](https://github.com/spring-projects/spring-data-build/blob/master/CONTRIBUTING.adoc).
-- [ ] There is a ticket in the bug tracker for the project in our [JIRA](https://jira.spring.io/browse/DATAMONGO).
-- [ ] You use the code formatters provided [here](https://github.com/spring-projects/spring-data-build/tree/master/etc/ide) and have them applied to your changes. Don’t submit any formatting related changes.
-- [ ] You submit test cases (unit or integration tests) that back your changes.
-- [ ] You added yourself as author in the headers of the classes you touched. Amend the date range in the Apache license header if needed. For new types, add the license header (copy from another file and set the current year only).
-- [ ] You provide your full name and an email address registered with your GitHub account. If you’re a first-time submitter, make sure you have completed the [Contributor’s License Agreement form](https://support.springsource.com/spring_committer_signup).

.travis.yml

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

CODE_OF_CONDUCT.adoc

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

CONTRIBUTING.adoc

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

README.md

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

etc/formatting.xml

@@ -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="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.7"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.7"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
-</profile>
-</profiles>

pom.xml

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@ package org.springframework.data.mongodb.crossstore;
 
 import javax.persistence.EntityManagerFactory;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.dao.DataIntegrityViolationException;
@@ -34,22 +34,20 @@ import com.mongodb.DBCollection;
 import com.mongodb.DBObject;
 import com.mongodb.MongoException;
 
-/**
- * @author Thomas Risberg
- * @author Oliver Gierke
- * @author Alex Vengrovsk
- * @author Mark Paluch
- */
 public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 
 	private static final String ENTITY_CLASS = "_entity_class";
+
 	private static final String ENTITY_ID = "_entity_id";
+
 	private static final String ENTITY_FIELD_NAME = "_entity_field_name";
+
 	private static final String ENTITY_FIELD_CLASS = "_entity_field_class";
 
-	private final Logger log = LoggerFactory.getLogger(getClass());
+	protected final Log log = LogFactory.getLog(getClass());
 
 	private MongoTemplate mongoTemplate;
+
 	private EntityManagerFactory entityManagerFactory;
 
 	public void setMongoTemplate(MongoTemplate mongoTemplate) {
@@ -60,12 +58,10 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 		this.entityManagerFactory = entityManagerFactory;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.crossstore.ChangeSetPersister#getPersistentState(java.lang.Class, java.lang.Object, org.springframework.data.crossstore.ChangeSet)
-	 */
-	public void getPersistentState(Class<? extends ChangeSetBacked> entityClass, Object id, final ChangeSet changeSet)
-			throws DataAccessException, NotFoundException {
+
+	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");
@@ -78,25 +74,27 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 		dbk.put(ENTITY_ID, id);
 		dbk.put(ENTITY_CLASS, entityClass.getName());
 		if (log.isDebugEnabled()) {
-			log.debug("Loading MongoDB data for {}", dbk);
+			log.debug("Loading MongoDB data for " + dbk);
 		}
 		mongoTemplate.execute(collName, new CollectionCallback<Object>() {
-			public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+			public Object doInCollection(DBCollection collection)
+					throws MongoException, DataAccessException {
 				for (DBObject dbo : collection.find(dbk)) {
 					String key = (String) dbo.get(ENTITY_FIELD_NAME);
 					if (log.isDebugEnabled()) {
-						log.debug("Processing key: {}", key);
+						log.debug("Processing key: " + key);
 					}
 					if (!changeSet.getValues().containsKey(key)) {
 						String className = (String) dbo.get(ENTITY_FIELD_CLASS);
 						if (className == null) {
 							throw new DataIntegrityViolationException(
-									"Unble to convert property " + key + ": Invalid metadata, " + ENTITY_FIELD_CLASS + " not available");
+									"Unble to convert property " + key
+									+ ": Invalid metadata, " + ENTITY_FIELD_CLASS + " not available");
 						}
 						Class<?> clazz = ClassUtils.resolveClassName(className, ClassUtils.getDefaultClassLoader());
 						Object value = mongoTemplate.getConverter().read(clazz, dbo);
 						if (log.isDebugEnabled()) {
-							log.debug("Adding to ChangeSet: {}", key);
+							log.debug("Adding to ChangeSet: " + key);
 						}
 						changeSet.set(key, value);
 					}
@@ -106,25 +104,15 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.crossstore.ChangeSetPersister#getPersistentId(org.springframework.data.crossstore.ChangeSetBacked, org.springframework.data.crossstore.ChangeSet)
-	 */
 	public Object getPersistentId(ChangeSetBacked entity, ChangeSet cs) throws DataAccessException {
-		if (log.isDebugEnabled()) {
-			log.debug("getPersistentId called on {}", entity);
-		}
+		log.debug("getPersistentId called on " + entity);
 		if (entityManagerFactory == null) {
 			throw new DataAccessResourceFailureException("EntityManagerFactory cannot be null");
 		}
-
-		return entityManagerFactory.getPersistenceUnitUtil().getIdentifier(entity);
+		Object o = entityManagerFactory.getPersistenceUnitUtil().getIdentifier(entity);
+		return o;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.crossstore.ChangeSetPersister#persistState(org.springframework.data.crossstore.ChangeSetBacked, org.springframework.data.crossstore.ChangeSet)
-	 */
 	public Object persistState(ChangeSetBacked entity, ChangeSet cs) throws DataAccessException {
 		if (cs == null) {
 			log.debug("Flush: changeset was null, nothing to flush.");
@@ -132,7 +120,7 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 		}
 
 		if (log.isDebugEnabled()) {
-			log.debug("Flush: changeset: {}", cs.getValues());
+			log.debug("Flush: changeset: " + cs.getValues());
 		}
 
 		String collName = getCollectionNameForEntity(entity.getClass());
@@ -147,26 +135,30 @@ 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);
 					}
 				});
 				if (value == null) {
 					if (log.isDebugEnabled()) {
-						log.debug("Flush: removing: {}", dbQuery);
+						log.debug("Flush: removing: " + dbQuery);
 					}
 					mongoTemplate.execute(collName, new CollectionCallback<Object>() {
-						public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+						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()) {
-						log.debug("Flush: saving: {}", dbQuery);
+						log.debug("Flush: saving: " + dbQuery);
 					}
 					mongoTemplate.getConverter().write(value, dbDoc);
 					dbDoc.put(ENTITY_FIELD_CLASS, value.getClass().getName());
@@ -174,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;
 						}
@@ -185,13 +178,8 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 		return 0L;
 	}
 
-	/**
-	 * Returns the collection the given entity type shall be persisted to.
-	 * 
-	 * @param entityClass must not be {@literal null}.
-	 * @return
-	 */
 	private String getCollectionNameForEntity(Class<? extends ChangeSetBacked> entityClass) {
-		return mongoTemplate.getCollectionName(entityClass);
+		return ClassUtils.getQualifiedName(entityClass);
 	}
+
 }

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

@@ -21,12 +21,13 @@ import javax.persistence.EntityManager;
 import javax.persistence.Transient;
 import javax.persistence.Entity;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.reflect.FieldSignature;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataAccessException;
+
 import org.springframework.data.mongodb.crossstore.RelatedDocument;
 import org.springframework.data.mongodb.crossstore.DocumentBacked;
 import org.springframework.data.crossstore.ChangeSetBackedTransactionSynchronization;
@@ -37,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 Logger LOGGER = LoggerFactory.getLogger(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/main/java/org/springframework/data/mongodb/crossstore/package-info.java

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

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

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

spring-data-mongodb-cross-store/src/test/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-cross-store/template.mf

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

spring-data-mongodb-distribution/pom.xml

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

spring-data-mongodb-log4j/README.md

@@ -32,7 +32,7 @@ An example log entry might look like:
     {
       "_id" : ObjectId("4d89341a8ef397e06940d5cd"),
       "applicationId" : "my.application",
-      "name" : "org.springframework.data.mongodb.log4j.MongoLog4jAppenderIntegrationTests",
+      "name" : "org.springframework.data.mongodb.log4j.AppenderTest",
       "level" : "DEBUG",
       "timestamp" : ISODate("2011-03-23T16:53:46.778Z"),
       "properties" : {

spring-data-mongodb-log4j/pom.xml

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

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2016 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,286 +13,196 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.data.mongodb.log4j;
 
 import java.net.UnknownHostException;
 import java.util.Arrays;
 import java.util.Calendar;
-import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 
+import com.mongodb.BasicDBList;
+import com.mongodb.BasicDBObject;
+import com.mongodb.DB;
+import com.mongodb.Mongo;
+import com.mongodb.WriteConcern;
 import org.apache.log4j.AppenderSkeleton;
 import org.apache.log4j.Level;
 import org.apache.log4j.MDC;
 import org.apache.log4j.PatternLayout;
 import org.apache.log4j.spi.LoggingEvent;
 
-import com.mongodb.BasicDBList;
-import com.mongodb.BasicDBObject;
-import com.mongodb.DB;
-import com.mongodb.Mongo;
-import com.mongodb.MongoClient;
-import com.mongodb.MongoCredential;
-import com.mongodb.ServerAddress;
-import com.mongodb.WriteConcern;
-
 /**
- * Log4j appender writing log entries into a MongoDB instance.
- *
- * @author Jon Brisbin
- * @author Oliver Gierke
- * @author Christoph Strobl
- * @author Ricardo Espirito Santo
+ * @author Jon Brisbin <jbrisbin@vmware.com>
  */
 public class MongoLog4jAppender extends AppenderSkeleton {
 
-	public static final String LEVEL = "level";
-	public static final String NAME = "name";
-	public static final String APP_ID = "applicationId";
-	public static final String TIMESTAMP = "timestamp";
-	public static final String PROPERTIES = "properties";
-	public static final String TRACEBACK = "traceback";
-	public static final String MESSAGE = "message";
-	public static final String YEAR = "year";
-	public static final String MONTH = "month";
-	public static final String DAY = "day";
-	public static final String HOUR = "hour";
+  public static final String LEVEL = "level";
+  public static final String NAME = "name";
+  public static final String APP_ID = "applicationId";
+  public static final String TIMESTAMP = "timestamp";
+  public static final String PROPERTIES = "properties";
+  public static final String TRACEBACK = "traceback";
+  public static final String MESSAGE = "message";
+  public static final String YEAR = "year";
+  public static final String MONTH = "month";
+  public static final String DAY = "day";
+  public static final String HOUR = "hour";
 
-	protected String host = "localhost";
-	protected int port = 27017;
-	protected String username;
-	protected String password;
-	protected String authenticationDatabase;
-	protected String database = "logs";
-	protected String collectionPattern = "%c";
-	protected PatternLayout collectionLayout = new PatternLayout(collectionPattern);
-	protected String applicationId = System.getProperty("APPLICATION_ID", null);
-	protected WriteConcern warnOrHigherWriteConcern = WriteConcern.ACKNOWLEDGED;
-	protected WriteConcern infoOrLowerWriteConcern = WriteConcern.UNACKNOWLEDGED;
-	protected Mongo mongo;
-	protected DB db;
+  protected String host = "localhost";
+  protected int port = 27017;
+  protected String database = "logs";
+  protected String collectionPattern = "%c";
+  protected PatternLayout collectionLayout = new PatternLayout(collectionPattern);
+  protected String applicationId = System.getProperty("APPLICATION_ID", null);
+  protected WriteConcern warnOrHigherWriteConcern = WriteConcern.SAFE;
+  protected WriteConcern infoOrLowerWriteConcern = WriteConcern.NORMAL;
+  protected Mongo mongo;
+  protected DB db;
 
-	public MongoLog4jAppender() {}
+  public MongoLog4jAppender() {
+  }
 
-	public MongoLog4jAppender(boolean isActive) {
-		super(isActive);
-	}
+  public MongoLog4jAppender(boolean isActive) {
+    super(isActive);
+  }
 
-	public String getHost() {
-		return host;
-	}
+  public String getHost() {
+    return host;
+  }
 
-	public void setHost(String host) {
-		this.host = host;
-	}
+  public void setHost(String host) {
+    this.host = host;
+  }
 
-	public int getPort() {
-		return port;
-	}
+  public int getPort() {
+    return port;
+  }
 
-	public void setPort(int port) {
-		this.port = port;
-	}
+  public void setPort(int port) {
+    this.port = port;
+  }
 
-	/**
-	 * @return
-	 * @since 1.10
-	 */
-	public String getUsername() {
-		return username;
-	}
+  public String getDatabase() {
+    return database;
+  }
 
-	/**
-	 * @param username may be {@literal null} for unauthenticated access.
-	 * @since 1.10
-	 */
-	public void setUsername(String username) {
-		this.username = username;
-	}
+  public void setDatabase(String database) {
+    this.database = database;
+  }
 
-	/**
-	 * @return
-	 * @since 1.10
-	 */
-	public String getPassword() {
-		return password;
-	}
+  public String getCollectionPattern() {
+    return collectionPattern;
+  }
 
-	/**
-	 * @param password may be {@literal null} for unauthenticated access.
-	 * @since 1.10
-	 */
-	public void setPassword(String password) {
-		this.password = password;
-	}
+  public void setCollectionPattern(String collectionPattern) {
+    this.collectionPattern = collectionPattern;
+    this.collectionLayout = new PatternLayout(collectionPattern);
+  }
 
-	/**
-	 * @return
-	 */
-	public String getAuthenticationDatabase() {
-		return authenticationDatabase;
-	}
+  public String getApplicationId() {
+    return applicationId;
+  }
 
-	/**
-	 * @param authenticationDatabase may be {@literal null} to use {@link #getDatabase()} as authentication database.
-	 * @since 1.10
-	 */
-	public void setAuthenticationDatabase(String authenticationDatabase) {
-		this.authenticationDatabase = authenticationDatabase;
-	}
+  public void setApplicationId(String applicationId) {
+    this.applicationId = applicationId;
+  }
 
-	public String getDatabase() {
-		return database;
-	}
+  public void setWarnOrHigherWriteConcern(String wc) {
+    this.warnOrHigherWriteConcern = WriteConcern.valueOf(wc);
+  }
 
-	public void setDatabase(String database) {
-		this.database = database;
-	}
+  public String getWarnOrHigherWriteConcern() {
+    return warnOrHigherWriteConcern.toString();
+  }
 
-	public String getCollectionPattern() {
-		return collectionPattern;
-	}
+  public String getInfoOrLowerWriteConcern() {
+    return infoOrLowerWriteConcern.toString();
+  }
 
-	public void setCollectionPattern(String collectionPattern) {
-		this.collectionPattern = collectionPattern;
-		this.collectionLayout = new PatternLayout(collectionPattern);
-	}
+  public void setInfoOrLowerWriteConcern(String wc) {
+    this.infoOrLowerWriteConcern = WriteConcern.valueOf(wc);
+  }
 
-	public String getApplicationId() {
-		return applicationId;
-	}
+  protected void connectToMongo() throws UnknownHostException {
+    this.mongo = new Mongo(host, port);
+    this.db = mongo.getDB(database);
+  }
 
-	public void setApplicationId(String applicationId) {
-		this.applicationId = applicationId;
-	}
+  @SuppressWarnings({"unchecked"})
+  @Override
+  protected void append(final LoggingEvent event) {
+    if (null == db) {
+      try {
+        connectToMongo();
+      } catch (UnknownHostException e) {
+        throw new RuntimeException(e.getMessage(), e);
+      }
+    }
 
-	public String getWarnOrHigherWriteConcern() {
-		return warnOrHigherWriteConcern.toString();
-	}
+    BasicDBObject dbo = new BasicDBObject();
+    if (null != applicationId) {
+      dbo.put(APP_ID, applicationId);
+      MDC.put(APP_ID, applicationId);
+    }
+    dbo.put(NAME, event.getLogger().getName());
+    dbo.put(LEVEL, event.getLevel().toString());
+    Calendar tstamp = Calendar.getInstance();
+    tstamp.setTimeInMillis(event.getTimeStamp());
+    dbo.put(TIMESTAMP, tstamp.getTime());
 
-	public void setWarnOrHigherWriteConcern(String wc) {
-		this.warnOrHigherWriteConcern = WriteConcern.valueOf(wc);
-	}
+    // Copy properties into document
+    Map<Object, Object> props = event.getProperties();
+    if (null != props && props.size() > 0) {
+      BasicDBObject propsDbo = new BasicDBObject();
+      for (Map.Entry<Object, Object> entry : props.entrySet()) {
+        propsDbo.put(entry.getKey().toString(), entry.getValue().toString());
+      }
+      dbo.put(PROPERTIES, propsDbo);
+    }
 
-	public String getInfoOrLowerWriteConcern() {
-		return infoOrLowerWriteConcern.toString();
-	}
+    // Copy traceback info (if there is any) into the document
+    String[] traceback = event.getThrowableStrRep();
+    if (null != traceback && traceback.length > 0) {
+      BasicDBList tbDbo = new BasicDBList();
+      tbDbo.addAll(Arrays.asList(traceback));
+      dbo.put(TRACEBACK, tbDbo);
+    }
 
-	public void setInfoOrLowerWriteConcern(String wc) {
-		this.infoOrLowerWriteConcern = WriteConcern.valueOf(wc);
-	}
+    // Put the rendered message into the document
+    dbo.put(MESSAGE, event.getRenderedMessage());
 
-	protected void connectToMongo() throws UnknownHostException {
+    // Insert the document
+    Calendar now = Calendar.getInstance();
+    MDC.put(YEAR, now.get(Calendar.YEAR));
+    MDC.put(MONTH, String.format("%1$02d", now.get(Calendar.MONTH) + 1));
+    MDC.put(DAY, String.format("%1$02d", now.get(Calendar.DAY_OF_MONTH)));
+    MDC.put(HOUR, String.format("%1$02d", now.get(Calendar.HOUR_OF_DAY)));
 
-		this.mongo = createMongoClient();
-		this.db = mongo.getDB(database);
-	}
+    String coll = collectionLayout.format(event);
 
-	private MongoClient createMongoClient() throws UnknownHostException {
+    MDC.remove(YEAR);
+    MDC.remove(MONTH);
+    MDC.remove(DAY);
+    MDC.remove(HOUR);
+    if (null != applicationId) {
+      MDC.remove(APP_ID);
+    }
 
-		ServerAddress serverAddress = new ServerAddress(host, port);
+    WriteConcern wc;
+    if (event.getLevel().isGreaterOrEqual(Level.WARN)) {
+      wc = warnOrHigherWriteConcern;
+    } else {
+      wc = infoOrLowerWriteConcern;
+    }
+    db.getCollection(coll).insert(dbo, wc);
+  }
 
-		if (null == password || null == username) {
-			return new MongoClient(serverAddress);
-		}
+  public void close() {
+    mongo.close();
+  }
 
-		String authenticationDatabaseToUse = authenticationDatabase == null ? this.database : authenticationDatabase;
-		MongoCredential mongoCredential = MongoCredential.createCredential(username,
-				authenticationDatabaseToUse, password.toCharArray());
-		List<MongoCredential> credentials = Collections.singletonList(mongoCredential);
-		return new MongoClient(serverAddress, credentials);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.apache.log4j.AppenderSkeleton#append(org.apache.log4j.spi.LoggingEvent)
-	 */
-	@Override
-	@SuppressWarnings({ "unchecked" })
-	protected void append(final LoggingEvent event) {
-		if (null == db) {
-			try {
-				connectToMongo();
-			} catch (UnknownHostException e) {
-				throw new RuntimeException(e.getMessage(), e);
-			}
-		}
-
-		BasicDBObject dbo = new BasicDBObject();
-		if (null != applicationId) {
-			dbo.put(APP_ID, applicationId);
-			MDC.put(APP_ID, applicationId);
-		}
-		dbo.put(NAME, event.getLogger().getName());
-		dbo.put(LEVEL, event.getLevel().toString());
-		Calendar tstamp = Calendar.getInstance();
-		tstamp.setTimeInMillis(event.getTimeStamp());
-		dbo.put(TIMESTAMP, tstamp.getTime());
-
-		// Copy properties into document
-		Map<Object, Object> props = event.getProperties();
-		if (null != props && !props.isEmpty()) {
-			BasicDBObject propsDbo = new BasicDBObject();
-			for (Map.Entry<Object, Object> entry : props.entrySet()) {
-				propsDbo.put(entry.getKey().toString(), entry.getValue().toString());
-			}
-			dbo.put(PROPERTIES, propsDbo);
-		}
-
-		// Copy traceback info (if there is any) into the document
-		String[] traceback = event.getThrowableStrRep();
-		if (null != traceback && traceback.length > 0) {
-			BasicDBList tbDbo = new BasicDBList();
-			tbDbo.addAll(Arrays.asList(traceback));
-			dbo.put(TRACEBACK, tbDbo);
-		}
-
-		// Put the rendered message into the document
-		dbo.put(MESSAGE, event.getRenderedMessage());
-
-		// Insert the document
-		Calendar now = Calendar.getInstance();
-		MDC.put(YEAR, now.get(Calendar.YEAR));
-		MDC.put(MONTH, String.format("%1$02d", now.get(Calendar.MONTH) + 1));
-		MDC.put(DAY, String.format("%1$02d", now.get(Calendar.DAY_OF_MONTH)));
-		MDC.put(HOUR, String.format("%1$02d", now.get(Calendar.HOUR_OF_DAY)));
-
-		String coll = collectionLayout.format(event);
-
-		MDC.remove(YEAR);
-		MDC.remove(MONTH);
-		MDC.remove(DAY);
-		MDC.remove(HOUR);
-		if (null != applicationId) {
-			MDC.remove(APP_ID);
-		}
-
-		WriteConcern wc;
-		if (event.getLevel().isGreaterOrEqual(Level.WARN)) {
-			wc = warnOrHigherWriteConcern;
-		} else {
-			wc = infoOrLowerWriteConcern;
-		}
-		db.getCollection(coll).insert(dbo, wc);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.apache.log4j.AppenderSkeleton#close()
-	 */
-	public void close() {
-
-		if (mongo != null) {
-			mongo.close();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.apache.log4j.AppenderSkeleton#requiresLayout()
-	 */
-	public boolean requiresLayout() {
-		return true;
-	}
+  public boolean requiresLayout() {
+    return true;
+  }
 }

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

@@ -1,5 +0,0 @@
-/**
- * Infrastructure for to use MongoDB as a logging sink.
- */
-package org.springframework.data.mongodb.log4j;
-

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

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

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

@@ -1,114 +0,0 @@
-/*
- * Copyright 2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.log4j;
-
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
-
-import java.util.Calendar;
-import java.util.Collections;
-
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
-import org.apache.log4j.MDC;
-import org.apache.log4j.PropertyConfigurator;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mongodb.BasicDBList;
-import com.mongodb.BasicDBObject;
-import com.mongodb.BasicDBObjectBuilder;
-import com.mongodb.DB;
-import com.mongodb.DBCursor;
-import com.mongodb.MongoClient;
-import com.mongodb.MongoCredential;
-import com.mongodb.ServerAddress;
-
-/**
- * Integration tests for {@link MongoLog4jAppender} using authentication.
- *
- * @author Mark Paluch
- */
-public class MongoLog4jAppenderAuthenticationIntegrationTests {
-
-	private final static String username = "admin";
-	private final static String password = "test";
-	private final static String authenticationDatabase = "logs";
-
-	MongoClient mongo;
-	DB db;
-	String collection;
-	ServerAddress serverLocation;
-
-	Logger log;
-
-	@Before
-	public void setUp() throws Exception {
-
-		serverLocation = new ServerAddress("localhost", 27017);
-
-		mongo = new MongoClient(serverLocation);
-		db = mongo.getDB("logs");
-
-		BasicDBList roles = new BasicDBList();
-		roles.add("dbOwner");
-		db.command(new BasicDBObjectBuilder().add("createUser", username).add("pwd", password).add("roles", roles).get());
-		mongo.close();
-
-		mongo = new MongoClient(serverLocation, Collections
-				.singletonList(MongoCredential.createCredential(username, authenticationDatabase, password.toCharArray())));
-		db = mongo.getDB("logs");
-
-		Calendar now = Calendar.getInstance();
-		collection = String.valueOf(now.get(Calendar.YEAR)) + String.format("%1$02d", now.get(Calendar.MONTH) + 1);
-
-		LogManager.resetConfiguration();
-		PropertyConfigurator.configure(getClass().getResource("/log4j-with-authentication.properties"));
-
-		log = Logger.getLogger(MongoLog4jAppenderIntegrationTests.class.getName());
-	}
-
-	@After
-	public void tearDown() {
-
-		if (db != null) {
-			db.getCollection(collection).remove(new BasicDBObject());
-			db.command(new BasicDBObject("dropUser", username));
-		}
-
-		LogManager.resetConfiguration();
-		PropertyConfigurator.configure(getClass().getResource("/log4j.properties"));
-	}
-
-	@Test
-	public void testLogging() {
-
-		log.debug("DEBUG message");
-		log.info("INFO message");
-		log.warn("WARN message");
-		log.error("ERROR message");
-
-		DBCursor msgs = db.getCollection(collection).find();
-		assertThat(msgs.count(), is(4));
-	}
-
-	@Test
-	public void testProperties() {
-		MDC.put("property", "one");
-		log.debug("DEBUG message");
-	}
-}

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

@@ -1,87 +0,0 @@
-/*
- * Copyright 2011-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.log4j;
-
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
-
-import java.util.Calendar;
-
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
-import org.apache.log4j.MDC;
-import org.apache.log4j.PropertyConfigurator;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DB;
-import com.mongodb.DBCursor;
-import com.mongodb.MongoClient;
-import com.mongodb.ServerAddress;
-
-/**
- * Integration tests for {@link MongoLog4jAppender}.
- *
- * @author Jon Brisbin
- * @author Oliver Gierke
- * @author Christoph Strobl
- */
-public class MongoLog4jAppenderIntegrationTests {
-
-	MongoClient mongo;
-	DB db;
-	String collection;
-	ServerAddress serverLocation;
-	Logger log;
-
-	@Before
-	public void setUp() throws Exception {
-		serverLocation = new ServerAddress("localhost", 27017);
-
-		mongo = new MongoClient(serverLocation);
-		db = mongo.getDB("logs");
-
-		Calendar now = Calendar.getInstance();
-		collection = String.valueOf(now.get(Calendar.YEAR)) + String.format("%1$02d", now.get(Calendar.MONTH) + 1);
-
-		log = Logger.getLogger(MongoLog4jAppenderIntegrationTests.class.getName());
-	}
-
-	@After
-	public void tearDown() {
-		db.getCollection(collection).remove(new BasicDBObject());
-	}
-
-	@Test
-	public void testLogging() {
-
-		log.debug("DEBUG message");
-		log.info("INFO message");
-		log.warn("WARN message");
-		log.error("ERROR message");
-
-		DBCursor msgs = db.getCollection(collection).find();
-		assertThat(msgs.count(), is(4));
-	}
-
-	@Test
-	public void testProperties() {
-		MDC.put("property", "one");
-		log.debug("DEBUG message");
-	}
-}

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

@@ -1,34 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.log4j;
-
-import org.junit.Test;
-
-/**
- * Unit tests for {@link MongoLog4jAppender}.
- * 
- * @author Oliver Gierke
- */
-public class MongoLog4jAppenderUnitTests {
-
-	/**
-	 * @see DATAMONGO-641
-	 */
-	@Test
-	public void closesWithoutMongoInstancePresent() {
-		new MongoLog4jAppender().close();
-	}
-}

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

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

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

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

spring-data-mongodb-log4j/template.mf

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

spring-data-mongodb-parent/pom.xml

@@ -0,0 +1,409 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.springframework.data</groupId>
+  <artifactId>spring-data-mongodb-parent</artifactId>
+  <name>Spring Data MongoDB Parent</name>
+  <description>Spring Data project for MongoDB</description>
+  <url>http://www.springsource.org/spring-data/mongodb</url>
+  <version>1.0.5.BUILD-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <!-- versions for commonly-used dependencies -->
+    <junit.version>4.10</junit.version>
+    <log4j.version>1.2.16</log4j.version>
+    <org.mockito.version>1.8.4</org.mockito.version>
+    <hamcrest.version>1.2.1</hamcrest.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>
+      <email>trisberg at vmware.com</email>
+      <organization>SpringSource</organization>
+      <organizationUrl>http://www.SpringSource.com</organizationUrl>
+      <roles>
+        <role>Project Admin</role>
+        <role>Developer</role>
+      </roles>
+      <timezone>-5</timezone>
+    </developer>
+    <developer>
+      <id>mpollack</id>
+      <name>Mark Pollack</name>
+      <email>mpollack at vmware.com</email>
+      <organization>SpringSource</organization>
+      <organizationUrl>http://www.SpringSource.com</organizationUrl>
+      <roles>
+        <role>Project Admin</role>
+        <role>Developer</role>
+      </roles>
+      <timezone>-5</timezone>
+    </developer>
+    <developer>
+      <id>jbrisbin</id>
+      <name>Jon Brisbin</name>
+      <email>jbrisbin at vmware.com</email>
+      <organization>SpringSource</organization>
+      <organizationUrl>http://www.springsource.com</organizationUrl>
+      <roles>
+        <role>Developer</role>
+      </roles>
+      <timezone>-6</timezone>
+    </developer>
+  </developers>
+
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+      <comments>
+        Copyright 2010 the original author or authors.
+
+        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.
+      </comments>
+    </license>
+  </licenses>
+
+  <distributionManagement>
+    <!-- see 'staging' profile for dry-run deployment settings -->
+    <downloadUrl>http://www.springsource.com/download/community
+    </downloadUrl>
+    <site>
+      <id>static.springframework.org</id>
+      <url>
+        scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-mongodb/snapshot-site
+      </url>
+    </site>
+    <repository>
+      <id>spring-release</id>
+      <name>Spring Release Repository</name>
+      <url>s3://maven.springframework.org/release</url>
+    </repository>
+    <snapshotRepository>
+      <id>spring-snapshot</id>
+      <name>Spring Snapshot Repository</name>
+      <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-context</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.5.BUILD-SNAPSHOT</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>
+        <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-core</artifactId>
+        <version>${org.mockito.version}</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit-dep</artifactId>
+        <version>${junit.version}</version>
+        <scope>test</scope>
+      </dependency>
+
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    
+    <!-- Test dependencies -->
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j.version}</version>
+      <scope>test</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-library</artifactId>
+      <version>${hamcrest.version}</version>
+      <scope>test</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit-dep</artifactId>
+      <scope>test</scope>
+    </dependency>
+    
+  </dependencies>
+
+  <build>
+    <extensions>
+      <extension>
+        <!--
+              available only in the springframework maven repository. see
+              <repositories> section below
+            -->
+        <groupId>org.springframework.build.aws</groupId>
+        <artifactId>org.springframework.build.aws.maven</artifactId>
+        <version>3.1.0.RELEASE</version>
+      </extension>
+    </extensions>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.5.1</version>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+          <compilerArgument>-Xlint:-path</compilerArgument>
+          <showWarnings>true</showWarnings>
+          <showDeprecation>false</showDeprecation>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.1</version>
+        <configuration>
+           <useDefaultManifestFile>true</useDefaultManifestFile>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.10</version>
+        <configuration>
+          <useFile>false</useFile>
+          <includes>
+            <include>**/*Tests.java</include>
+          </includes>
+          <junitArtifactName>junit:junit-dep</junitArtifactName>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>2.1.2</version>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <!--
+                 configures the springsource bundlor plugin, which generates
+                 OSGI-compatible MANIFEST.MF files during the 'compile' phase of
+                 the maven build. this plugin is declared within the
+                 pluginManagement section because not every module that inherits
+                 from this pom needs bundlor's services, e.g.:
+                 spring-integration-samples and all its children. for this reason,
+                 all modules that wish to use bundlor must declare it explicitly.
+                 it is not necessary to specify the <version> or <configuration>
+                 sections, but groupId and artifactId are required. see
+                 http://static.springsource.org/s2-bundlor/1.0.x/user-guide/html/ch04s03.html
+                 for more info
+               -->
+          <groupId>com.springsource.bundlor</groupId>
+          <artifactId>com.springsource.bundlor.maven</artifactId>
+          <version>1.0.0.RELEASE</version>
+          <configuration>
+            <failOnWarnings>true</failOnWarnings>
+          </configuration>
+          <executions>
+            <execution>
+              <id>bundlor</id>
+              <goals>
+                <goal>bundlor</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>spring-plugins-release</id>
+      <url>http://repo.springsource.org/plugins-release</url>
+    </pluginRepository>
+    <pluginRepository>
+      <id>querydsl</id>
+      <url>http://source.mysema.com/maven2/releases</url>
+    </pluginRepository>
+  </pluginRepositories>
+  <repositories>
+    <repository>
+      <id>spring-libs-release</id>
+      <url>http://repo.springsource.org/libs-release</url>
+    </repository>
+  </repositories>
+  <reporting>
+    <plugins>
+      <plugin>
+        <!--
+              significantly speeds up the 'Dependencies' report during site
+              creation see
+              http://old.nabble.com/Skipping-dependency-report-during-Maven2-site-generation-td20116761.html
+            -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.1</version>
+        <configuration>
+          <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
+</project>

spring-data-mongodb/Spring Data MongoDB.sonargraph

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

spring-data-mongodb/pom.xml

@@ -1,28 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-
-	<artifactId>spring-data-mongodb</artifactId>
-
-	<name>Spring Data MongoDB - Core</name>
-	<description>MongoDB support for Spring Data</description>
-
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.10.0.RC1</version>
-		<relativePath>../pom.xml</relativePath>
+		<version>1.0.5.BUILD-SNAPSHOT</version>
+		<relativePath>../spring-data-mongodb-parent/pom.xml</relativePath>
 	</parent>
+	<artifactId>spring-data-mongodb</artifactId>
+	<name>Spring Data MongoDB</name>
 
 	<properties>
-		<objenesis>1.3</objenesis>
-		<equalsverifier>1.5</equalsverifier>
+		<mongo.version>2.7.1</mongo.version>
+		<querydsl.version>2.3.0</querydsl.version>
 	</properties>
 
 	<dependencies>
 
-		<!-- Spring -->
+		<!--  Spring -->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-tx</artifactId>
@@ -38,153 +33,97 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-expression</artifactId>
 		</dependency>
-
-		<!-- Spring Data -->
 		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-data-commons</artifactId>
-			<version>${springdata.commons}</version>
+			<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>
+
+		<!-- MongoDB -->
+		<dependency>
+			<groupId>org.mongodb</groupId>
+			<artifactId>mongo-java-driver</artifactId>
+			<version>${mongo.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.persistence</groupId>
+					<artifactId>persistence-api</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>
-			<groupId>com.querydsl</groupId>
+			<groupId>com.mysema.querydsl</groupId>
 			<artifactId>querydsl-mongodb</artifactId>
-			<version>${querydsl}</version>
+			<version>${querydsl.version}</version>
 			<optional>true</optional>
 		</dependency>
 
-		<dependency>
-			<groupId>com.querydsl</groupId>
-			<artifactId>querydsl-apt</artifactId>
-			<version>${querydsl}</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>
-			<scope>provided</scope>
-			<optional>true</optional>
-		</dependency>
-
-		<dependency>
-			<groupId>javax.el</groupId>
-			<artifactId>el-api</artifactId>
-			<version>${cdi}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.openwebbeans.test</groupId>
-			<artifactId>cditest-owb</artifactId>
-			<version>${webbeans}</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>
-			<optional>true</optional>
-		</dependency>
-
-		<dependency>
-			<groupId>org.objenesis</groupId>
-			<artifactId>objenesis</artifactId>
-			<version>${objenesis}</version>
-			<optional>true</optional>
-		</dependency>
-
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-validator</artifactId>
-			<version>4.2.0.Final</version>
-			<scope>test</scope>
-		</dependency>
-
+		<!-- Test dependencies -->
 		<dependency>
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time</artifactId>
-			<version>${jodatime}</version>
+			<version>1.6</version>
 			<scope>test</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>org.threeten</groupId>
-			<artifactId>threetenbp</artifactId>
-			<version>${threetenbp}</version>
-			<optional>true</optional>
-		</dependency>
-
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>${jackson}</version>
-			<optional>true</optional>
-		</dependency>
-
 		<dependency>
 			<groupId>org.slf4j</groupId>
-			<artifactId>jul-to-slf4j</artifactId>
-			<version>${slf4j}</version>
+			<artifactId>slf4j-api</artifactId>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
-			<groupId>nl.jqno.equalsverifier</groupId>
-			<artifactId>equalsverifier</artifactId>
-			<version>${equalsverifier}</version>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
 			<scope>test</scope>
 		</dependency>
 
 	</dependencies>
-
+	
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>com.springsource.bundlor</groupId>
+				<artifactId>com.springsource.bundlor.maven</artifactId>
+			</plugin>
 
 			<plugin>
 				<groupId>com.mysema.maven</groupId>
-				<artifactId>apt-maven-plugin</artifactId>
-				<version>${apt}</version>
+				<artifactId>maven-apt-plugin</artifactId>
+				<version>1.0.4</version>
 				<dependencies>
 					<dependency>
-						<groupId>com.querydsl</groupId>
+						<groupId>com.mysema.querydsl</groupId>
 						<artifactId>querydsl-apt</artifactId>
-						<version>${querydsl}</version>
+						<version>${querydsl.version}</version>
 					</dependency>
 				</dependencies>
 				<executions>
@@ -200,30 +139,7 @@
 					</execution>
 				</executions>
 			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.12</version>
-				<configuration>
-					<useFile>false</useFile>
-					<includes>
-						<include>**/*Tests.java</include>
-					</includes>
-					<excludes>
-						<exclude>**/PerformanceTests.java</exclude>
-					</excludes>
-					<systemPropertyVariables>
-						<java.util.logging.config.file>src/test/resources/logging.properties</java.util.logging.config.file>
-					</systemPropertyVariables>
-					<properties>
-						<property>
-							<name>listener</name>
-							<value>org.springframework.data.mongodb.test.util.CleanMongoDBJunitRunListener</value>
-						</property>
-					</properties>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
+	
 </project>

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

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

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/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/LazyLoadingException.java

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

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

@@ -1,23 +1,6 @@
-/*
- * Copyright 2011-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.data.mongodb;
 
 import org.springframework.dao.DataAccessException;
-import org.springframework.dao.support.PersistenceExceptionTranslator;
-import org.springframework.data.mongodb.core.MongoExceptionTranslator;
 
 import com.mongodb.DB;
 
@@ -25,7 +8,6 @@ import com.mongodb.DB;
  * Interface for factories creating {@link DB} instances.
  * 
  * @author Mark Pollack
- * @author Thomas Darimont
  */
 public interface MongoDbFactory {
 
@@ -45,11 +27,4 @@ public interface MongoDbFactory {
 	 * @throws DataAccessException
 	 */
 	DB getDb(String dbName) throws DataAccessException;
-
-	/**
-	 * Exposes a shared {@link MongoExceptionTranslator}.
-	 * 
-	 * @return will never be {@literal null}.
-	 */
-	PersistenceExceptionTranslator getExceptionTranslator();
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
  */
 package org.springframework.data.mongodb.config;
 
-import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -24,274 +22,89 @@ import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.data.annotation.Persistent;
 import org.springframework.data.authentication.UserCredentials;
-import org.springframework.data.mapping.context.MappingContextIsNewStrategyFactory;
-import org.springframework.data.mapping.model.CamelCaseAbbreviatingFieldNamingStrategy;
-import org.springframework.data.mapping.model.FieldNamingStrategy;
-import org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
-import org.springframework.data.mongodb.core.convert.CustomConversions;
-import org.springframework.data.mongodb.core.convert.DbRefResolver;
-import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
-import org.springframework.data.support.CachingIsNewStrategyFactory;
-import org.springframework.data.support.IsNewStrategyFactory;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
 import com.mongodb.Mongo;
-import com.mongodb.MongoClient;
 
 /**
- * Base class for Spring Data MongoDB configuration using JavaConfig.
+ * Abstract base class to ease JavaConfig setup for Spring Data MongoDB.
  * 
  * @author Mark Pollack
  * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Ryan Tenney
- * @author Christoph Strobl
  */
 @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 name of the authentication database to use. Defaults to {@literal null} and will turn into the value
-	 * returned by {@link #getDatabaseName()} later on effectively.
-	 * 
-	 * @return
-	 * @deprecated since 1.7. {@link MongoClient} should hold authentication data within
-	 *             {@link MongoClient#getCredentialsList()}
-	 */
-	@Deprecated
-	protected String getAuthenticationDatabaseName() {
-		return null;
-	}
-
-	/**
-	 * Return the {@link Mongo} instance to connect to. Annotate with {@link Bean} in case you want to expose a
-	 * {@link Mongo} instance to the {@link org.springframework.context.ApplicationContext}.
-	 * 
-	 * @return
-	 * @throws Exception
-	 */
+	@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 MongoDbFactory mongoDbFactory() throws Exception {
-		return new SimpleMongoDbFactory(mongo(), getDatabaseName(), getUserCredentials(), getAuthenticationDatabaseName());
+		UserCredentials credentials = getUserCredentials();
+		if (credentials == null) {
+			return new SimpleMongoDbFactory(mongo(), getDatabaseName());
+		} else {
+			return new SimpleMongoDbFactory(mongo(), getDatabaseName(), credentials);
+		}
 	}
 
-	/**
-	 * Return the base package to scan for mapped {@link Document}s. Will return the package name of the configuration
-	 * class' (the concrete class, not this one here) by default. So if you have a {@code com.acme.AppConfig} extending
-	 * {@link AbstractMongoConfiguration} the base package will be considered {@code com.acme} unless the method is
-	 * overridden to implement alternate behavior.
-	 * 
-	 * @return the base package to scan for mapped {@link Document} classes or {@literal null} to not enable scanning for
-	 *         entities.
-	 * @deprecated use {@link #getMappingBasePackages()} instead.
-	 */
-	@Deprecated
-	protected String getMappingBasePackage() {
-
-		Package mappingBasePackage = getClass().getPackage();
-		return mappingBasePackage == null ? null : mappingBasePackage.getName();
+	public String getMappingBasePackage() {
+		return "";
 	}
 
-	/**
-	 * Returns the base packages to scan for MongoDB mapped entities at startup. Will return the package name of the
-	 * configuration class' (the concrete class, not this one here) by default. So if you have a
-	 * {@code com.acme.AppConfig} extending {@link AbstractMongoConfiguration} the base package will be considered
-	 * {@code com.acme} unless the method is overridden to implement alternate behavior.
-	 * 
-	 * @return the base packages to scan for mapped {@link Document} classes or an empty collection to not enable scanning
-	 *         for entities.
-	 * @since 1.10
-	 */
-	protected Collection<String> getMappingBasePackages() {
-		return Collections.singleton(getMappingBasePackage());
-	}
-
-	/**
-	 * Return {@link UserCredentials} to be used when connecting to the MongoDB instance or {@literal null} if none shall
-	 * be used.
-	 * 
-	 * @return
-	 * @deprecated since 1.7. {@link MongoClient} should hold authentication data within
-	 *             {@link MongoClient#getCredentialsList()}
-	 */
-	@Deprecated
-	protected UserCredentials getUserCredentials() {
+	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.setFieldNamingStrategy(fieldNamingStrategy());
-
-		return mappingContext;
-	}
-
-	/**
-	 * Returns a {@link MappingContextIsNewStrategyFactory} wrapped into a {@link CachingIsNewStrategyFactory}.
-	 * 
-	 * @return
-	 * @throws ClassNotFoundException
-	 */
-	@Bean
-	public IsNewStrategyFactory isNewStrategyFactory() throws ClassNotFoundException {
-		return new CachingIsNewStrategyFactory(new MappingContextIsNewStrategyFactory(mongoMappingContext()));
-	}
-
-	/**
-	 * Register custom {@link Converter}s in a {@link CustomConversions} object if required. These
-	 * {@link CustomConversions} will be registered with the {@link #mappingMongoConverter()} and
-	 * {@link #mongoMappingContext()}. Returns an empty {@link CustomConversions} instance by default.
-	 * 
-	 * @return must not be {@literal null}.
-	 */
-	@Bean
-	public CustomConversions customConversions() {
-		return new CustomConversions(Collections.emptyList());
-	}
-
-	/**
-	 * Creates a {@link MappingMongoConverter} using the configured {@link #mongoDbFactory()} and
-	 * {@link #mongoMappingContext()}. Will get {@link #customConversions()} applied.
-	 * 
-	 * @see #customConversions()
-	 * @see #mongoMappingContext()
-	 * @see #mongoDbFactory()
-	 * @return
-	 * @throws Exception
-	 */
-	@Bean
-	public MappingMongoConverter mappingMongoConverter() throws Exception {
-
-		DbRefResolver dbRefResolver = new DefaultDbRefResolver(mongoDbFactory());
-		MappingMongoConverter converter = new MappingMongoConverter(dbRefResolver, mongoMappingContext());
-		converter.setCustomConversions(customConversions());
-
-		return converter;
-	}
-
-	/**
-	 * Scans the mapping base package for classes annotated with {@link Document}. By default, it scans for entities in
-	 * all packages returned by {@link #getMappingBasePackages()}.
-	 * 
-	 * @see #getMappingBasePackages()
-	 * @return
-	 * @throws ClassNotFoundException
-	 */
-	protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
-
-		Set<Class<?>> initialEntitySet = new HashSet<Class<?>>();
-
-		for (String basePackage : getMappingBasePackages()) {
-			initialEntitySet.addAll(scanForEntities(basePackage));
-		}
-
-		return initialEntitySet;
-	}
-
-	/**
-	 * Scans the given base package for entities, i.e. MongoDB specific types annotated with {@link Document} and
-	 * {@link Persistent}.
-	 * 
-	 * @param basePackage must not be {@literal null}.
-	 * @return
-	 * @throws ClassNotFoundException
-	 * @since 1.10
-	 */
-	protected Set<Class<?>> scanForEntities(String basePackage) throws ClassNotFoundException {
-
-		if (!StringUtils.hasText(basePackage)) {
-			return Collections.emptySet();
-		}
-
-		Set<Class<?>> initialEntitySet = new HashSet<Class<?>>();
-
+		String basePackage = getMappingBasePackage();
 		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;
 	}
 
 	/**
-	 * Configures whether to abbreviate field names for domain objects by configuring a
-	 * {@link CamelCaseAbbreviatingFieldNamingStrategy} on the {@link MongoMappingContext} instance created. For advanced
-	 * customization needs, consider overriding {@link #mappingMongoConverter()}.
+	 * Hook that allows post-processing after the MappingMongoConverter has been successfully created.
 	 * 
-	 * @return
+	 * @param converter
 	 */
-	protected boolean abbreviateFieldNames() {
-		return false;
-	}
-
-	/**
-	 * Configures a {@link FieldNamingStrategy} on the {@link MongoMappingContext} instance created.
-	 * 
-	 * @return
-	 * @since 1.5
-	 */
-	protected FieldNamingStrategy fieldNamingStrategy() {
-		return abbreviateFieldNames() ? new CamelCaseAbbreviatingFieldNamingStrategy()
-				: PropertyNameFieldNamingStrategy.INSTANCE;
+	protected void afterMappingMongoConverterCreation(MappingMongoConverter converter) {
 	}
 }

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2014 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,25 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.data.mongodb.config;
 
 /**
- * Constants to declare bean names used by the namespace configuration.
- * 
- * @author Jon Brisbin
- * @author Oliver Gierke
- * @author Martin Baumgartner
+ * @author Jon Brisbin <jbrisbin@vmware.com>
  */
 public abstract class BeanNames {
 
-	public static final String MAPPING_CONTEXT_BEAN_NAME = "mongoMappingContext";
-
-	static final String INDEX_HELPER_BEAN_NAME = "indexCreationHelper";
-	static final String MONGO_BEAN_NAME = "mongo";
-	static final String DB_FACTORY_BEAN_NAME = "mongoDbFactory";
-	static final String VALIDATING_EVENT_LISTENER_BEAN_NAME = "validatingMongoEventListener";
-	static final String IS_NEW_STRATEGY_FACTORY_BEAN_NAME = "isNewStrategyFactory";
-	static final String DEFAULT_CONVERTER_BEAN_NAME = "mappingConverter";
-	static final String MONGO_TEMPLATE_BEAN_NAME = "mongoTemplate";
-	static final String GRID_FS_TEMPLATE_BEAN_NAME = "gridFsTemplate";
+	static final String MAPPING_CONTEXT = "mappingContext";
+	static final String INDEX_HELPER = "indexCreationHelper";
+	static final String MONGO = "mongo";
+	static final String DB_FACTORY = "mongoDbFactory";
 }

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

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

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

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

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2014 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,22 +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.parsing.ReaderContext;
 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;
@@ -50,60 +47,42 @@ 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.mapping.context.MappingContextIsNewStrategyFactory;
-import org.springframework.data.mapping.model.CamelCaseAbbreviatingFieldNamingStrategy;
 import org.springframework.data.mongodb.core.convert.CustomConversions;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.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
- * @author Thomas Darimont
- * @author Christoph Strobl
  */
-public class MappingMongoConverterParser implements BeanDefinitionParser {
+public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 
 	private static final String BASE_PACKAGE = "base-package";
-	private static final boolean JSR_303_PRESENT = 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) {
-
-		if (parserContext.isNested()) {
-			parserContext.getReaderContext().error("Mongo Converter must not be defined as nested bean.", element);
-		}
+	@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 : DEFAULT_CONVERTER_BEAN_NAME;
-
-		parserContext.pushContainingComponent(new CompositeComponentDefinition("Mapping Mongo Converter", element));
 
 		BeanDefinition conversionsDefinition = getCustomConversions(element, parserContext);
-		String ctxRef = potentiallyCreateMappingContext(element, parserContext, conversionsDefinition, id);
-
-		createIsNewStrategyFactoryBeanDefinition(ctxRef, parserContext, element);
+		String ctxRef = potentiallyCreateMappingContext(element, parserContext, conversionsDefinition);
 
 		// Need a reference to a Mongo instance
 		String dbFactoryRef = element.getAttribute("db-factory-ref");
 		if (!StringUtils.hasText(dbFactoryRef)) {
-			dbFactoryRef = DB_FACTORY_BEAN_NAME;
+			dbFactoryRef = DB_FACTORY;
 		}
 
 		// Converter
@@ -111,146 +90,54 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 		converterBuilder.addConstructorArgReference(dbFactoryRef);
 		converterBuilder.addConstructorArgReference(ctxRef);
 
-		String typeMapperRef = element.getAttribute("type-mapper-ref");
-		if (StringUtils.hasText(typeMapperRef)) {
-			converterBuilder.addPropertyReference("typeMapper", typeMapperRef);
-		}
-
 		if (conversionsDefinition != null) {
 			converterBuilder.addPropertyValue("customConversions", conversionsDefinition);
 		}
 
 		try {
-			registry.getBeanDefinition(INDEX_HELPER_BEAN_NAME);
+			registry.getBeanDefinition(INDEX_HELPER);
 		} catch (NoSuchBeanDefinitionException ignored) {
 			if (!StringUtils.hasText(dbFactoryRef)) {
-				dbFactoryRef = DB_FACTORY_BEAN_NAME;
+				dbFactoryRef = DB_FACTORY;
 			}
 			BeanDefinitionBuilder indexHelperBuilder = BeanDefinitionBuilder
 					.genericBeanDefinition(MongoPersistentEntityIndexCreator.class);
-			indexHelperBuilder.addConstructorArgReference(ctxRef);
-			indexHelperBuilder.addConstructorArgReference(dbFactoryRef);
-			indexHelperBuilder.addDependsOn(ctxRef);
-
-			parserContext.registerBeanComponent(new BeanComponentDefinition(indexHelperBuilder.getBeanDefinition(),
-					INDEX_HELPER_BEAN_NAME));
+			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_BEAN_NAME));
-		}
-
-		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 (!JSR_303_PRESENT) {
-			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);
-	}
-
-	public 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);
-
-		if (classesToAdd != null) {
-			mappingContextBuilder.addPropertyValue("initialEntitySet", classesToAdd);
-		}
-
-		if (conversionsDefinition != null) {
-			AbstractBeanDefinition simpleTypesDefinition = new GenericBeanDefinition();
-			simpleTypesDefinition.setFactoryBeanName("customConversions");
-			simpleTypesDefinition.setFactoryMethodName("getSimpleTypeHolder");
-
-			mappingContextBuilder.addPropertyValue("simpleTypeHolder", simpleTypesDefinition);
-		}
-
-		parseFieldNamingStrategy(element, parserContext.getReaderContext(), mappingContextBuilder);
-
-		ctxRef = converterId == null || DEFAULT_CONVERTER_BEAN_NAME.equals(converterId) ? MAPPING_CONTEXT_BEAN_NAME
-				: converterId + "." + MAPPING_CONTEXT_BEAN_NAME;
-
-		parserContext.registerBeanComponent(componentDefinitionBuilder.getComponent(mappingContextBuilder, ctxRef));
 		return ctxRef;
 	}
 
-	private static void parseFieldNamingStrategy(Element element, ReaderContext context, BeanDefinitionBuilder builder) {
-
-		String abbreviateFieldNames = element.getAttribute("abbreviate-field-names");
-		String fieldNamingStrategy = element.getAttribute("field-naming-strategy-ref");
-
-		boolean fieldNamingStrategyReferenced = StringUtils.hasText(fieldNamingStrategy);
-		boolean abbreviationActivated = StringUtils.hasText(abbreviateFieldNames)
-				&& Boolean.parseBoolean(abbreviateFieldNames);
-
-		if (fieldNamingStrategyReferenced && abbreviationActivated) {
-			context.error("Field name abbreviation cannot be activated if a field-naming-strategy-ref is configured!",
-					element);
-			return;
-		}
-
-		Object value = null;
-
-		if ("true".equals(abbreviateFieldNames)) {
-			value = new RootBeanDefinition(CamelCaseAbbreviatingFieldNamingStrategy.class);
-		} else if (fieldNamingStrategyReferenced) {
-			value = new RuntimeBeanReference(fieldNamingStrategy);
-		}
-
-		if (value != null) {
-			builder.addPropertyValue("fieldNamingStrategy", value);
-		}
-	}
-
 	private BeanDefinition getCustomConversions(Element element, ParserContext parserContext) {
 
 		List<Element> customConvertersElements = DomUtils.getChildElementsByTagName(element, "custom-converters");
@@ -285,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;
 		}
@@ -293,7 +180,7 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 		return null;
 	}
 
-	private static Set<String> getInititalEntityClasses(Element element) {
+	public Set<String> getInititalEntityClasses(Element element, BeanDefinitionBuilder builder) {
 
 		String basePackage = element.getAttribute(BASE_PACKAGE);
 
@@ -332,20 +219,6 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 		return null;
 	}
 
-	public static String createIsNewStrategyFactoryBeanDefinition(String mappingContextRef, ParserContext context,
-			Element element) {
-
-		BeanDefinitionBuilder mappingContextStrategyFactoryBuilder = BeanDefinitionBuilder
-				.rootBeanDefinition(MappingContextIsNewStrategyFactory.class);
-		mappingContextStrategyFactoryBuilder.addConstructorArgReference(mappingContextRef);
-
-		BeanComponentDefinitionBuilder builder = new BeanComponentDefinitionBuilder(element, context);
-		context.registerBeanComponent(builder.getComponent(mappingContextStrategyFactoryBuilder,
-				IS_NEW_STRATEGY_FACTORY_BEAN_NAME));
-
-		return IS_NEW_STRATEGY_FACTORY_BEAN_NAME;
-	}
-
 	/**
 	 * {@link TypeFilter} that returns {@literal false} in case any of the given delegates matches.
 	 * 

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

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

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

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

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

@@ -1,85 +0,0 @@
-/*
- * Copyright 2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.config;
-
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.parsing.BeanComponentDefinition;
-import org.springframework.beans.factory.parsing.CompositeComponentDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.data.config.BeanComponentDefinitionBuilder;
-import org.springframework.data.config.ParsingUtils;
-import org.springframework.data.mongodb.core.MongoClientFactoryBean;
-import org.springframework.util.StringUtils;
-import org.w3c.dom.Element;
-
-/**
- * Parser for {@code mongo-client} definitions.
- * 
- * @author Christoph Strobl
- * @since 1.7
- */
-public class MongoClientParser implements BeanDefinitionParser {
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.xml.BeanDefinitionParser#parse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext)
-	 */
-	public BeanDefinition parse(Element element, ParserContext parserContext) {
-
-		Object source = parserContext.extractSource(element);
-		String id = element.getAttribute("id");
-
-		BeanComponentDefinitionBuilder helper = new BeanComponentDefinitionBuilder(element, parserContext);
-
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MongoClientFactoryBean.class);
-
-		ParsingUtils.setPropertyValue(builder, element, "port", "port");
-		ParsingUtils.setPropertyValue(builder, element, "host", "host");
-		ParsingUtils.setPropertyValue(builder, element, "credentials", "credentials");
-
-		MongoParsingUtils.parseMongoClientOptions(element, builder);
-		MongoParsingUtils.parseReplicaSet(element, builder);
-
-		String defaultedId = StringUtils.hasText(id) ? id : BeanNames.MONGO_BEAN_NAME;
-
-		parserContext.pushContainingComponent(new CompositeComponentDefinition("Mongo", source));
-
-		BeanComponentDefinition mongoComponent = helper.getComponent(builder, defaultedId);
-		parserContext.registerBeanComponent(mongoComponent);
-
-		BeanComponentDefinition serverAddressPropertyEditor = helper.getComponent(MongoParsingUtils
-				.getServerAddressPropertyEditorBuilder());
-		parserContext.registerBeanComponent(serverAddressPropertyEditor);
-
-		BeanComponentDefinition writeConcernEditor = helper.getComponent(MongoParsingUtils
-				.getWriteConcernPropertyEditorBuilder());
-		parserContext.registerBeanComponent(writeConcernEditor);
-
-		BeanComponentDefinition readPreferenceEditor = helper.getComponent(MongoParsingUtils
-				.getReadPreferencePropertyEditorBuilder());
-		parserContext.registerBeanComponent(readPreferenceEditor);
-
-		BeanComponentDefinition credentialsEditor = helper.getComponent(MongoParsingUtils
-				.getMongoCredentialPropertyEditor());
-		parserContext.registerBeanComponent(credentialsEditor);
-
-		parserContext.popAndRegisterContainingComponent();
-
-		return mongoComponent.getBeanDefinition();
-	}
-}

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2015 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,30 +15,25 @@
  */
 package org.springframework.data.mongodb.config;
 
-import static org.springframework.data.config.ParsingUtils.*;
-import static org.springframework.data.mongodb.config.MongoParsingUtils.*;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
+import 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;
 import org.w3c.dom.Element;
 
 import com.mongodb.Mongo;
-import com.mongodb.MongoClientURI;
 import com.mongodb.MongoURI;
 
 /**
@@ -46,79 +41,55 @@ import com.mongodb.MongoURI;
  * 
  * @author Jon Brisbin
  * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Christoph Strobl
- * @author Viktor Khoroshko
  */
 public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 
-	private static final Set<String> MONGO_URI_ALLOWED_ADDITIONAL_ATTRIBUTES;
-
-	static {
-
-		Set<String> mongoUriAllowedAdditionalAttributes = new HashSet<String>();
-		mongoUriAllowedAdditionalAttributes.add("id");
-		mongoUriAllowedAdditionalAttributes.add("write-concern");
-
-		MONGO_URI_ALLOWED_ADDITIONAL_ATTRIBUTES = Collections.unmodifiableSet(mongoUriAllowedAdditionalAttributes);
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#resolveId(org.w3c.dom.Element, org.springframework.beans.factory.support.AbstractBeanDefinition, org.springframework.beans.factory.xml.ParserContext)
-	 */
 	@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_BEAN_NAME;
+		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) {
 
+		String uri = element.getAttribute("uri");
+		String mongoRef = element.getAttribute("mongo-ref");
+		String dbname = element.getAttribute("dbname");
+		BeanDefinition userCredentials = getUserCredentialsBeanDefinition(element, parserContext);
+
 		// Common setup
 		BeanDefinitionBuilder dbFactoryBuilder = BeanDefinitionBuilder.genericBeanDefinition(SimpleMongoDbFactory.class);
-		setPropertyValue(dbFactoryBuilder, element, "write-concern", "writeConcern");
+		ParsingUtils.setPropertyValue(element, dbFactoryBuilder, "write-concern", "writeConcern");
 
-		BeanDefinition mongoUri = getMongoUri(element, parserContext);
+		if (StringUtils.hasText(uri)) {
+			if (StringUtils.hasText(mongoRef) || StringUtils.hasText(dbname) || userCredentials != null) {
+				parserContext.getReaderContext().error("Configure either Mongo URI or details individually!",
+						parserContext.extractSource(element));
+			}
 
-		if (mongoUri != null) {
-
-			dbFactoryBuilder.addConstructorArgValue(mongoUri);
+			dbFactoryBuilder.addConstructorArgValue(getMongoUri(uri));
 			return getSourceBeanDefinition(dbFactoryBuilder, parserContext, element);
 		}
 
-		BeanComponentDefinitionBuilder helper = new BeanComponentDefinitionBuilder(element, parserContext);
-
-		String mongoRef = element.getAttribute("mongo-ref");
-		String dbname = element.getAttribute("dbname");
-
-		BeanDefinition userCredentials = getUserCredentialsBeanDefinition(element, parserContext);
-
 		// 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);
 		}
 
-		dbFactoryBuilder.addConstructorArgValue(StringUtils.hasText(dbname) ? dbname : "db");
-		dbFactoryBuilder.addConstructorArgValue(userCredentials);
-		dbFactoryBuilder.addConstructorArgValue(element.getAttribute("authentication-dbname"));
+		ParsingUtils.registerWriteConcernPropertyEditor(parserContext.getRegistry());
 
-		BeanDefinitionBuilder writeConcernPropertyEditorBuilder = getWriteConcernPropertyEditorBuilder();
-
-		BeanComponentDefinition component = helper.getComponent(writeConcernPropertyEditorBuilder);
-		parserContext.registerBeanComponent(component);
-
-		return (AbstractBeanDefinition) helper.getComponentIdButFallback(dbFactoryBuilder, BeanNames.DB_FACTORY_BEAN_NAME)
-				.getBeanDefinition();
+		return getSourceBeanDefinition(dbFactoryBuilder, parserContext, element);
 	}
 
 	/**
@@ -129,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());
 	}
 
 	/**
@@ -161,42 +133,14 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 	}
 
 	/**
-	 * Creates a {@link BeanDefinition} for a {@link MongoURI} or {@link MongoClientURI} depending on configured
-	 * attributes. <br />
-	 * Errors when configured element contains {@literal uri} or {@literal client-uri} along with other attributes except
-	 * {@literal write-concern} and/or {@literal id}.
+	 * Creates a {@link BeanDefinition} for a {@link MongoURI}.
 	 * 
-	 * @param element must not be {@literal null}.
-	 * @param parserContext
-	 * @return {@literal null} in case no client-/uri defined.
+	 * @param uri
+	 * @return
 	 */
-	private BeanDefinition getMongoUri(Element element, ParserContext parserContext) {
+	private BeanDefinition getMongoUri(String uri) {
 
-		boolean hasClientUri = element.hasAttribute("client-uri");
-
-		if (!hasClientUri && !element.hasAttribute("uri")) {
-			return null;
-		}
-
-		int allowedAttributesCount = 1;
-		for (String attribute : MONGO_URI_ALLOWED_ADDITIONAL_ATTRIBUTES) {
-
-			if (element.hasAttribute(attribute)) {
-				allowedAttributesCount++;
-			}
-		}
-
-		if (element.getAttributes().getLength() > allowedAttributesCount) {
-
-			parserContext.getReaderContext().error(
-					"Configure either " + (hasClientUri ? "Mongo Client URI" : "Mongo URI") + " or details individually!",
-					parserContext.extractSource(element));
-		}
-
-		Class<?> type = hasClientUri ? MongoClientURI.class : MongoURI.class;
-		String uri = hasClientUri ? element.getAttribute("client-uri") : element.getAttribute("uri");
-
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(type);
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MongoURI.class);
 		builder.addConstructorArgValue(uri);
 
 		return builder.getBeanDefinition();

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

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

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

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

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

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

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/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/ReadPreferencePropertyEditor.java

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

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ServerAddressPropertyEditor.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.
@@ -16,14 +16,12 @@
 package org.springframework.data.mongodb.config;
 
 import java.beans.PropertyEditorSupport;
-import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.util.Assert;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.util.StringUtils;
 
 import com.mongodb.ServerAddress;
@@ -33,16 +31,10 @@ import com.mongodb.ServerAddress;
  * 
  * @author Mark Pollack
  * @author Oliver Gierke
- * @author Thomas Darimont
  */
 public class ServerAddressPropertyEditor extends PropertyEditorSupport {
 
-	/**
-	 * A port is a number without a leading 0 at the end of the address that is proceeded by just a single :.
-	 */
-	private static final String HOST_PORT_SPLIT_PATTERN = "(?<!:):(?=[123456789]\\d*$)";
-	private static final String COULD_NOT_PARSE_ADDRESS_MESSAGE = "Could not parse address {} '{}'. Check your replica set configuration!";
-	private static final Logger LOG = LoggerFactory.getLogger(ServerAddressPropertyEditor.class);
+	private static final Log LOG = LogFactory.getLog(ServerAddressPropertyEditor.class);
 
 	/*
 	 * (non-Javadoc)
@@ -51,11 +43,6 @@ public class ServerAddressPropertyEditor extends PropertyEditorSupport {
 	@Override
 	public void setAsText(String replicaSetString) {
 
-		if (!StringUtils.hasText(replicaSetString)) {
-			setValue(null);
-			return;
-		}
-
 		String[] replicaSetStringArray = StringUtils.commaDelimitedListToStringArray(replicaSetString);
 		Set<ServerAddress> serverAddresses = new HashSet<ServerAddress>(replicaSetStringArray.length);
 
@@ -84,53 +71,22 @@ public class ServerAddressPropertyEditor extends PropertyEditorSupport {
 	 */
 	private ServerAddress parseServerAddress(String source) {
 
-		if (!StringUtils.hasText(source)) {
-			LOG.warn(COULD_NOT_PARSE_ADDRESS_MESSAGE, "source", source);
-			return null;
-		}
+		String[] hostAndPort = StringUtils.delimitedListToStringArray(source.trim(), ":");
 
-		String[] hostAndPort = extractHostAddressAndPort(source.trim());
-
-		if (hostAndPort.length > 2) {
-			LOG.warn(COULD_NOT_PARSE_ADDRESS_MESSAGE, "source", source);
+		if (!StringUtils.hasText(source) || hostAndPort.length > 2) {
+			LOG.warn(String.format("Could not parse address source '%s'. Check your replica set configuration!", source));
 			return null;
 		}
 
 		try {
-			InetAddress hostAddress = InetAddress.getByName(hostAndPort[0]);
-			Integer port = hostAndPort.length == 1 ? null : Integer.parseInt(hostAndPort[1]);
-
-			return port == null ? new ServerAddress(hostAddress) : new ServerAddress(hostAddress, port);
+			return hostAndPort.length == 1 ? new ServerAddress(hostAndPort[0]) : new ServerAddress(hostAndPort[0],
+					Integer.parseInt(hostAndPort[1]));
 		} catch (UnknownHostException e) {
-			LOG.warn(COULD_NOT_PARSE_ADDRESS_MESSAGE, "host", hostAndPort[0]);
+			LOG.warn(String.format("Could not parse host '%s'. Check your replica set configuration!", hostAndPort[0]));
 		} catch (NumberFormatException e) {
-			LOG.warn(COULD_NOT_PARSE_ADDRESS_MESSAGE, "port", hostAndPort[1]);
+			LOG.warn(String.format("Could not parse port '%s'. Check your replica set configuration!", hostAndPort[1]));
 		}
 
 		return null;
 	}
-
-	/**
-	 * Extract the host and port from the given {@link String}.
-	 * 
-	 * @param addressAndPortSource must not be {@literal null}.
-	 * @return
-	 */
-	private String[] extractHostAddressAndPort(String addressAndPortSource) {
-
-		Assert.notNull(addressAndPortSource, "Address and port source must not be null!");
-
-		String[] hostAndPort = addressAndPortSource.split(HOST_PORT_SPLIT_PATTERN);
-		String hostAddress = hostAndPort[0];
-
-		if (isHostAddressInIPv6BracketNotation(hostAddress)) {
-			hostAndPort[0] = hostAddress.substring(1, hostAddress.length() - 1);
-		}
-
-		return hostAndPort;
-	}
-
-	private boolean isHostAddressInIPv6BracketNotation(String hostAddress) {
-		return hostAddress.startsWith("[") && hostAddress.endsWith("]");
-	}
 }

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

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

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

@@ -25,7 +25,7 @@ import com.mongodb.DBCursor;
 interface CursorPreparer {
 
 	/**
-	 * Prepare the given cursor (apply limits, skips and so on). Returns the prepared cursor.
+	 * Prepare the given cursor (apply limits, skips and so on). Returns th eprepared cursor.
 	 * 
 	 * @param cursor
 	 */

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

@@ -1,337 +0,0 @@
-/*
- * Copyright 2015-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.springframework.dao.DataAccessException;
-import org.springframework.dao.support.PersistenceExceptionTranslator;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.mongodb.core.query.Update;
-import org.springframework.data.util.Pair;
-import org.springframework.util.Assert;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.BulkWriteException;
-import com.mongodb.BulkWriteOperation;
-import com.mongodb.BulkWriteRequestBuilder;
-import com.mongodb.BulkWriteResult;
-import com.mongodb.DBCollection;
-import com.mongodb.DBObject;
-import com.mongodb.WriteConcern;
-
-/**
- * Default implementation for {@link BulkOperations}.
- * 
- * @author Tobias Trelle
- * @author Oliver Gierke
- * @author Christoph Strobl
- * @since 1.9
- */
-class DefaultBulkOperations implements BulkOperations {
-
-	private final MongoOperations mongoOperations;
-	private final BulkMode bulkMode;
-	private final String collectionName;
-	private final Class<?> entityType;
-
-	private PersistenceExceptionTranslator exceptionTranslator;
-	private WriteConcernResolver writeConcernResolver;
-	private WriteConcern defaultWriteConcern;
-
-	private BulkWriteOperation bulk;
-
-	/**
-	 * Creates a new {@link DefaultBulkOperations} for the given {@link MongoOperations}, {@link BulkMode}, collection
-	 * name and {@link WriteConcern}.
-	 * 
-	 * @param mongoOperations The underlying {@link MongoOperations}, must not be {@literal null}.
-	 * @param bulkMode must not be {@literal null}.
-	 * @param collectionName Name of the collection to work on, must not be {@literal null} or empty.
-	 * @param entityType the entity type, can be {@literal null}.
-	 */
-	DefaultBulkOperations(MongoOperations mongoOperations, BulkMode bulkMode, String collectionName,
-			Class<?> entityType) {
-
-		Assert.notNull(mongoOperations, "MongoOperations must not be null!");
-		Assert.notNull(bulkMode, "BulkMode must not be null!");
-		Assert.hasText(collectionName, "Collection name must not be null or empty!");
-
-		this.mongoOperations = mongoOperations;
-		this.bulkMode = bulkMode;
-		this.collectionName = collectionName;
-		this.entityType = entityType;
-
-		this.exceptionTranslator = new MongoExceptionTranslator();
-		this.writeConcernResolver = DefaultWriteConcernResolver.INSTANCE;
-
-		this.bulk = initBulkOperation();
-	}
-
-	/**
-	 * Configures the {@link PersistenceExceptionTranslator} to be used. Defaults to {@link MongoExceptionTranslator}.
-	 * 
-	 * @param exceptionTranslator can be {@literal null}.
-	 */
-	public void setExceptionTranslator(PersistenceExceptionTranslator exceptionTranslator) {
-		this.exceptionTranslator = exceptionTranslator == null ? new MongoExceptionTranslator() : exceptionTranslator;
-	}
-
-	/**
-	 * Configures the {@link WriteConcernResolver} to be used. Defaults to {@link DefaultWriteConcernResolver}.
-	 * 
-	 * @param writeConcernResolver can be {@literal null}.
-	 */
-	public void setWriteConcernResolver(WriteConcernResolver writeConcernResolver) {
-		this.writeConcernResolver = writeConcernResolver == null ? DefaultWriteConcernResolver.INSTANCE
-				: writeConcernResolver;
-	}
-
-	/**
-	 * Configures the default {@link WriteConcern} to be used. Defaults to {@literal null}.
-	 * 
-	 * @param defaultWriteConcern can be {@literal null}.
-	 */
-	public void setDefaultWriteConcern(WriteConcern defaultWriteConcern) {
-		this.defaultWriteConcern = defaultWriteConcern;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.BulkOperations#insert(java.lang.Object)
-	 */
-	@Override
-	public BulkOperations insert(Object document) {
-
-		Assert.notNull(document, "Document must not be null!");
-
-		if (document instanceof DBObject) {
-
-			bulk.insert((DBObject) document);
-			return this;
-		}
-
-		DBObject sink = new BasicDBObject();
-		mongoOperations.getConverter().write(document, sink);
-		bulk.insert(sink);
-		return this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.BulkOperations#insert(java.util.List)
-	 */
-	@Override
-	public BulkOperations insert(List<? extends Object> documents) {
-
-		Assert.notNull(documents, "Documents must not be null!");
-
-		for (Object document : documents) {
-			insert(document);
-		}
-
-		return this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.BulkOperations#updateOne(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.Update)
-	 */
-	@Override
-	@SuppressWarnings("unchecked")
-	public BulkOperations updateOne(Query query, Update update) {
-
-		Assert.notNull(query, "Query must not be null!");
-		Assert.notNull(update, "Update must not be null!");
-
-		return updateOne(Arrays.asList(Pair.of(query, update)));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.BulkOperations#updateOne(java.util.List)
-	 */
-	@Override
-	public BulkOperations updateOne(List<Pair<Query, Update>> updates) {
-
-		Assert.notNull(updates, "Updates must not be null!");
-
-		for (Pair<Query, Update> update : updates) {
-			update(update.getFirst(), update.getSecond(), false, false);
-		}
-
-		return this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.BulkOperations#updateMulti(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.Update)
-	 */
-	@Override
-	@SuppressWarnings("unchecked")
-	public BulkOperations updateMulti(Query query, Update update) {
-
-		Assert.notNull(query, "Query must not be null!");
-		Assert.notNull(update, "Update must not be null!");
-
-		return updateMulti(Arrays.asList(Pair.of(query, update)));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.BulkOperations#updateMulti(java.util.List)
-	 */
-	@Override
-	public BulkOperations updateMulti(List<Pair<Query, Update>> updates) {
-
-		Assert.notNull(updates, "Updates must not be null!");
-
-		for (Pair<Query, Update> update : updates) {
-			update(update.getFirst(), update.getSecond(), false, true);
-		}
-
-		return this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.BulkOperations#upsert(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.Update)
-	 */
-	@Override
-	public BulkOperations upsert(Query query, Update update) {
-		return update(query, update, true, true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.BulkOperations#upsert(java.util.List)
-	 */
-	@Override
-	public BulkOperations upsert(List<Pair<Query, Update>> updates) {
-
-		for (Pair<Query, Update> update : updates) {
-			upsert(update.getFirst(), update.getSecond());
-		}
-
-		return this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.BulkOperations#remove(org.springframework.data.mongodb.core.query.Query)
-	 */
-	@Override
-	public BulkOperations remove(Query query) {
-
-		Assert.notNull(query, "Query must not be null!");
-
-		bulk.find(query.getQueryObject()).remove();
-
-		return this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.BulkOperations#remove(java.util.List)
-	 */
-	@Override
-	public BulkOperations remove(List<Query> removes) {
-
-		Assert.notNull(removes, "Removals must not be null!");
-
-		for (Query query : removes) {
-			remove(query);
-		}
-
-		return this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.BulkOperations#executeBulk()
-	 */
-	@Override
-	public BulkWriteResult execute() {
-
-		MongoAction action = new MongoAction(defaultWriteConcern, MongoActionOperation.BULK, collectionName, entityType,
-				null, null);
-		WriteConcern writeConcern = writeConcernResolver.resolve(action);
-
-		try {
-
-			return writeConcern == null ? bulk.execute() : bulk.execute(writeConcern);
-
-		} catch (BulkWriteException o_O) {
-
-			DataAccessException toThrow = exceptionTranslator.translateExceptionIfPossible(o_O);
-			throw toThrow == null ? o_O : toThrow;
-
-		} finally {
-			this.bulk = initBulkOperation();
-		}
-	}
-
-	/**
-	 * Performs update and upsert bulk operations.
-	 * 
-	 * @param query the {@link Query} to determine documents to update.
-	 * @param update the {@link Update} to perform, must not be {@literal null}.
-	 * @param upsert whether to upsert.
-	 * @param multi whether to issue a multi-update.
-	 * @return the {@link BulkOperations} with the update registered.
-	 */
-	private BulkOperations update(Query query, Update update, boolean upsert, boolean multi) {
-
-		Assert.notNull(query, "Query must not be null!");
-		Assert.notNull(update, "Update must not be null!");
-
-		BulkWriteRequestBuilder builder = bulk.find(query.getQueryObject());
-
-		if (upsert) {
-
-			if (multi) {
-				builder.upsert().update(update.getUpdateObject());
-			} else {
-				builder.upsert().updateOne(update.getUpdateObject());
-			}
-
-		} else {
-
-			if (multi) {
-				builder.update(update.getUpdateObject());
-			} else {
-				builder.updateOne(update.getUpdateObject());
-			}
-		}
-
-		return this;
-	}
-
-	private final BulkWriteOperation initBulkOperation() {
-
-		DBCollection collection = mongoOperations.getCollection(collectionName);
-
-		switch (bulkMode) {
-			case ORDERED:
-				return collection.initializeOrderedBulkOperation();
-			case UNORDERED:
-				return collection.initializeUnorderedBulkOperation();
-		}
-
-		throw new IllegalStateException("BulkMode was null!");
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,15 @@
 package org.springframework.data.mongodb.core;
 
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.springframework.dao.DataAccessException;
-import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.index.IndexDefinition;
+import org.springframework.data.mongodb.core.index.IndexField;
 import org.springframework.data.mongodb.core.index.IndexInfo;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.query.Order;
 import org.springframework.util.Assert;
 
 import com.mongodb.DBCollection;
@@ -35,17 +36,11 @@ import com.mongodb.MongoException;
  * 
  * @author Mark Pollack
  * @author Oliver Gierke
- * @author Komi Innocent
- * @author Christoph Strobl
  */
 public class DefaultIndexOperations implements IndexOperations {
 
-	private static final String PARTIAL_FILTER_EXPRESSION_KEY = "partialFilterExpression";
-
 	private final MongoOperations mongoOperations;
 	private final String collectionName;
-	private final QueryMapper mapper;
-	private final Class<?> type;
 
 	/**
 	 * Creates a new {@link DefaultIndexOperations}.
@@ -54,26 +49,12 @@ public class DefaultIndexOperations implements IndexOperations {
 	 * @param collectionName must not be {@literal null}.
 	 */
 	public DefaultIndexOperations(MongoOperations mongoOperations, String collectionName) {
-		this(mongoOperations, collectionName, null);
-	}
-
-	/**
-	 * Creates a new {@link DefaultIndexOperations}.
-	 *
-	 * @param mongoOperations must not be {@literal null}.
-	 * @param collectionName must not be {@literal null}.
-	 * @param type Type used for mapping potential partial index filter expression. Can be {@literal null}.
-	 * @since 1.10
-	 */
-	public DefaultIndexOperations(MongoOperations mongoOperations, String collectionName, Class<?> type) {
 
 		Assert.notNull(mongoOperations, "MongoOperations must not be null!");
 		Assert.notNull(collectionName, "Collection name can not be null!");
 
 		this.mongoOperations = mongoOperations;
 		this.collectionName = collectionName;
-		this.mapper = new QueryMapper(mongoOperations.getConverter());
-		this.type = type;
 	}
 
 	/*
@@ -81,45 +62,16 @@ public class DefaultIndexOperations implements IndexOperations {
 	 * @see org.springframework.data.mongodb.core.IndexOperations#ensureIndex(org.springframework.data.mongodb.core.index.IndexDefinition)
 	 */
 	public void ensureIndex(final IndexDefinition indexDefinition) {
-
 		mongoOperations.execute(collectionName, new CollectionCallback<Object>() {
 			public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
 				DBObject indexOptions = indexDefinition.getIndexOptions();
-
-				if (indexOptions != null && indexOptions.containsField(PARTIAL_FILTER_EXPRESSION_KEY)) {
-
-					Assert.isInstanceOf(DBObject.class, indexOptions.get(PARTIAL_FILTER_EXPRESSION_KEY));
-
-					indexOptions.put(PARTIAL_FILTER_EXPRESSION_KEY,
-							mapper.getMappedObject((DBObject) indexOptions.get(PARTIAL_FILTER_EXPRESSION_KEY),
-									lookupPersistentEntity(type, collectionName)));
-				}
-
 				if (indexOptions != null) {
-					collection.createIndex(indexDefinition.getIndexKeys(), indexOptions);
+					collection.ensureIndex(indexDefinition.getIndexKeys(), indexOptions);
 				} else {
-					collection.createIndex(indexDefinition.getIndexKeys());
+					collection.ensureIndex(indexDefinition.getIndexKeys());
 				}
 				return null;
 			}
-
-			private MongoPersistentEntity<?> lookupPersistentEntity(Class<?> entityType, String collection) {
-
-				if (entityType != null) {
-					return mongoOperations.getConverter().getMappingContext().getPersistentEntity(entityType);
-				}
-
-				Collection<? extends MongoPersistentEntity<?>> entities = mongoOperations.getConverter().getMappingContext()
-						.getPersistentEntities();
-
-				for (MongoPersistentEntity<?> entity : entities) {
-					if (entity.getCollection().equals(collection)) {
-						return entity;
-					}
-				}
-
-				return null;
-			}
 		});
 	}
 
@@ -149,12 +101,10 @@ public class DefaultIndexOperations implements IndexOperations {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.IndexOperations#resetIndexCache()
 	 */
-	@Deprecated
 	public void resetIndexCache() {
 		mongoOperations.execute(collectionName, new CollectionCallback<Void>() {
 			public Void doInCollection(DBCollection collection) throws MongoException, DataAccessException {
-
-				ReflectiveDBCollectionInvoker.resetIndexCache(collection);
+				collection.resetIndexCache();
 				return null;
 			}
 		});
@@ -167,9 +117,7 @@ public class DefaultIndexOperations implements IndexOperations {
 	public List<IndexInfo> getIndexInfo() {
 
 		return mongoOperations.execute(collectionName, new CollectionCallback<List<IndexInfo>>() {
-
 			public List<IndexInfo> doInCollection(DBCollection collection) throws MongoException, DataAccessException {
-
 				List<DBObject> dbObjectList = collection.getIndexInfo();
 				return getIndexData(dbObjectList);
 			}
@@ -179,7 +127,35 @@ public class DefaultIndexOperations implements IndexOperations {
 				List<IndexInfo> indexInfoList = new ArrayList<IndexInfo>();
 
 				for (DBObject ix : dbObjectList) {
-					indexInfoList.add(IndexInfo.indexInfoOf(ix));
+
+					DBObject keyDbObject = (DBObject) ix.get("key");
+					int numberOfElements = keyDbObject.keySet().size();
+
+					Map<String, Order> keyOrderMap = new HashMap<String, Order>();
+					List<IndexField> indexFields = new ArrayList<IndexField>(numberOfElements);
+
+					for (String key : keyDbObject.keySet()) {
+
+						Object value = keyDbObject.get(key);
+
+						if (Integer.valueOf(1).equals(value)) {
+							keyOrderMap.put(key, Order.ASCENDING);
+							indexFields.add(IndexField.create(key, Order.ASCENDING));
+						} else if (Integer.valueOf(-1).equals(value)) {
+							keyOrderMap.put(key, Order.DESCENDING);
+							indexFields.add(IndexField.create(key, Order.DESCENDING));
+						} else if ("2d".equals(value)) {
+							indexFields.add(IndexField.geo(key));
+						}
+					}
+
+					String name = ix.get("name").toString();
+
+					boolean unique = ix.containsField("unique") ? (Boolean) ix.get("unique") : false;
+					boolean dropDuplicates = ix.containsField("dropDups") ? (Boolean) ix.get("dropDups") : false;
+					boolean sparse = ix.containsField("sparse") ? (Boolean) ix.get("sparse") : false;
+
+					indexInfoList.add(new IndexInfo(keyOrderMap, indexFields, name, unique, dropDuplicates, sparse));
 				}
 
 				return indexInfoList;

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

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

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

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

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

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

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

@@ -1,33 +0,0 @@
-/*
- * Copyright 2015-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.data.mongodb.core.geo.GeoJsonModule;
-import org.springframework.data.web.config.SpringDataJacksonModules;
-
-/**
- * Configuration class to expose {@link GeoJsonModule} as a Spring bean.
- * 
- * @author Oliver Gierke
- */
-public class GeoJsonConfiguration implements SpringDataJacksonModules {
-
-	@Bean
-	public GeoJsonModule geoJsonModule() {
-		return new GeoJsonModule();
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2015 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.
@@ -25,7 +25,6 @@ import org.springframework.data.mongodb.core.index.IndexInfo;
  * 
  * @author Mark Pollack
  * @author Oliver Gierke
- * @author Christoph Strobl
  */
 public interface IndexOperations {
 
@@ -51,11 +50,7 @@ public interface IndexOperations {
 
 	/**
 	 * Clears all indices that have not yet been applied to this collection.
-	 * 
-	 * @deprecated since 1.7. The MongoDB Java driver version 3.0 does no longer support reseting the index cache.
-	 * @throws {@link UnsupportedOperationException} when used with MongoDB Java driver version 3.0.
 	 */
-	@Deprecated
 	void resetIndexCache();
 
 	/**

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2013 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,30 +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
- * @author Thomas Darimont
  */
+
 @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;
-	private String authenticationDatabaseName;
 
 	public MongoAdmin(Mongo mongo) {
-		Assert.notNull(mongo);
 		this.mongo = mongo;
 	}
 
@@ -81,19 +83,11 @@ public class MongoAdmin implements MongoAdminOperations {
 	 * @param password The password to use
 	 */
 	public void setPassword(String password) {
+
 		this.password = password;
 	}
 
-	/**
-	 * Sets the authenticationDatabaseName to use to authenticate with the Mongo database.
-	 * 
-	 * @param authenticationDatabaseName The authenticationDatabaseName to use.
-	 */
-	public void setAuthenticationDatabaseName(String authenticationDatabaseName) {
-		this.authenticationDatabaseName = authenticationDatabaseName;
-	}
-
 	DB getDB(String databaseName) {
-		return MongoDbUtils.getDB(mongo, databaseName, new UserCredentials(username, password), authenticationDatabaseName);
+		return MongoDbUtils.getDB(mongo, databaseName, username, password == null ? null : password.toCharArray());
 	}
 }

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

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

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

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

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

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

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

@@ -1,71 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.util.Assert;
-
-import com.mongodb.WriteResult;
-
-/**
- * Mongo-specific {@link DataIntegrityViolationException}.
- * 
- * @author Oliver Gierke
- */
-public class MongoDataIntegrityViolationException extends DataIntegrityViolationException {
-
-	private static final long serialVersionUID = -186980521176764046L;
-
-	private final WriteResult writeResult;
-	private final MongoActionOperation actionOperation;
-
-	/**
-	 * Creates a new {@link MongoDataIntegrityViolationException} using the given message and {@link WriteResult}.
-	 * 
-	 * @param message the exception message
-	 * @param writeResult the {@link WriteResult} that causes the exception, must not be {@literal null}.
-	 * @param actionOperation the {@link MongoActionOperation} that caused the exception, must not be {@literal null}.
-	 */
-	public MongoDataIntegrityViolationException(String message, WriteResult writeResult,
-			MongoActionOperation actionOperation) {
-
-		super(message);
-
-		Assert.notNull(writeResult, "WriteResult must not be null!");
-		Assert.notNull(actionOperation, "MongoActionOperation must not be null!");
-
-		this.writeResult = writeResult;
-		this.actionOperation = actionOperation;
-	}
-
-	/**
-	 * Returns the {@link WriteResult} that caused the exception.
-	 * 
-	 * @return the writeResult
-	 */
-	public WriteResult getWriteResult() {
-		return writeResult;
-	}
-
-	/**
-	 * Returns the {@link MongoActionOperation} in which the current exception occured.
-	 * 
-	 * @return the actionOperation
-	 */
-	public MongoActionOperation getActionOperation() {
-		return actionOperation;
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2015 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,137 +15,110 @@
  */
 package org.springframework.data.mongodb.core;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.authentication.UserCredentials;
-import org.springframework.data.mongodb.util.MongoClientVersion;
+import org.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;
-import com.mongodb.MongoClient;
 
 /**
- * Helper class featuring helper methods for internal MongoDb classes. Mainly intended for internal use within the
- * framework.
+ * Helper class featuring helper methods for internal MongoDb classes.
+ * <p/>
+ * <p>
+ * Mainly intended for internal use within the framework.
  * 
  * @author Thomas Risberg
  * @author Graeme Rocher
  * @author Oliver Gierke
- * @author Randy Watler
- * @author Thomas Darimont
- * @author Christoph Strobl
  * @since 1.0
  */
 public abstract class MongoDbUtils {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(MongoDbUtils.class);
+	private static final Log LOGGER = LogFactory.getLog(MongoDbUtils.class);
 
 	/**
 	 * Private constructor to prevent instantiation.
 	 */
-	private MongoDbUtils() {}
+	private MongoDbUtils() {
+
+	}
 
 	/**
 	 * Obtains a {@link DB} connection for the given {@link Mongo} instance and database name
 	 * 
-	 * @param mongo the {@link Mongo} instance, must not be {@literal null}.
-	 * @param databaseName the database name, must not be {@literal null} or empty.
-	 * @return the {@link DB} connection
+	 * @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, databaseName);
+		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
-	 * @deprecated since 1.7. The {@link MongoClient} itself should hold credentials within
-	 *             {@link MongoClient#getCredentialsList()}.
+	 * @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
 	 */
-	@Deprecated
-	public static DB getDB(Mongo mongo, String databaseName, UserCredentials credentials) {
-		return getDB(mongo, databaseName, credentials, databaseName);
+	public static DB getDB(Mongo mongo, String databaseName, String username, char[] password) {
+		return doGetDB(mongo, databaseName, username, password, true);
 	}
 
-	/**
-	 * @param mongo
-	 * @param databaseName
-	 * @param credentials
-	 * @param authenticationDatabaseName
-	 * @return
-	 * @deprecated since 1.7. The {@link MongoClient} itself should hold credentials within
-	 *             {@link MongoClient#getCredentialsList()}.
-	 */
-	@Deprecated
-	public static DB getDB(Mongo mongo, String databaseName, UserCredentials credentials,
-			String authenticationDatabaseName) {
-
-		Assert.notNull(mongo, "No Mongo instance specified!");
-		Assert.hasText(databaseName, "Database name must be given!");
-		Assert.notNull(credentials, "Credentials must not be null, use UserCredentials.NO_CREDENTIALS!");
-		Assert.hasText(authenticationDatabaseName, "Authentication database name must not be null or empty!");
-
-		return doGetDB(mongo, databaseName, credentials, true, authenticationDatabaseName);
-	}
-
-	private static DB doGetDB(Mongo mongo, String databaseName, UserCredentials credentials, boolean allowCreate,
-			String authenticationDatabaseName) {
+	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(databaseName);
+				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);
 
-		if (!(mongo instanceof MongoClient) && requiresAuthDbAuthentication(credentials)) {
-			ReflectiveDbInvoker.authenticate(mongo, db, credentials, authenticationDatabaseName);
+		boolean credentialsGiven = username != null && password != null;
+		if (credentialsGiven && !db.isAuthenticated()) {
+			// Note, can only authenticate once against the same com.mongodb.DB object.
+			synchronized (db) {
+				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);
 			} else {
 				holderToUse.addDB(databaseName, db);
 			}
-
-			// synchronize holder only if not yet synchronized
-			if (!holderToUse.isSynchronizedWithTransaction()) {
-				TransactionSynchronizationManager.registerSynchronization(new MongoSynchronization(holderToUse, mongo));
-				holderToUse.setSynchronizedWithTransaction(true);
-			}
-
+			TransactionSynchronizationManager.registerSynchronization(new MongoSynchronization(holderToUse, mongo));
+			holderToUse.setSynchronizedWithTransaction(true);
 			if (holderToUse != dbHolder) {
 				TransactionSynchronizationManager.bindResource(mongo, holderToUse);
 			}
@@ -169,7 +142,6 @@ public abstract class MongoDbUtils {
 	 * @return whether the DB is transactional
 	 */
 	public static boolean isDBTransactional(DB db, Mongo mongo) {
-
 		if (mongo == null) {
 			return false;
 		}
@@ -181,36 +153,15 @@ public abstract class MongoDbUtils {
 	 * Perform actual closing of the Mongo DB object, catching and logging any cleanup exceptions thrown.
 	 * 
 	 * @param db the DB to close (may be <code>null</code>)
-	 * @deprecated since 1.7. The main use case for this method is to ensure that applications can read their own
-	 *             unacknowledged writes, but this is no longer so prevalent since the MongoDB Java driver version 3
-	 *             started defaulting to acknowledged writes.
 	 */
-	@Deprecated
 	public static void closeDB(DB db) {
-
 		if (db != null) {
 			LOGGER.debug("Closing Mongo DB object");
 			try {
-				ReflectiveDbInvoker.requestDone(db);
+				db.requestDone();
 			} catch (Throwable ex) {
 				LOGGER.debug("Unexpected exception on closing Mongo DB object", ex);
 			}
 		}
 	}
-
-	/**
-	 * Check if credentials present. In case we're using a mongo-java-driver version 3 or above we do not have the need
-	 * for authentication as the auth data has to be provided within the MongoClient
-	 * 
-	 * @param credentials
-	 * @return
-	 */
-	private static boolean requiresAuthDbAuthentication(UserCredentials credentials) {
-
-		if (credentials == null || !credentials.hasUsername()) {
-			return false;
-		}
-
-		return !MongoClientVersion.isMongo3Driver();
-	}
 }

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

@@ -1,20 +1,20 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- *
- * @author Thomas Darimont
- */
-package org.springframework.data.mongodb.util;
+/*
+ * Copyright 2010-2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+public interface MongoDocumentWriter {
+
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2015 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,25 +15,19 @@
  */
 package org.springframework.data.mongodb.core;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
+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.DataIntegrityViolationException;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.dao.InvalidDataAccessResourceUsageException;
-import org.springframework.dao.PermissionDeniedDataAccessException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
-import org.springframework.data.mongodb.BulkOperationException;
 import org.springframework.data.mongodb.UncategorizedMongoDbException;
-import org.springframework.data.mongodb.util.MongoDbErrorCodes;
-import org.springframework.util.ClassUtils;
-
-import com.mongodb.BulkWriteException;
-import com.mongodb.MongoException;
 
 /**
  * Simple {@link PersistenceExceptionTranslator} for Mongo. Convert the given runtime exception to an appropriate
@@ -41,71 +35,43 @@ import com.mongodb.MongoException;
  * appropriate: any other exception may have resulted from user code, and should not be translated.
  * 
  * @author Oliver Gierke
- * @author Michal Vich
- * @author Christoph Strobl
  */
 public class MongoExceptionTranslator implements PersistenceExceptionTranslator {
 
-	private static final Set<String> DULICATE_KEY_EXCEPTIONS = new HashSet<String>(
-			Arrays.asList("MongoException.DuplicateKey", "DuplicateKeyException"));
-
-	private static final Set<String> RESOURCE_FAILURE_EXCEPTIONS = new HashSet<String>(
-			Arrays.asList("MongoException.Network", "MongoSocketException", "MongoException.CursorNotFound",
-					"MongoCursorNotFoundException", "MongoServerSelectionException", "MongoTimeoutException"));
-
-	private static final Set<String> RESOURCE_USAGE_EXCEPTIONS = new HashSet<String>(
-			Arrays.asList("MongoInternalException"));
-
-	private static final Set<String> DATA_INTEGRETY_EXCEPTIONS = new HashSet<String>(
-			Arrays.asList("WriteConcernException"));
-
 	/*
-	 * (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.
 
-		String exception = ClassUtils.getShortName(ClassUtils.getUserClass(ex.getClass()));
-
-		if (DULICATE_KEY_EXCEPTIONS.contains(exception)) {
+		// All other MongoExceptions
+		if (ex instanceof DuplicateKey) {
 			return new DuplicateKeyException(ex.getMessage(), ex);
 		}
-
-		if (RESOURCE_FAILURE_EXCEPTIONS.contains(exception)) {
+		if (ex instanceof Network) {
 			return new DataAccessResourceFailureException(ex.getMessage(), ex);
 		}
-
-		if (RESOURCE_USAGE_EXCEPTIONS.contains(exception)) {
-			return new InvalidDataAccessResourceUsageException(ex.getMessage(), ex);
+		if (ex instanceof CursorNotFound) {
+			return new DataAccessResourceFailureException(ex.getMessage(), ex);
 		}
-
-		if (DATA_INTEGRETY_EXCEPTIONS.contains(exception)) {
-			return new DataIntegrityViolationException(ex.getMessage(), ex);
-		}
-
-		if (ex instanceof BulkWriteException) {
-			return new BulkOperationException(ex.getMessage(), (BulkWriteException) ex);
-		}
-
-		// All other MongoExceptions
 		if (ex instanceof MongoException) {
-
 			int code = ((MongoException) ex).getCode();
-
-			if (MongoDbErrorCodes.isDuplicateKeyCode(code)) {
+			if (code == 11000 || code == 11001) {
 				throw new DuplicateKeyException(ex.getMessage(), ex);
-			} else if (MongoDbErrorCodes.isDataAccessResourceFailureCode(code)) {
+			} else if (code == 12000 || code == 13440) {
 				throw new DataAccessResourceFailureException(ex.getMessage(), ex);
-			} else if (MongoDbErrorCodes.isInvalidDataAccessApiUsageCode(code) || code == 10003 || code == 12001
-					|| code == 12010 || code == 12011 || code == 12012) {
+			} else if (code == 10003 || code == 12001 || code == 12010 || code == 12011 || code == 12012) {
 				throw new InvalidDataAccessApiUsageException(ex.getMessage(), ex);
-			} else if (MongoDbErrorCodes.isPermissionDeniedCode(code)) {
-				throw new PermissionDeniedDataAccessException(ex.getMessage(), ex);
 			}
 			return new UncategorizedMongoDbException(ex.getMessage(), ex);
 		}
+		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-2015 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,16 +15,15 @@
  */
 package org.springframework.data.mongodb.core;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
+import java.util.Arrays;
 import java.util.List;
 
-import org.springframework.beans.factory.config.AbstractFactoryBean;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.mongodb.CannotGetMongoDbConnectionException;
-import org.springframework.util.StringUtils;
 
 import com.mongodb.Mongo;
 import com.mongodb.MongoOptions;
@@ -37,15 +36,12 @@ import com.mongodb.WriteConcern;
  * @author Thomas Risberg
  * @author Graeme Rocher
  * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Christoph Strobl
  * @since 1.0
- * @deprecated since 1.7. Please use {@link MongoClientFactoryBean} instead.
  */
-@Deprecated
-public class MongoFactoryBean extends AbstractFactoryBean<Mongo> implements PersistenceExceptionTranslator {
+public class MongoFactoryBean implements FactoryBean<Mongo>, InitializingBean, DisposableBean,
+		PersistenceExceptionTranslator {
 
-	private static final PersistenceExceptionTranslator DEFAULT_EXCEPTION_TRANSLATOR = new MongoExceptionTranslator();
+	private Mongo mongo;
 
 	private MongoOptions mongoOptions;
 	private String host;
@@ -53,42 +49,25 @@ public class MongoFactoryBean extends AbstractFactoryBean<Mongo> implements Pers
 	private WriteConcern writeConcern;
 	private List<ServerAddress> replicaSetSeeds;
 	private List<ServerAddress> replicaPair;
-	private PersistenceExceptionTranslator exceptionTranslator = DEFAULT_EXCEPTION_TRANSLATOR;
 
-	/**
-	 * @param mongoOptions
-	 */
+	private PersistenceExceptionTranslator exceptionTranslator = new MongoExceptionTranslator();
+
 	public void setMongoOptions(MongoOptions mongoOptions) {
 		this.mongoOptions = mongoOptions;
 	}
 
 	public void setReplicaSetSeeds(ServerAddress[] replicaSetSeeds) {
-		this.replicaSetSeeds = filterNonNullElementsAsList(replicaSetSeeds);
+		this.replicaSetSeeds = Arrays.asList(replicaSetSeeds);
 	}
 
-	/**
-	 * @deprecated use {@link #setReplicaSetSeeds(ServerAddress[])} instead
-	 * @param replicaPair
-	 */
-	@Deprecated
 	public void setReplicaPair(ServerAddress[] replicaPair) {
-		this.replicaPair = filterNonNullElementsAsList(replicaPair);
+		this.replicaPair = Arrays.asList(replicaPair);
 	}
 
-	/**
-	 * Configures the host to connect to.
-	 * 
-	 * @param host
-	 */
 	public void setHost(String host) {
 		this.host = host;
 	}
 
-	/**
-	 * Configures the port to connect to.
-	 * 
-	 * @param port
-	 */
 	public void setPort(int port) {
 		this.port = port;
 	}
@@ -102,13 +81,12 @@ public class MongoFactoryBean extends AbstractFactoryBean<Mongo> implements Pers
 		this.writeConcern = writeConcern;
 	}
 
-	/**
-	 * Configures the {@link PersistenceExceptionTranslator} to use.
-	 * 
-	 * @param exceptionTranslator can be {@literal null}.
-	 */
 	public void setExceptionTranslator(PersistenceExceptionTranslator exceptionTranslator) {
-		this.exceptionTranslator = exceptionTranslator == null ? DEFAULT_EXCEPTION_TRANSLATOR : exceptionTranslator;
+		this.exceptionTranslator = exceptionTranslator;
+	}
+
+	public Mongo getObject() throws Exception {
+		return mongo;
 	}
 
 	/*
@@ -119,6 +97,14 @@ public class MongoFactoryBean extends AbstractFactoryBean<Mongo> implements Pers
 		return Mongo.class;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.FactoryBean#isSingleton()
+	 */
+	public boolean isSingleton() {
+		return true;
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.dao.support.PersistenceExceptionTranslator#translateExceptionIfPossible(java.lang.RuntimeException)
@@ -129,10 +115,9 @@ public class MongoFactoryBean extends AbstractFactoryBean<Mongo> implements Pers
 
 	/* 
 	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.config.AbstractFactoryBean#createInstance()
+	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
 	 */
-	@Override
-	protected Mongo createInstance() throws Exception {
+	public void afterPropertiesSet() throws Exception {
 
 		Mongo mongo;
 		ServerAddress defaultOptions = new ServerAddress();
@@ -141,15 +126,15 @@ public class MongoFactoryBean extends AbstractFactoryBean<Mongo> implements Pers
 			mongoOptions = new MongoOptions();
 		}
 
-		if (!isNullOrEmpty(replicaPair)) {
+		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 (!isNullOrEmpty(replicaSetSeeds)) {
+		} else if (replicaSetSeeds != null) {
 			mongo = new Mongo(replicaSetSeeds, mongoOptions);
 		} else {
-			String mongoHost = StringUtils.hasText(host) ? host : defaultOptions.getHost();
+			String mongoHost = host != null ? host : defaultOptions.getHost();
 			mongo = port != null ? new Mongo(new ServerAddress(mongoHost, port), mongoOptions) : new Mongo(mongoHost,
 					mongoOptions);
 		}
@@ -158,42 +143,14 @@ public class MongoFactoryBean extends AbstractFactoryBean<Mongo> implements Pers
 			mongo.setWriteConcern(writeConcern);
 		}
 
-		return mongo;
+		this.mongo = mongo;
 	}
 
 	/* 
 	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.config.AbstractFactoryBean#destroyInstance(java.lang.Object)
+	 * @see org.springframework.beans.factory.DisposableBean#destroy()
 	 */
-	@Override
-	protected void destroyInstance(Mongo mongo) throws Exception {
-		mongo.close();
-	}
-
-	private static boolean isNullOrEmpty(Collection<?> elements) {
-		return elements == null || elements.isEmpty();
-	}
-
-	/**
-	 * Returns the given array as {@link List} with all {@literal null} elements removed.
-	 * 
-	 * @param elements the elements to filter <T>
-	 * @return a new unmodifiable {@link List#} from the given elements without nulls
-	 */
-	private static <T> List<T> filterNonNullElementsAsList(T[] elements) {
-
-		if (elements == null) {
-			return Collections.emptyList();
-		}
-
-		List<T> candidateElements = new ArrayList<T>();
-
-		for (T element : elements) {
-			if (element != null) {
-				candidateElements.add(element);
-			}
-		}
-
-		return Collections.unmodifiableList(candidateElements);
+	public void destroy() throws Exception {
+		this.mongo.close();
 	}
 }

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

@@ -1,6 +1,6 @@
 /*
- * Copyright 2011-2015 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.
  * You may obtain a copy of the License at
@@ -19,12 +19,9 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 
-import org.springframework.data.geo.GeoResults;
-import org.springframework.data.mongodb.core.BulkOperations.BulkMode;
-import org.springframework.data.mongodb.core.aggregation.Aggregation;
-import org.springframework.data.mongodb.core.aggregation.AggregationResults;
-import org.springframework.data.mongodb.core.aggregation.TypedAggregation;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.data.mongodb.core.geo.GeoResult;
+import org.springframework.data.mongodb.core.geo.GeoResults;
 import org.springframework.data.mongodb.core.mapreduce.GroupBy;
 import org.springframework.data.mongodb.core.mapreduce.GroupByResults;
 import org.springframework.data.mongodb.core.mapreduce.MapReduceOptions;
@@ -34,14 +31,10 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
-import org.springframework.data.util.CloseableIterator;
 
 import com.mongodb.CommandResult;
-import com.mongodb.Cursor;
-import com.mongodb.DB;
 import com.mongodb.DBCollection;
 import com.mongodb.DBObject;
-import com.mongodb.ReadPreference;
 import com.mongodb.WriteResult;
 
 /**
@@ -52,10 +45,6 @@ import com.mongodb.WriteResult;
  * @author Thomas Risberg
  * @author Mark Pollack
  * @author Oliver Gierke
- * @author Tobias Trelle
- * @author Chuong Ngo
- * @author Christoph Strobl
- * @author Thomas Darimont
  */
 public interface MongoOperations {
 
@@ -90,23 +79,9 @@ public interface MongoOperations {
 	 * 
 	 * @param command a MongoDB command
 	 * @param options query options to use
-	 * @deprecated since 1.7. Please use {@link #executeCommand(DBObject, ReadPreference)}, as the MongoDB Java driver
-	 *             version 3 no longer supports this operation.
 	 */
-	@Deprecated
 	CommandResult executeCommand(DBObject command, int options);
 
-	/**
-	 * Execute a MongoDB command. Any errors that result from executing this command will be converted into Spring's data
-	 * access exception hierarchy.
-	 * 
-	 * @param command a MongoDB command, must not be {@literal null}.
-	 * @param readPreference read preferences to use, can be {@literal null}.
-	 * @return
-	 * @since 1.7
-	 */
-	CommandResult executeCommand(DBObject command, ReadPreference readPreference);
-
 	/**
 	 * Execute a MongoDB query and iterate over the query results on a per-document basis with a DocumentCallbackHandler.
 	 * 
@@ -162,41 +137,9 @@ public interface MongoOperations {
 	 * @param <T> return type
 	 * @param action callback that specified the MongoDB actions to perform on the DB instance
 	 * @return a result object returned by the action or <tt>null</tt>
-	 * @deprecated since 1.7 as the MongoDB Java driver version 3 does not longer support request boundaries via
-	 *             {@link DB#requestStart()} and {@link DB#requestDone()}.
 	 */
-	@Deprecated
 	<T> T executeInSession(DbCallback<T> action);
 
-	/**
-	 * Executes the given {@link Query} on the entity collection of the specified {@code entityType} backed by a Mongo DB
-	 * {@link Cursor}.
-	 * <p>
-	 * Returns a {@link CloseableIterator} that wraps the a Mongo DB {@link Cursor} that needs to be closed.
-	 * 
-	 * @param <T> element return type
-	 * @param query must not be {@literal null}.
-	 * @param entityType must not be {@literal null}.
-	 * @return will never be {@literal null}.
-	 * @since 1.7
-	 */
-	<T> CloseableIterator<T> stream(Query query, Class<T> entityType);
-
-	/**
-	 * Executes the given {@link Query} on the entity collection of the specified {@code entityType} and collection backed
-	 * by a Mongo DB {@link Cursor}.
-	 * <p>
-	 * Returns a {@link CloseableIterator} that wraps the a Mongo DB {@link Cursor} that needs to be closed.
-	 * 
-	 * @param <T> element return type
-	 * @param query must not be {@literal null}.
-	 * @param entityType must not be {@literal null}.
-	 * @param collectionName must not be {@literal null} or empty.
-	 * @return will never be {@literal null}.
-	 * @since 1.10
-	 */
-	<T> CloseableIterator<T> stream(Query query, Class<T> entityType, String collectionName);
-
 	/**
 	 * Create an uncapped collection with a name based on the provided entity class.
 	 * 
@@ -206,7 +149,7 @@ public interface MongoOperations {
 	<T> DBCollection createCollection(Class<T> entityClass);
 
 	/**
-	 * Create a collection with a name based on the provided entity class using the options.
+	 * Create a collect with a name based on the provided entity class using the options.
 	 * 
 	 * @param entityClass class that determines the collection to create
 	 * @param collectionOptions options to use when creating the collection.
@@ -223,7 +166,7 @@ public interface MongoOperations {
 	DBCollection createCollection(String collectionName);
 
 	/**
-	 * Create a collection with the provided name and options.
+	 * Create a collect with the provided name and options.
 	 * 
 	 * @param collectionName name of the collection
 	 * @param collectionOptions options to use when creating the collection.
@@ -300,47 +243,11 @@ public interface MongoOperations {
 	 */
 	IndexOperations indexOps(Class<?> entityClass);
 
-	/**
-	 * Returns the {@link ScriptOperations} that can be performed on {@link com.mongodb.DB} level.
-	 * 
-	 * @return
-	 * @since 1.7
-	 */
-	ScriptOperations scriptOps();
-
-	/**
-	 * Returns a new {@link BulkOperations} for the given collection.
-	 * 
-	 * @param mode the {@link BulkMode} to use for bulk operations, must not be {@literal null}.
-	 * @param collectionName the name of the collection to work on, must not be {@literal null} or empty.
-	 * @return {@link BulkOperations} on the named collection
-	 */
-	BulkOperations bulkOps(BulkMode mode, String collectionName);
-
-	/**
-	 * Returns a new {@link BulkOperations} for the given entity type.
-	 * 
-	 * @param mode the {@link BulkMode} to use for bulk operations, must not be {@literal null}.
-	 * @param entityType the name of the entity class, must not be {@literal null}.
-	 * @return {@link BulkOperations} on the named collection associated of the given entity class.
-	 */
-	BulkOperations bulkOps(BulkMode mode, Class<?> entityType);
-
-	/**
-	 * Returns a new {@link BulkOperations} for the given entity type and collection name.
-	 * 
-	 * @param mode the {@link BulkMode} to use for bulk operations, must not be {@literal null}.
-	 * @param entityClass the name of the entity class, must not be {@literal null}.
-	 * @param collectionName the name of the collection to work on, must not be {@literal null} or empty.
-	 * @return {@link BulkOperations} on the named collection associated with the given entity class.
-	 */
-	BulkOperations bulkOps(BulkMode mode, Class<?> entityType, String collectionName);
-
 	/**
 	 * Query for a list of objects of type T from the collection used by the entity class.
 	 * <p/>
 	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of MappingMongoConverter will be used.
+	 * configured otherwise, an instance of SimpleMongoConverter will be used.
 	 * <p/>
 	 * If your collection does not contain a homogeneous collection of types, this operation will not be an efficient way
 	 * to map objects since the test for class type is done in the client and not on the server.
@@ -354,7 +261,7 @@ public interface MongoOperations {
 	 * Query for a list of objects of type T from the specified collection.
 	 * <p/>
 	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of MappingMongoConverter will be used.
+	 * configured otherwise, an instance of SimpleMongoConverter will be used.
 	 * <p/>
 	 * If your collection does not contain a homogeneous collection of types, this operation will not be an efficient way
 	 * to map objects since the test for class type is done in the client and not on the server.
@@ -394,57 +301,6 @@ public interface MongoOperations {
 	 */
 	<T> GroupByResults<T> group(Criteria criteria, String inputCollectionName, GroupBy groupBy, Class<T> entityClass);
 
-	/**
-	 * Execute an aggregation operation. The raw results will be mapped to the given entity class. The name of the
-	 * inputCollection is derived from the inputType of the aggregation.
-	 * 
-	 * @param aggregation The {@link TypedAggregation} specification holding the aggregation operations, must not be
-	 *          {@literal null}.
-	 * @param collectionName The name of the input collection to use for the aggreation.
-	 * @param outputType The parameterized type of the returned list, must not be {@literal null}.
-	 * @return The results of the aggregation operation.
-	 * @since 1.3
-	 */
-	<O> AggregationResults<O> aggregate(TypedAggregation<?> aggregation, String collectionName, Class<O> outputType);
-
-	/**
-	 * Execute an aggregation operation. The raw results will be mapped to the given entity class. The name of the
-	 * inputCollection is derived from the inputType of the aggregation.
-	 * 
-	 * @param aggregation The {@link TypedAggregation} specification holding the aggregation operations, must not be
-	 *          {@literal null}.
-	 * @param outputType The parameterized type of the returned list, must not be {@literal null}.
-	 * @return The results of the aggregation operation.
-	 * @since 1.3
-	 */
-	<O> AggregationResults<O> aggregate(TypedAggregation<?> aggregation, Class<O> outputType);
-
-	/**
-	 * Execute an aggregation operation. The raw results will be mapped to the given entity class.
-	 * 
-	 * @param aggregation The {@link Aggregation} specification holding the aggregation operations, must not be
-	 *          {@literal null}.
-	 * @param inputType the inputType where the aggregation operation will read from, must not be {@literal null} or
-	 *          empty.
-	 * @param outputType The parameterized type of the returned list, must not be {@literal null}.
-	 * @return The results of the aggregation operation.
-	 * @since 1.3
-	 */
-	<O> AggregationResults<O> aggregate(Aggregation aggregation, Class<?> inputType, Class<O> outputType);
-
-	/**
-	 * Execute an aggregation operation. The raw results will be mapped to the given entity class.
-	 * 
-	 * @param aggregation The {@link Aggregation} specification holding the aggregation operations, must not be
-	 *          {@literal null}.
-	 * @param collectionName the collection where the aggregation operation will read from, must not be {@literal null} or
-	 *          empty.
-	 * @param outputType The parameterized type of the returned list, must not be {@literal null}.
-	 * @return The results of the aggregation operation.
-	 * @since 1.3
-	 */
-	<O> AggregationResults<O> aggregate(Aggregation aggregation, String collectionName, Class<O> outputType);
-
 	/**
 	 * Execute a map-reduce operation. The map-reduce operation will be formed with an output type of INLINE
 	 * 
@@ -501,10 +357,8 @@ public interface MongoOperations {
 			MapReduceOptions mapReduceOptions, Class<T> entityClass);
 
 	/**
-	 * Returns {@link GeoResults} for all entities matching the given {@link NearQuery}. Will consider entity mapping
-	 * information to determine the collection the query is ran against. Note, that MongoDB limits the number of results
-	 * by default. Make sure to add an explicit limit to the {@link NearQuery} if you expect a particular number of
-	 * results.
+	 * Returns {@link GeoResult} for all entities matching the given {@link NearQuery}. Will consider entity mapping
+	 * information to determine the collection the query is ran against.
 	 * 
 	 * @param near must not be {@literal null}.
 	 * @param entityClass must not be {@literal null}.
@@ -513,9 +367,7 @@ public interface MongoOperations {
 	<T> GeoResults<T> geoNear(NearQuery near, Class<T> entityClass);
 
 	/**
-	 * Returns {@link GeoResults} for all entities matching the given {@link NearQuery}. Note, that MongoDB limits the
-	 * number of results by default. Make sure to add an explicit limit to the {@link NearQuery} if you expect a
-	 * particular number of results.
+	 * Returns {@link GeoResult} for all entities matching the given {@link NearQuery}.
 	 * 
 	 * @param near must not be {@literal null}.
 	 * @param entityClass must not be {@literal null}.
@@ -530,7 +382,7 @@ public interface MongoOperations {
 	 * specified type.
 	 * <p/>
 	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of MappingMongoConverter will be used.
+	 * configured otherwise, an instance of SimpleMongoConverter will be used.
 	 * <p/>
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
@@ -547,7 +399,7 @@ public interface MongoOperations {
 	 * type.
 	 * <p/>
 	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of MappingMongoConverter will be used.
+	 * configured otherwise, an instance of SimpleMongoConverter will be used.
 	 * <p/>
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
@@ -556,43 +408,16 @@ public interface MongoOperations {
 	 *          specification
 	 * @param entityClass the parameterized type of the returned list.
 	 * @param collectionName name of the collection to retrieve the objects from
+	 * 
 	 * @return the converted object
 	 */
 	<T> T findOne(Query query, Class<T> entityClass, String collectionName);
 
-	/**
-	 * Determine result of given {@link Query} contains at least one element.
-	 * 
-	 * @param query the {@link Query} class that specifies the criteria used to find a record.
-	 * @param collectionName name of the collection to check for objects.
-	 * @return
-	 */
-	boolean exists(Query query, String collectionName);
-
-	/**
-	 * Determine result of given {@link Query} contains at least one element.
-	 * 
-	 * @param query the {@link Query} class that specifies the criteria used to find a record.
-	 * @param entityClass the parameterized type.
-	 * @return
-	 */
-	boolean exists(Query query, Class<?> entityClass);
-
-	/**
-	 * Determine result of given {@link Query} contains at least one element.
-	 * 
-	 * @param query the {@link Query} class that specifies the criteria used to find a record.
-	 * @param entityClass the parameterized type.
-	 * @param collectionName name of the collection to check for objects.
-	 * @return
-	 */
-	boolean exists(Query query, Class<?> entityClass, String collectionName);
-
 	/**
 	 * Map the results of an ad-hoc query on the collection for the entity class to a 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 MappingMongoConverter will be used.
+	 * configured otherwise, an instance of SimpleMongoConverter will be used.
 	 * <p/>
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
@@ -608,7 +433,7 @@ public interface MongoOperations {
 	 * Map the results of an ad-hoc query on the specified 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 MappingMongoConverter will be used.
+	 * configured otherwise, an instance of SimpleMongoConverter will be used.
 	 * <p/>
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
@@ -617,6 +442,7 @@ public interface MongoOperations {
 	 *          specification
 	 * @param entityClass the parameterized type of the returned list.
 	 * @param collectionName name of the collection to retrieve the objects from
+	 * 
 	 * @return the List of converted objects
 	 */
 	<T> List<T> find(Query query, Class<T> entityClass, String collectionName);
@@ -638,63 +464,18 @@ public interface MongoOperations {
 	 * @param id the id of the document to return
 	 * @param entityClass the type to convert the document to
 	 * @param collectionName the collection to query for the document
+	 * 
 	 * @param <T>
 	 * @return
 	 */
 	<T> T findById(Object id, Class<T> entityClass, String collectionName);
 
-	/**
-	 * Triggers <a href="http://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify
-	 * <a/> to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query}.
-	 * 
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification.
-	 * @param update the {@link Update} to apply on matching documents.
-	 * @param entityClass the parameterized type.
-	 * @return
-	 */
 	<T> T findAndModify(Query query, Update update, Class<T> entityClass);
 
-	/**
-	 * Triggers <a href="http://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify
-	 * <a/> to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query}.
-	 * 
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification.
-	 * @param update the {@link Update} to apply on matching documents.
-	 * @param entityClass the parameterized type.
-	 * @param collectionName the collection to query.
-	 * @return
-	 */
 	<T> T findAndModify(Query query, Update update, Class<T> entityClass, String collectionName);
 
-	/**
-	 * Triggers <a href="http://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify
-	 * <a/> to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query} taking
-	 * {@link FindAndModifyOptions} into account.
-	 * 
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification.
-	 * @param update the {@link Update} to apply on matching documents.
-	 * @param options the {@link FindAndModifyOptions} holding additional information.
-	 * @param entityClass the parameterized type.
-	 * @return
-	 */
 	<T> T findAndModify(Query query, Update update, FindAndModifyOptions options, Class<T> entityClass);
 
-	/**
-	 * Triggers <a href="http://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify
-	 * <a/> to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query} taking
-	 * {@link FindAndModifyOptions} into account.
-	 * 
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification.
-	 * @param update the {@link Update} to apply on matching documents.
-	 * @param options the {@link FindAndModifyOptions} holding additional information.
-	 * @param entityClass the parameterized type.
-	 * @param collectionName the collection to query.
-	 * @return
-	 */
 	<T> T findAndModify(Query query, Update update, FindAndModifyOptions options, Class<T> entityClass,
 			String collectionName);
 
@@ -720,7 +501,7 @@ public interface MongoOperations {
 	 * type. The first document that matches the query is returned and also removed from the collection in the database.
 	 * <p/>
 	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of MappingMongoConverter will be used.
+	 * configured otherwise, an instance of SimpleMongoConverter will be used.
 	 * <p/>
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
@@ -729,6 +510,7 @@ public interface MongoOperations {
 	 *          specification
 	 * @param entityClass the parameterized type of the returned list.
 	 * @param collectionName name of the collection to retrieve the objects from
+	 * 
 	 * @return the converted object
 	 */
 	<T> T findAndRemove(Query query, Class<T> entityClass, String collectionName);
@@ -743,27 +525,13 @@ public interface MongoOperations {
 	long count(Query query, Class<?> entityClass);
 
 	/**
-	 * Returns the number of documents for the given {@link Query} querying the given collection. The given {@link Query}
-	 * must solely consist of document field references as we lack type information to map potential property references
-	 * onto document fields. TO make sure the query gets mapped, use {@link #count(Query, Class, String)}.
+	 * Returns the number of documents for the given {@link Query} querying the given collection.
 	 * 
 	 * @param query
 	 * @param collectionName must not be {@literal null} or empty.
 	 * @return
-	 * @see #count(Query, Class, String)
-	 */
-	long count(Query query, String collectionName);
-
-	/**
-	 * Returns the number of documents for the given {@link Query} by querying the given collection using the given entity
-	 * class to map the given {@link Query}.
-	 * 
-	 * @param query
-	 * @param entityClass must not be {@literal null}.
-	 * @param collectionName must not be {@literal null} or empty.
-	 * @return
 	 */
-	long count(Query query, Class<?> entityClass, String collectionName);
+	long count(Query query, String collectionName);
 
 	/**
 	 * Insert the object into the collection for the entity type of the object to save.
@@ -772,9 +540,9 @@ public interface MongoOperations {
 	 * <p/>
 	 * If you object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
 	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
-	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See
-	 * <a href="http://docs.spring.io/spring/docs/current/spring-framework-reference/html/validation.html#core-convert" >
-	 * Spring's Type Conversion"</a> for more details.
+	 * property type will be handled by Spring's BeanWrapper class that leverages Spring 3.0's new Type Conversion API.
+	 * See <a href="http://static.springsource.org/spring/docs/3.0.x/reference/validation.html#core-convert">Spring 3 Type
+	 * Conversion"</a> for more details.
 	 * <p/>
 	 * <p/>
 	 * Insert is used to initially store the object into the database. To update an existing object use the save method.
@@ -787,7 +555,7 @@ public interface MongoOperations {
 	 * Insert the object into the specified collection.
 	 * <p/>
 	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of MappingMongoConverter will be used.
+	 * configured otherwise, an instance of SimpleMongoConverter will be used.
 	 * <p/>
 	 * Insert is used to initially store the object into the database. To update an existing object use the save method.
 	 * 
@@ -825,13 +593,13 @@ public interface MongoOperations {
 	 * object is not already present, that is an 'upsert'.
 	 * <p/>
 	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of MappingMongoConverter will be used.
+	 * configured otherwise, an instance of SimpleMongoConverter will be used.
 	 * <p/>
 	 * If you object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
 	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
-	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See
-	 * <a href="http://docs.spring.io/spring/docs/current/spring-framework-reference/html/validation.html#core-convert" >
-	 * Spring's Type Conversion"</a> for more details.
+	 * property type will be handled by Spring's BeanWrapper class that leverages Spring 3.0's new Type Conversion API.
+	 * See <a href="http://static.springsource.org/spring/docs/3.0.x/reference/validation.html#core-convert">Spring 3 Type
+	 * Conversion"</a> for more details.
 	 * 
 	 * @param objectToSave the object to store in the collection
 	 */
@@ -842,13 +610,13 @@ public interface MongoOperations {
 	 * is an 'upsert'.
 	 * <p/>
 	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of MappingMongoConverter will be used.
+	 * configured otherwise, an instance of SimpleMongoConverter will be used.
 	 * <p/>
 	 * If you object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
 	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
-	 * property type will be handled by Spring's BeanWrapper class that leverages Type Cobnversion API. See <a
-	 * http://docs.spring.io/spring/docs/current/spring-framework-reference/html/validation.html#core-convert">Spring's
-	 * Type Conversion"</a> for more details.
+	 * property type will be handled by Spring's BeanWrapper class that leverages Spring 3.0's new Type Cobnversion API.
+	 * See <a href="http://static.springsource.org/spring/docs/3.0.x/reference/validation.html#core-convert">Spring 3 Type
+	 * Conversion"</a> for more details.
 	 * 
 	 * @param objectToSave the object to store in the collection
 	 * @param collectionName name of the collection to store the object in
@@ -878,18 +646,6 @@ public interface MongoOperations {
 	 */
 	WriteResult upsert(Query query, Update update, String collectionName);
 
-	/**
-	 * Performs an upsert. If no document is found that matches the query, a new document is created and inserted by
-	 * combining the query document and the update document.
-	 * 
-	 * @param query the query document that specifies the criteria used to select a record to be upserted
-	 * @param update the update document that contains the updated object or $ operators to manipulate the existing object
-	 * @param entityClass class of the pojo to be operated on
-	 * @param collectionName name of the collection to update the object in
-	 * @return the WriteResult which lets you access the results of the previous write.
-	 */
-	WriteResult upsert(Query query, Update update, Class<?> entityClass, String collectionName);
-
 	/**
 	 * Updates the first object that is found in the collection of the entity class that matches the query document with
 	 * the provided update document.
@@ -914,19 +670,6 @@ public interface MongoOperations {
 	 */
 	WriteResult updateFirst(Query query, Update update, String collectionName);
 
-	/**
-	 * Updates the first object that is found in the specified collection that matches the query document criteria with
-	 * the provided updated document.
-	 * 
-	 * @param query the query document that specifies the criteria used to select a record to be updated
-	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
-	 *          object.
-	 * @param entityClass class of the pojo to be operated on
-	 * @param collectionName name of the collection to update the object in
-	 * @return the WriteResult which lets you access the results of the previous write.
-	 */
-	WriteResult updateFirst(Query query, Update update, Class<?> entityClass, String collectionName);
-
 	/**
 	 * Updates all objects that are found in the collection for the entity class that matches the query document criteria
 	 * with the provided updated document.
@@ -951,25 +694,12 @@ public interface MongoOperations {
 	 */
 	WriteResult updateMulti(Query query, Update update, String collectionName);
 
-	/**
-	 * Updates all objects that are found in the collection for the entity class that matches the query document criteria
-	 * with the provided updated document.
-	 * 
-	 * @param query the query document that specifies the criteria used to select a record to be updated
-	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
-	 *          object.
-	 * @param entityClass class of the pojo to be operated on
-	 * @param collectionName name of the collection to update the object in
-	 * @return the WriteResult which lets you access the results of the previous write.
-	 */
-	WriteResult updateMulti(final Query query, final Update update, Class<?> entityClass, String collectionName);
-
 	/**
 	 * Remove the given object from the collection by id.
 	 * 
 	 * @param object
 	 */
-	WriteResult remove(Object object);
+	void remove(Object object);
 
 	/**
 	 * Removes the given object from the given collection.
@@ -977,26 +707,17 @@ public interface MongoOperations {
 	 * @param object
 	 * @param collection must not be {@literal null} or empty.
 	 */
-	WriteResult remove(Object object, String collection);
+	void remove(Object object, String collection);
 
 	/**
 	 * Remove all documents that match the provided query document criteria from the the collection used to store the
 	 * entityClass. The Class parameter is also used to help convert the Id of the object if it is present in the query.
 	 * 
+	 * @param <T>
 	 * @param query
 	 * @param entityClass
 	 */
-	WriteResult remove(Query query, Class<?> entityClass);
-
-	/**
-	 * Remove all documents that match the provided query document criteria from the the collection used to store the
-	 * entityClass. The Class parameter is also used to help convert the Id of the object if it is present in the query.
-	 * 
-	 * @param query
-	 * @param entityClass
-	 * @param collectionName
-	 */
-	WriteResult remove(Query query, Class<?> entityClass, String collectionName);
+	<T> void remove(Query query, Class<T> entityClass);
 
 	/**
 	 * Remove all documents from the specified collection that match the provided query document criteria. There is no
@@ -1005,40 +726,7 @@ public interface MongoOperations {
 	 * @param query the query document that specifies the criteria used to remove a record
 	 * @param collectionName name of the collection where the objects will removed
 	 */
-	WriteResult remove(Query query, String collectionName);
-
-	/**
-	 * Returns and removes all documents form the specified collection that match the provided query.
-	 * 
-	 * @param query
-	 * @param collectionName
-	 * @return
-	 * @since 1.5
-	 */
-	<T> List<T> findAllAndRemove(Query query, String collectionName);
-
-	/**
-	 * Returns and removes all documents matching the given query form the collection used to store the entityClass.
-	 * 
-	 * @param query
-	 * @param entityClass
-	 * @return
-	 * @since 1.5
-	 */
-	<T> List<T> findAllAndRemove(Query query, Class<T> entityClass);
-
-	/**
-	 * Returns and removes all documents that match the provided query document criteria from the the collection used to
-	 * store the entityClass. The Class parameter is also used to help convert the Id of the object if it is present in
-	 * the query.
-	 * 
-	 * @param query
-	 * @param entityClass
-	 * @param collectionName
-	 * @return
-	 * @since 1.5
-	 */
-	<T> List<T> findAllAndRemove(Query query, Class<T> entityClass, String collectionName);
+	void remove(Query query, String collectionName);
 
 	/**
 	 * Returns the underlying {@link MongoConverter}.
@@ -1046,4 +734,4 @@ public interface MongoOperations {
 	 * @return
 	 */
 	MongoConverter getConverter();
-}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2015 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,99 +15,129 @@
  */
 package org.springframework.data.mongodb.core;
 
-import javax.net.ssl.SSLSocketFactory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.springframework.data.mongodb.util.MongoClientVersion;
-
 import com.mongodb.MongoOptions;
 
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.InitializingBean;
+
 /**
- * A factory bean for construction of a {@link MongoOptions} instance. In case used with MongoDB Java driver version 3
- * porperties not suppprted by the driver will be ignored.
- *
+ * A factory bean for construction of a MongoOptions instance
+ * 
  * @author Graeme Rocher
- * @author Mark Pollack
- * @author Mike Saavedra
- * @author Thomas Darimont
- * @author Christoph Strobl
- * @deprecated since 1.7. Please use {@link MongoClientOptionsFactoryBean} instead.
+ * @Author Mark Pollack
  */
-@Deprecated
-public class MongoOptionsFactoryBean extends AbstractFactoryBean<MongoOptions> {
+public class MongoOptionsFactoryBean implements FactoryBean<MongoOptions>, InitializingBean {
 
-	private static final MongoOptions DEFAULT_MONGO_OPTIONS = new MongoOptions();
-
-	private int connectionsPerHost = DEFAULT_MONGO_OPTIONS.getConnectionsPerHost();
-	private int threadsAllowedToBlockForConnectionMultiplier = DEFAULT_MONGO_OPTIONS
-			.getThreadsAllowedToBlockForConnectionMultiplier();
-	private int maxWaitTime = DEFAULT_MONGO_OPTIONS.getMaxWaitTime();
-	private int connectTimeout = DEFAULT_MONGO_OPTIONS.getConnectTimeout();
-	private int socketTimeout = DEFAULT_MONGO_OPTIONS.getSocketTimeout();
-	private boolean socketKeepAlive = DEFAULT_MONGO_OPTIONS.isSocketKeepAlive();
-	private int writeNumber = DEFAULT_MONGO_OPTIONS.getW();
-	private int writeTimeout = DEFAULT_MONGO_OPTIONS.getWtimeout();
-	private boolean writeFsync = DEFAULT_MONGO_OPTIONS.isFsync();
-
-	private boolean autoConnectRetry = !MongoClientVersion.isMongo3Driver() ? ReflectiveMongoOptionsInvoker
-			.getAutoConnectRetry(DEFAULT_MONGO_OPTIONS) : false;
-	private long maxAutoConnectRetryTime = !MongoClientVersion.isMongo3Driver() ? ReflectiveMongoOptionsInvoker
-			.getMaxAutoConnectRetryTime(DEFAULT_MONGO_OPTIONS) : -1;
-	private boolean slaveOk = !MongoClientVersion.isMongo3Driver() ? ReflectiveMongoOptionsInvoker
-			.getSlaveOk(DEFAULT_MONGO_OPTIONS) : false;
-
-	private boolean ssl;
-	private SSLSocketFactory sslSocketFactory;
+	private static final MongoOptions MONGO_OPTIONS = new MongoOptions();
+	/**
+	 * number of connections allowed per host will block if run out
+	 */
+	private int connectionsPerHost = MONGO_OPTIONS.connectionsPerHost;
 
 	/**
-	 * Configures the maximum number of connections allowed per host until we will block.
+	 * multiplier for connectionsPerHost for # of threads that can block if connectionsPerHost is 10, and
+	 * threadsAllowedToBlockForConnectionMultiplier is 5, then 50 threads can block more than that and an exception will
+	 * be throw
+	 */
+	private int threadsAllowedToBlockForConnectionMultiplier = MONGO_OPTIONS.threadsAllowedToBlockForConnectionMultiplier;
+
+	/**
+	 * max wait time of a blocking thread for a connection
+	 */
+	private int maxWaitTime = MONGO_OPTIONS.maxWaitTime;
+
+	/**
+	 * connect timeout in milliseconds. 0 is default and infinite
+	 */
+	private int connectTimeout = MONGO_OPTIONS.connectTimeout;
+
+	/**
+	 * socket timeout. 0 is default and infinite
+	 */
+	private int socketTimeout = MONGO_OPTIONS.socketTimeout;
+
+	/**
+	 * This controls whether or not to have socket keep alive turned on (SO_KEEPALIVE).
 	 * 
-	 * @param connectionsPerHost
+	 * defaults to false
+	 */
+	public boolean socketKeepAlive = MONGO_OPTIONS.socketKeepAlive;
+
+	/**
+	 * this controls whether or not on a connect, the system retries automatically
+	 */
+	private boolean autoConnectRetry = MONGO_OPTIONS.autoConnectRetry;
+
+	private long maxAutoConnectRetryTime = MONGO_OPTIONS.maxAutoConnectRetryTime;
+
+	/**
+	 * This specifies the number of servers to wait for on the write operation, and exception raising behavior.
+	 * 
+	 * Defaults to 0.
+	 */
+	private int writeNumber;
+
+	/**
+	 * This controls timeout for write operations in milliseconds.
+	 * 
+	 * Defaults to 0 (indefinite). Greater than zero is number of milliseconds to wait.
+	 */
+	private int writeTimeout;
+
+	/**
+	 * This controls whether or not to fsync.
+	 * 
+	 * Defaults to false.
+	 */
+	private boolean writeFsync;
+
+	/**
+	 * Specifies if the driver is allowed to read from secondaries or slaves.
+	 * 
+	 * Defaults to false
+	 */
+	@SuppressWarnings("deprecation")
+	private boolean slaveOk = MONGO_OPTIONS.slaveOk;
+
+	/**
+	 * number of connections allowed per host will block if run out
 	 */
 	public void setConnectionsPerHost(int connectionsPerHost) {
 		this.connectionsPerHost = connectionsPerHost;
 	}
 
 	/**
-	 * A multiplier for connectionsPerHost for # of threads that can block a connection. If connectionsPerHost is 10, and
-	 * threadsAllowedToBlockForConnectionMultiplier is 5, then 50 threads can block. If more threads try to block an
-	 * exception will be thrown.
-	 * 
-	 * @param threadsAllowedToBlockForConnectionMultiplier
+	 * multiplier for connectionsPerHost for # of threads that can block if connectionsPerHost is 10, and
+	 * threadsAllowedToBlockForConnectionMultiplier is 5, then 50 threads can block more than that and an exception will
+	 * be throw
 	 */
 	public void setThreadsAllowedToBlockForConnectionMultiplier(int threadsAllowedToBlockForConnectionMultiplier) {
 		this.threadsAllowedToBlockForConnectionMultiplier = threadsAllowedToBlockForConnectionMultiplier;
 	}
 
 	/**
-	 * Max wait time of a blocking thread for a connection.
-	 * 
-	 * @param maxWaitTime
+	 * max wait time of a blocking thread for a connection
 	 */
 	public void setMaxWaitTime(int maxWaitTime) {
 		this.maxWaitTime = maxWaitTime;
 	}
 
 	/**
-	 * Configures the connect timeout in milliseconds. Defaults to 0 (infinite time).
-	 * 
-	 * @param connectTimeout
+	 * connect timeout in milliseconds. 0 is default and infinite
 	 */
 	public void setConnectTimeout(int connectTimeout) {
 		this.connectTimeout = connectTimeout;
 	}
 
 	/**
-	 * Configures the socket timeout. Defaults to 0 (infinite time).
-	 * 
-	 * @param socketTimeout
+	 * socket timeout. 0 is default and infinite
 	 */
 	public void setSocketTimeout(int socketTimeout) {
 		this.socketTimeout = socketTimeout;
 	}
 
 	/**
-	 * Configures whether or not to have socket keep alive turned on (SO_KEEPALIVE). Defaults to {@literal false}.
+	 * This controls whether or not to have socket keep alive
 	 * 
 	 * @param socketKeepAlive
 	 */
@@ -122,7 +152,7 @@ public class MongoOptionsFactoryBean extends AbstractFactoryBean<MongoOptions> {
 	 * <li>-1 = don't even report network errors</li>
 	 * <li>0 = default, don't call getLastError by default</li>
 	 * <li>1 = basic, call getLastError, but don't wait for slaves</li>
-	 * <li>2 += wait for slaves</li>
+	 * <li>2+= wait for slaves</li>
 	 * </ul>
 	 * 
 	 * @param writeNumber the number of servers to wait for on the write operation, and exception raising behavior.
@@ -132,124 +162,75 @@ public class MongoOptionsFactoryBean extends AbstractFactoryBean<MongoOptions> {
 	}
 
 	/**
-	 * Configures the timeout for write operations in milliseconds. This defaults to {@literal 0} (indefinite).
+	 * This controls timeout for write operations in milliseconds. The 'wtimeout' option to the getlasterror command.
 	 * 
-	 * @param writeTimeout
+	 * @param writeTimeout Defaults to 0 (indefinite). Greater than zero is number of milliseconds to wait.
 	 */
 	public void setWriteTimeout(int writeTimeout) {
 		this.writeTimeout = writeTimeout;
 	}
 
 	/**
-	 * Configures whether or not to fsync. The 'fsync' option to the getlasterror command. Defaults to {@literal false}.
+	 * This controls whether or not to fsync. The 'fsync' option to the getlasterror command. Defaults to false.
 	 * 
-	 * @param writeFsync to fsync on <code>write (true)<code>, otherwise {@literal false}.
+	 * @param writeFsync to fsync on write (true), otherwise false.
 	 */
 	public void setWriteFsync(boolean writeFsync) {
 		this.writeFsync = writeFsync;
 	}
 
 	/**
-	 * Configures whether or not the system retries automatically on a failed connect. This defaults to {@literal false}.
-	 * 
-	 * @deprecated since 1.7.
+	 * this controls whether or not on a connect, the system retries automatically
 	 */
-	@Deprecated
 	public void setAutoConnectRetry(boolean autoConnectRetry) {
 		this.autoConnectRetry = autoConnectRetry;
 	}
 
 	/**
-	 * Configures the maximum amount of time in millisecons to spend retrying to open connection to the same server. This
-	 * defaults to {@literal 0}, which means to use the default {@literal 15s} if {@link #autoConnectRetry} is on.
+	 * The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0,
+	 * which means to use the default 15s if autoConnectRetry is on.
 	 * 
 	 * @param maxAutoConnectRetryTime the maxAutoConnectRetryTime to set
-	 * @deprecated since 1.7
 	 */
-	@Deprecated
 	public void setMaxAutoConnectRetryTime(long maxAutoConnectRetryTime) {
 		this.maxAutoConnectRetryTime = maxAutoConnectRetryTime;
 	}
 
 	/**
-	 * Specifies if the driver is allowed to read from secondaries or slaves. Defaults to {@literal false}.
+	 * Specifies if the driver is allowed to read from secondaries or slaves. Defaults to false.
 	 * 
 	 * @param slaveOk true if the driver should read from secondaries or slaves.
-	 * @deprecated since 1.7
 	 */
-	@Deprecated
 	public void setSlaveOk(boolean slaveOk) {
 		this.slaveOk = slaveOk;
 	}
 
-	/**
-	 * Specifies if the driver should use an SSL connection to Mongo. This defaults to {@literal false}. By default
-	 * {@link SSLSocketFactory#getDefault()} will be used. See {@link #setSslSocketFactory(SSLSocketFactory)} if you want
-	 * to configure a custom factory.
-	 * 
-	 * @param ssl true if the driver should use an SSL connection.
-	 * @see #setSslSocketFactory(SSLSocketFactory)
-	 */
-	public void setSsl(boolean ssl) {
-		this.ssl = ssl;
+	@SuppressWarnings("deprecation")
+	public void afterPropertiesSet() {
+		MONGO_OPTIONS.connectionsPerHost = connectionsPerHost;
+		MONGO_OPTIONS.threadsAllowedToBlockForConnectionMultiplier = threadsAllowedToBlockForConnectionMultiplier;
+		MONGO_OPTIONS.maxWaitTime = maxWaitTime;
+		MONGO_OPTIONS.connectTimeout = connectTimeout;
+		MONGO_OPTIONS.socketTimeout = socketTimeout;
+		MONGO_OPTIONS.socketKeepAlive = socketKeepAlive;
+		MONGO_OPTIONS.autoConnectRetry = autoConnectRetry;
+		MONGO_OPTIONS.maxAutoConnectRetryTime = maxAutoConnectRetryTime;
+		MONGO_OPTIONS.slaveOk = slaveOk;
+		MONGO_OPTIONS.w = writeNumber;
+		MONGO_OPTIONS.wtimeout = writeTimeout;
+		MONGO_OPTIONS.fsync = writeFsync;
 	}
 
-	/**
-	 * Specifies the {@link SSLSocketFactory} to use for creating SSL connections to Mongo. Defaults to
-	 * {@link SSLSocketFactory#getDefault()}. Implicitly activates {@link #setSsl(boolean)} if a non-{@literal null} value
-	 * is given.
-	 * 
-	 * @param sslSocketFactory the sslSocketFactory to use.
-	 * @see #setSsl(boolean)
-	 */
-	public void setSslSocketFactory(SSLSocketFactory sslSocketFactory) {
-
-		setSsl(sslSocketFactory != null);
-		this.sslSocketFactory = sslSocketFactory;
+	public MongoOptions getObject() {
+		return MONGO_OPTIONS;
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.config.AbstractFactoryBean#createInstance()
-	 */
-	@Override
-	protected MongoOptions createInstance() throws Exception {
-
-		if (MongoClientVersion.isMongo3Driver()) {
-			throw new IllegalArgumentException(
-					String
-							.format("Usage of 'mongo-options' is no longer supported for MongoDB Java driver version 3 and above. Please use 'mongo-client-options' and refer to chapter 'MongoDB 3.0 Support' for details."));
-		}
-
-		MongoOptions options = new MongoOptions();
-
-		options.setConnectionsPerHost(connectionsPerHost);
-		options.setThreadsAllowedToBlockForConnectionMultiplier(threadsAllowedToBlockForConnectionMultiplier);
-		options.setMaxWaitTime(maxWaitTime);
-		options.setConnectTimeout(connectTimeout);
-		options.setSocketTimeout(socketTimeout);
-		options.setSocketKeepAlive(socketKeepAlive);
-
-		options.setW(writeNumber);
-		options.setWtimeout(writeTimeout);
-		options.setFsync(writeFsync);
-
-		if (ssl) {
-			options.setSocketFactory(sslSocketFactory != null ? sslSocketFactory : SSLSocketFactory.getDefault());
-		}
-
-		ReflectiveMongoOptionsInvoker.setAutoConnectRetry(options, autoConnectRetry);
-		ReflectiveMongoOptionsInvoker.setMaxAutoConnectRetryTime(options, maxAutoConnectRetryTime);
-		ReflectiveMongoOptionsInvoker.setSlaveOk(options, slaveOk);
-
-		return options;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.FactoryBean#getObjectType()
-	 */
 	public Class<?> getObjectType() {
 		return MongoOptions.class;
 	}
+
+	public boolean isSingleton() {
+		return true;
+	}
+
 }

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

@@ -1,26 +1,8 @@
-/*
- * Copyright 2012-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.data.mongodb.core;
 
 import org.springframework.transaction.support.ResourceHolder;
 import org.springframework.transaction.support.ResourceHolderSynchronization;
 
-/**
- * @author Oliver Gierke
- */
 class MongoSynchronization extends ResourceHolderSynchronization<ResourceHolder, Object> {
 
 	public MongoSynchronization(ResourceHolder resourceHolder, Object resourceKey) {

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

@@ -0,0 +1,172 @@
+/*
+ * 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.BasicDBList;
+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 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;
+
+	/**
+	 * 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 must not be {@literal null}.
+	 * @param entity can be {@literal null}.
+	 * @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 if (valueDbo.containsField("$ne")) {
+						valueDbo.put("$ne", convertId(valueDbo.get("$ne")));
+					} else {
+						value = getMappedObject((DBObject) value, null);
+					}
+				} else {
+					value = convertId(value);
+				}
+				newKey = "_id";
+			} else if (key.matches(N_OR_PATTERN)) {
+				// $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;
+			}
+
+			newDbo.put(newKey, convertSimpleOrDBObject(value, null));
+		}
+
+		return newDbo;
+	}
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * 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;
+		}
+
+		if (entity.getIdProperty() != null) {
+			MongoPersistentProperty idProperty = entity.getIdProperty();
+			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);
+	}
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,84 +0,0 @@
-/*
- * Copyright 2014-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import java.util.Set;
-
-import org.springframework.data.mongodb.core.script.ExecutableMongoScript;
-import org.springframework.data.mongodb.core.script.NamedMongoScript;
-
-import com.mongodb.DB;
-
-/**
- * Script operations on {@link com.mongodb.DB} level. Allows interaction with server side JavaScript functions.
- * 
- * @author Christoph Strobl
- * @author Oliver Gierke
- * @since 1.7
- */
-public interface ScriptOperations {
-
-	/**
-	 * Store given {@link ExecutableMongoScript} generating a syntheitcal name so that it can be called by it
-	 * subsequently.
-	 * 
-	 * @param script must not be {@literal null}.
-	 * @return {@link NamedMongoScript} with name under which the {@code JavaScript} function can be called.
-	 */
-	NamedMongoScript register(ExecutableMongoScript script);
-
-	/**
-	 * Registers the given {@link NamedMongoScript} in the database.
-	 * 
-	 * @param script the {@link NamedMongoScript} to be registered.
-	 * @return
-	 */
-	NamedMongoScript register(NamedMongoScript script);
-
-	/**
-	 * Executes the {@literal script} by either calling it via its {@literal name} or directly sending it.
-	 * 
-	 * @param script must not be {@literal null}.
-	 * @param args arguments to pass on for script execution.
-	 * @return the script evaluation result.
-	 * @throws org.springframework.dao.DataAccessException
-	 */
-	Object execute(ExecutableMongoScript script, Object... args);
-
-	/**
-	 * Call the {@literal JavaScript} by its name.
-	 * 
-	 * @param scriptName must not be {@literal null} or empty.
-	 * @param args
-	 * @return
-	 */
-	Object call(String scriptName, Object... args);
-
-	/**
-	 * Checks {@link DB} for existence of {@link ServerSideJavaScript} with given name.
-	 * 
-	 * @param scriptName must not be {@literal null} or empty.
-	 * @return false if no {@link ServerSideJavaScript} with given name exists.
-	 */
-	boolean exists(String scriptName);
-
-	/**
-	 * Returns names of {@literal JavaScript} functions that can be called.
-	 * 
-	 * @return empty {@link Set} if no scripts found.
-	 */
-	Set<String> getScriptNames();
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2015 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,17 +19,12 @@ import java.net.UnknownHostException;
 
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.dao.DataAccessException;
-import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.authentication.UserCredentials;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
 
 import com.mongodb.DB;
 import com.mongodb.Mongo;
-import com.mongodb.MongoClient;
-import com.mongodb.MongoClientURI;
 import com.mongodb.MongoException;
 import com.mongodb.MongoURI;
 import com.mongodb.WriteConcern;
@@ -39,8 +34,6 @@ import com.mongodb.WriteConcern;
  * 
  * @author Mark Pollack
  * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Christoph Strobl
  */
 public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 
@@ -48,49 +41,27 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	private final String databaseName;
 	private final boolean mongoInstanceCreated;
 	private final UserCredentials credentials;
-	private final PersistenceExceptionTranslator exceptionTranslator;
-	private final String authenticationDatabaseName;
-
 	private WriteConcern writeConcern;
 
 	/**
 	 * Create an instance of {@link SimpleMongoDbFactory} given the {@link Mongo} instance and database name.
 	 * 
 	 * @param mongo Mongo instance, must not be {@literal null}.
-	 * @param databaseName database name, not be {@literal null} or empty.
-	 * @deprecated since 1.7. Please use {@link #SimpleMongoDbFactory(MongoClient, String)}.
+	 * @param databaseName database name, not be {@literal null}.
 	 */
-	@Deprecated
 	public SimpleMongoDbFactory(Mongo mongo, String databaseName) {
-		this(mongo, databaseName, null);
+		this(mongo, databaseName, new UserCredentials(), false);
 	}
 
 	/**
 	 * 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 databaseName Database name, must not be {@literal null}.
 	 * @param credentials username and password.
-	 * @deprecated since 1.7. The credentials used should be provided by {@link MongoClient#getCredentialsList()}.
 	 */
-	@Deprecated
 	public SimpleMongoDbFactory(Mongo mongo, String databaseName, UserCredentials credentials) {
-		this(mongo, databaseName, credentials, false, null);
-	}
-
-	/**
-	 * Create an instance of SimpleMongoDbFactory given the Mongo instance, database name, and username/password
-	 * 
-	 * @param mongo Mongo instance, must not be {@literal null}.
-	 * @param databaseName Database name, must not be {@literal null} or empty.
-	 * @param credentials username and password.
-	 * @param authenticationDatabaseName the database name to use for authentication
-	 * @deprecated since 1.7. The credentials used should be provided by {@link MongoClient#getCredentialsList()}.
-	 */
-	@Deprecated
-	public SimpleMongoDbFactory(Mongo mongo, String databaseName, UserCredentials credentials,
-			String authenticationDatabaseName) {
-		this(mongo, databaseName, credentials, false, authenticationDatabaseName);
+		this(mongo, databaseName, credentials, false);
 	}
 
 	/**
@@ -100,43 +71,13 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	 * @throws MongoException
 	 * @throws UnknownHostException
 	 * @see MongoURI
-	 * @deprecated since 1.7. Please use {@link #SimpleMongoDbFactory(MongoClientURI)} instead.
 	 */
-	@Deprecated
 	public SimpleMongoDbFactory(MongoURI uri) throws MongoException, UnknownHostException {
-		this(new Mongo(uri), uri.getDatabase(), new UserCredentials(uri.getUsername(), parseChars(uri.getPassword())), true,
-				uri.getDatabase());
-	}
-
-	/**
-	 * Creates a new {@link SimpleMongoDbFactory} instance from the given {@link MongoClientURI}.
-	 * 
-	 * @param uri must not be {@literal null}.
-	 * @throws UnknownHostException
-	 * @since 1.7
-	 */
-	public SimpleMongoDbFactory(MongoClientURI uri) throws UnknownHostException {
-		this(new MongoClient(uri), uri.getDatabase(), true);
-	}
-
-	/**
-	 * Creates a new {@link SimpleMongoDbFactory} instance from the given {@link MongoClient}.
-	 * 
-	 * @param mongoClient must not be {@literal null}.
-	 * @param databaseName must not be {@literal null}.
-	 * @since 1.7
-	 */
-	public SimpleMongoDbFactory(MongoClient mongoClient, String databaseName) {
-		this(mongoClient, databaseName, false);
+		this(new Mongo(uri), uri.getDatabase(), new UserCredentials(uri.getUsername(), parseChars(uri.getPassword())), true);
 	}
 
 	private SimpleMongoDbFactory(Mongo mongo, String databaseName, UserCredentials credentials,
-			boolean mongoInstanceCreated, String authenticationDatabaseName) {
-
-		if (mongo instanceof MongoClient && (credentials != null && !UserCredentials.NO_CREDENTIALS.equals(credentials))) {
-			throw new InvalidDataAccessApiUsageException(
-					"Usage of 'UserCredentials' with 'MongoClient' is no longer supported. Please use 'MongoCredential' for 'MongoClient' or just 'Mongo'.");
-		}
+			boolean mongoInstanceCreated) {
 
 		Assert.notNull(mongo, "Mongo must not be null");
 		Assert.hasText(databaseName, "Database name must not be empty");
@@ -146,32 +87,7 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 		this.mongo = mongo;
 		this.databaseName = databaseName;
 		this.mongoInstanceCreated = mongoInstanceCreated;
-		this.credentials = credentials == null ? UserCredentials.NO_CREDENTIALS : credentials;
-		this.exceptionTranslator = new MongoExceptionTranslator();
-		this.authenticationDatabaseName = StringUtils.hasText(authenticationDatabaseName) ? authenticationDatabaseName
-				: databaseName;
-
-		Assert.isTrue(this.authenticationDatabaseName.matches("[\\w-]+"),
-				"Authentication database name must only contain letters, numbers, underscores and dashes!");
-	}
-
-	/**
-	 * @param client
-	 * @param databaseName
-	 * @param mongoInstanceCreated
-	 * @since 1.7
-	 */
-	private SimpleMongoDbFactory(MongoClient client, String databaseName, boolean mongoInstanceCreated) {
-
-		Assert.notNull(client, "MongoClient must not be null!");
-		Assert.hasText(databaseName, "Database name must not be empty!");
-
-		this.mongo = client;
-		this.databaseName = databaseName;
-		this.mongoInstanceCreated = mongoInstanceCreated;
-		this.exceptionTranslator = new MongoExceptionTranslator();
-		this.credentials = UserCredentials.NO_CREDENTIALS;
-		this.authenticationDatabaseName = databaseName;
+		this.credentials = credentials == null ? new UserCredentials() : credentials;
 	}
 
 	/**
@@ -195,12 +111,14 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.MongoDbFactory#getDb(java.lang.String)
 	 */
-	@SuppressWarnings("deprecation")
 	public DB getDb(String dbName) throws DataAccessException {
 
 		Assert.hasText(dbName, "Database name must not be empty.");
 
-		DB db = MongoDbUtils.getDB(mongo, dbName, credentials, authenticationDatabaseName);
+		String username = credentials.getUsername();
+		String password = credentials.getPassword();
+
+		DB db = MongoDbUtils.getDB(mongo, dbName, username, password == null ? null : password.toCharArray());
 
 		if (writeConcern != null) {
 			db.setWriteConcern(writeConcern);
@@ -223,13 +141,4 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	private static String parseChars(char[] chars) {
 		return chars == null ? null : String.valueOf(chars);
 	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.MongoDbFactory#getExceptionTranslator()
-	 */
-	@Override
-	public PersistenceExceptionTranslator getExceptionTranslator() {
-		return this.exceptionTranslator;
-	}
 }

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/aggregation/AbstractAggregationExpression.java

@@ -1,153 +0,0 @@
-/*
- * Copyright 2016. the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.aggregation;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-
-import org.springframework.util.ObjectUtils;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-
-/**
- * @author Christoph Strobl
- * @since 1.10
- */
-abstract class AbstractAggregationExpression implements AggregationExpression {
-
-	private final Object value;
-
-	protected AbstractAggregationExpression(Object value) {
-		this.value = value;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDbObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
-	@Override
-	public DBObject toDbObject(AggregationOperationContext context) {
-		return toDbObject(this.value, context);
-	}
-
-	@SuppressWarnings("unchecked")
-	public DBObject toDbObject(Object value, AggregationOperationContext context) {
-
-		Object valueToUse;
-		if (value instanceof List) {
-
-			List<Object> arguments = (List<Object>) value;
-			List<Object> args = new ArrayList<Object>(arguments.size());
-
-			for (Object val : arguments) {
-				args.add(unpack(val, context));
-			}
-			valueToUse = args;
-		} else if (value instanceof java.util.Map) {
-
-			DBObject dbo = new BasicDBObject();
-			for (java.util.Map.Entry<String, Object> entry : ((java.util.Map<String, Object>) value).entrySet()) {
-				dbo.put(entry.getKey(), unpack(entry.getValue(), context));
-			}
-			valueToUse = dbo;
-		} else {
-			valueToUse = unpack(value, context);
-		}
-
-		return new BasicDBObject(getMongoMethod(), valueToUse);
-	}
-
-	protected static List<Field> asFields(String... fieldRefs) {
-
-		if (ObjectUtils.isEmpty(fieldRefs)) {
-			return Collections.emptyList();
-		}
-
-		return Fields.fields(fieldRefs).asList();
-	}
-
-	@SuppressWarnings("unchecked")
-	private Object unpack(Object value, AggregationOperationContext context) {
-
-		if (value instanceof AggregationExpression) {
-			return ((AggregationExpression) value).toDbObject(context);
-		}
-
-		if (value instanceof Field) {
-			return context.getReference((Field) value).toString();
-		}
-
-		if (value instanceof List) {
-
-			List<Object> sourceList = (List<Object>) value;
-			List<Object> mappedList = new ArrayList<Object>(sourceList.size());
-
-			for (Object item : sourceList) {
-				mappedList.add(unpack(item, context));
-			}
-			return mappedList;
-		}
-
-		return value;
-	}
-
-	protected List<Object> append(Object value) {
-
-		if (this.value instanceof List) {
-
-			List<Object> clone = new ArrayList<Object>((List) this.value);
-
-			if (value instanceof List) {
-				for (Object val : (List) value) {
-					clone.add(val);
-				}
-			} else {
-				clone.add(value);
-			}
-			return clone;
-		}
-
-		return Arrays.asList(this.value, value);
-	}
-
-	@SuppressWarnings("unchecked")
-	protected java.util.Map<String, Object> append(String key, Object value) {
-
-		if (!(this.value instanceof java.util.Map)) {
-			throw new IllegalArgumentException("o_O");
-		}
-		java.util.Map<String, Object> clone = new LinkedHashMap<String, Object>((java.util.Map<String, Object>) this.value);
-		clone.put(key, value);
-		return clone;
-
-	}
-
-	protected List<Object> values() {
-
-		if (value instanceof List) {
-			return new ArrayList<Object>((List) value);
-		}
-		if (value instanceof java.util.Map) {
-			return new ArrayList<Object>(((java.util.Map) value).values());
-		}
-		return new ArrayList<Object>(Collections.singletonList(value));
-	}
-
-	protected abstract String getMongoMethod();
-}

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

@@ -1,648 +0,0 @@
-/*
- * Copyright 2016. the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.aggregation;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.springframework.util.Assert;
-
-import com.mongodb.DBObject;
-
-/**
- * Gateway to {@literal accumulator} aggregation operations.
- *
- * @author Christoph Strobl
- * @since 1.10
- * @soundtrack Rage Against The Machine - Killing In The Name
- */
-public class AccumulatorOperators {
-
-	/**
-	 * Take the numeric value referenced by given {@literal fieldReference}.
-	 *
-	 * @param fieldReference must not be {@literal null}.
-	 * @return
-	 */
-	public static AccumulatorOperatorFactory valueOf(String fieldReference) {
-		return new AccumulatorOperatorFactory(fieldReference);
-	}
-
-	/**
-	 * Take the numeric value referenced resulting from given {@link AggregationExpression}.
-	 *
-	 * @param expression must not be {@literal null}.
-	 * @return
-	 */
-	public static AccumulatorOperatorFactory valueOf(AggregationExpression expression) {
-		return new AccumulatorOperatorFactory(expression);
-	}
-
-	/**
-	 * @author Christoph Strobl
-	 */
-	public static class AccumulatorOperatorFactory {
-
-		private final String fieldReference;
-		private final AggregationExpression expression;
-
-		/**
-		 * Creates new {@link AccumulatorOperatorFactory} for given {@literal fieldReference}.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 */
-		public AccumulatorOperatorFactory(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			this.fieldReference = fieldReference;
-			this.expression = null;
-		}
-
-		/**
-		 * Creates new {@link AccumulatorOperatorFactory} for given {@link AggregationExpression}.
-		 *
-		 * @param expression must not be {@literal null}.
-		 */
-		public AccumulatorOperatorFactory(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			this.fieldReference = null;
-			this.expression = expression;
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that takes the associated numeric value expression and calculates and
-		 * returns the sum.
-		 *
-		 * @return
-		 */
-		public Sum sum() {
-			return usesFieldRef() ? Sum.sumOf(fieldReference) : Sum.sumOf(expression);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that takes the associated numeric value expression and returns the
-		 * average value.
-		 *
-		 * @return
-		 */
-		public Avg avg() {
-			return usesFieldRef() ? Avg.avgOf(fieldReference) : Avg.avgOf(expression);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that takes the associated numeric value expression and returns the
-		 * maximum value.
-		 *
-		 * @return
-		 */
-		public Max max() {
-			return usesFieldRef() ? Max.maxOf(fieldReference) : Max.maxOf(expression);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that takes the associated numeric value expression and returns the
-		 * minimum value.
-		 *
-		 * @return
-		 */
-		public Min min() {
-			return usesFieldRef() ? Min.minOf(fieldReference) : Min.minOf(expression);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that takes the associated numeric value expression and calculates the
-		 * population standard deviation of the input values.
-		 *
-		 * @return
-		 */
-		public StdDevPop stdDevPop() {
-			return usesFieldRef() ? StdDevPop.stdDevPopOf(fieldReference) : StdDevPop.stdDevPopOf(expression);
-		}
-
-		/**
-		 * Creates new {@link AggregationExpression} that takes the associated numeric value expression and calculates the
-		 * sample standard deviation of the input values.
-		 *
-		 * @return
-		 */
-		public StdDevSamp stdDevSamp() {
-			return usesFieldRef() ? StdDevSamp.stdDevSampOf(fieldReference) : StdDevSamp.stdDevSampOf(expression);
-		}
-
-		private boolean usesFieldRef() {
-			return fieldReference != null;
-		}
-	}
-
-	/**
-	 * {@link AggregationExpression} for {@code $sum}.
-	 *
-	 * @author Christoph Strobl
-	 */
-	public static class Sum extends AbstractAggregationExpression {
-
-		private Sum(Object value) {
-			super(value);
-		}
-
-		@Override
-		protected String getMongoMethod() {
-			return "$sum";
-		}
-
-		/**
-		 * Creates new {@link Sum}.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public static Sum sumOf(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Sum(asFields(fieldReference));
-		}
-
-		/**
-		 * Creates new {@link Sum}.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public static Sum sumOf(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Sum(Collections.singletonList(expression));
-		}
-
-		/**
-		 * Creates new {@link Sum} with all previously added arguments appending the given one. <br />
-		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public Sum and(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Sum(append(Fields.field(fieldReference)));
-		}
-
-		/**
-		 * Creates new {@link Sum} with all previously added arguments appending the given one. <br />
-		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public Sum and(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Sum(append(expression));
-		}
-
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDbObject(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
-		@Override
-		@SuppressWarnings("unchecked")
-		public DBObject toDbObject(Object value, AggregationOperationContext context) {
-
-			if (value instanceof List) {
-				if (((List) value).size() == 1) {
-					return super.toDbObject(((List<Object>) value).iterator().next(), context);
-				}
-			}
-
-			return super.toDbObject(value, context);
-		}
-	}
-
-	/**
-	 * {@link AggregationExpression} for {@code $avg}.
-	 *
-	 * @author Christoph Strobl
-	 */
-	public static class Avg extends AbstractAggregationExpression {
-
-		private Avg(Object value) {
-			super(value);
-		}
-
-		@Override
-		protected String getMongoMethod() {
-			return "$avg";
-		}
-
-		/**
-		 * Creates new {@link Avg}.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public static Avg avgOf(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Avg(asFields(fieldReference));
-		}
-
-		/**
-		 * Creates new {@link Avg}.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public static Avg avgOf(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Avg(Collections.singletonList(expression));
-		}
-
-		/**
-		 * Creates new {@link Avg} with all previously added arguments appending the given one. <br />
-		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public Avg and(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Avg(append(Fields.field(fieldReference)));
-		}
-
-		/**
-		 * Creates new {@link Avg} with all previously added arguments appending the given one. <br />
-		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public Avg and(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Avg(append(expression));
-		}
-
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDbObject(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
-		@Override
-		@SuppressWarnings("unchecked")
-		public DBObject toDbObject(Object value, AggregationOperationContext context) {
-
-			if (value instanceof List) {
-				if (((List) value).size() == 1) {
-					return super.toDbObject(((List<Object>) value).iterator().next(), context);
-				}
-			}
-
-			return super.toDbObject(value, context);
-		}
-	}
-
-	/**
-	 * {@link AggregationExpression} for {@code $max}.
-	 *
-	 * @author Christoph Strobl
-	 */
-	public static class Max extends AbstractAggregationExpression {
-
-		private Max(Object value) {
-			super(value);
-		}
-
-		@Override
-		protected String getMongoMethod() {
-			return "$max";
-		}
-
-		/**
-		 * Creates new {@link Max}.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public static Max maxOf(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Max(asFields(fieldReference));
-		}
-
-		/**
-		 * Creates new {@link Max}.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public static Max maxOf(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Max(Collections.singletonList(expression));
-		}
-
-		/**
-		 * Creates new {@link Max} with all previously added arguments appending the given one. <br />
-		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public Max and(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Max(append(Fields.field(fieldReference)));
-		}
-
-		/**
-		 * Creates new {@link Max} with all previously added arguments appending the given one. <br />
-		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public Max and(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Max(append(expression));
-		}
-
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDbObject(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
-		@Override
-		@SuppressWarnings("unchecked")
-		public DBObject toDbObject(Object value, AggregationOperationContext context) {
-
-			if (value instanceof List) {
-				if (((List) value).size() == 1) {
-					return super.toDbObject(((List<Object>) value).iterator().next(), context);
-				}
-			}
-
-			return super.toDbObject(value, context);
-		}
-	}
-
-	/**
-	 * {@link AggregationExpression} for {@code $min}.
-	 *
-	 * @author Christoph Strobl
-	 */
-	public static class Min extends AbstractAggregationExpression {
-
-		private Min(Object value) {
-			super(value);
-		}
-
-		@Override
-		protected String getMongoMethod() {
-			return "$min";
-		}
-
-		/**
-		 * Creates new {@link Min}.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public static Min minOf(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Min(asFields(fieldReference));
-		}
-
-		/**
-		 * Creates new {@link Min}.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public static Min minOf(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Min(Collections.singletonList(expression));
-		}
-
-		/**
-		 * Creates new {@link Min} with all previously added arguments appending the given one. <br />
-		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public Min and(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Min(append(Fields.field(fieldReference)));
-		}
-
-		/**
-		 * Creates new {@link Min} with all previously added arguments appending the given one. <br />
-		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public Min and(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Min(append(expression));
-		}
-
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDbObject(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
-		@Override
-		@SuppressWarnings("unchecked")
-		public DBObject toDbObject(Object value, AggregationOperationContext context) {
-
-			if (value instanceof List) {
-				if (((List) value).size() == 1) {
-					return super.toDbObject(((List<Object>) value).iterator().next(), context);
-				}
-			}
-
-			return super.toDbObject(value, context);
-		}
-	}
-
-	/**
-	 * {@link AggregationExpression} for {@code $stdDevPop}.
-	 *
-	 * @author Christoph Strobl
-	 */
-	public static class StdDevPop extends AbstractAggregationExpression {
-
-		private StdDevPop(Object value) {
-			super(value);
-		}
-
-		@Override
-		protected String getMongoMethod() {
-			return "$stdDevPop";
-		}
-
-		/**
-		 * Creates new {@link StdDevPop}.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public static StdDevPop stdDevPopOf(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new StdDevPop(asFields(fieldReference));
-		}
-
-		/**
-		 * Creates new {@link StdDevPop} with all previously added arguments appending the given one.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public static StdDevPop stdDevPopOf(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new StdDevPop(Collections.singletonList(expression));
-		}
-
-		/**
-		 * Creates new {@link StdDevPop} with all previously added arguments appending the given one. <br/>
-		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public StdDevPop and(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new StdDevPop(append(Fields.field(fieldReference)));
-		}
-
-		/**
-		 * Creates new {@link StdDevSamp} with all previously added arguments appending the given one. <br />
-		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public StdDevPop and(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new StdDevPop(append(expression));
-		}
-
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDbObject(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
-		@Override
-		@SuppressWarnings("unchecked")
-		public DBObject toDbObject(Object value, AggregationOperationContext context) {
-
-			if (value instanceof List) {
-				if (((List) value).size() == 1) {
-					return super.toDbObject(((List<Object>) value).iterator().next(), context);
-				}
-			}
-
-			return super.toDbObject(value, context);
-		}
-	}
-
-	/**
-	 * {@link AggregationExpression} for {@code $stdDevSamp}.
-	 *
-	 * @author Christoph Strobl
-	 */
-	public static class StdDevSamp extends AbstractAggregationExpression {
-
-		private StdDevSamp(Object value) {
-			super(value);
-		}
-
-		@Override
-		protected String getMongoMethod() {
-			return "$stdDevSamp";
-		}
-
-		/**
-		 * Creates new {@link StdDevSamp}.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public static StdDevSamp stdDevSampOf(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new StdDevSamp(asFields(fieldReference));
-		}
-
-		/**
-		 * Creates new {@link StdDevSamp}.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public static StdDevSamp stdDevSampOf(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new StdDevSamp(Collections.singletonList(expression));
-		}
-
-		/**
-		 * Creates new {@link StdDevSamp} with all previously added arguments appending the given one. <br />
-		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
-		 *
-		 * @param fieldReference must not be {@literal null}.
-		 * @return
-		 */
-		public StdDevSamp and(String fieldReference) {
-
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new StdDevSamp(append(Fields.field(fieldReference)));
-		}
-
-		/**
-		 * Creates new {@link StdDevSamp} with all previously added arguments appending the given one. <br />
-		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
-		 *
-		 * @param expression must not be {@literal null}.
-		 * @return
-		 */
-		public StdDevSamp and(AggregationExpression expression) {
-
-			Assert.notNull(expression, "Expression must not be null!");
-			return new StdDevSamp(append(expression));
-		}
-
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDbObject(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
-		@Override
-		@SuppressWarnings("unchecked")
-		public DBObject toDbObject(Object value, AggregationOperationContext context) {
-
-			if (value instanceof List) {
-				if (((List) value).size() == 1) {
-					return super.toDbObject(((List<Object>) value).iterator().next(), context);
-				}
-			}
-
-			return super.toDbObject(value, context);
-		}
-	}
-}

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

@@ -1,645 +0,0 @@
-/*
- * Copyright 2013-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.aggregation;
-
-import static org.springframework.data.mongodb.core.aggregation.Fields.*;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.springframework.data.domain.Sort;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.data.mongodb.core.aggregation.CountOperation.CountOperationBuilder;
-import org.springframework.data.mongodb.core.aggregation.ExposedFields.DirectFieldReference;
-import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
-import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
-import org.springframework.data.mongodb.core.aggregation.FacetOperation.FacetOperationBuilder;
-import org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation.InheritsFieldsAggregationOperation;
-import org.springframework.data.mongodb.core.aggregation.GraphLookupOperation.StartWithBuilder;
-import org.springframework.data.mongodb.core.aggregation.ReplaceRootOperation.ReplaceRootDocumentOperationBuilder;
-import org.springframework.data.mongodb.core.aggregation.ReplaceRootOperation.ReplaceRootOperationBuilder;
-import org.springframework.data.mongodb.core.aggregation.Fields.*;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.CriteriaDefinition;
-import org.springframework.data.mongodb.core.query.NearQuery;
-import org.springframework.data.mongodb.core.query.SerializationUtils;
-import org.springframework.util.Assert;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-
-/**
- * An {@code Aggregation} is a representation of a list of aggregation steps to be performed by the MongoDB Aggregation
- * Framework.
- *
- * @author Tobias Trelle
- * @author Thomas Darimont
- * @author Oliver Gierke
- * @author Mark Paluch
- * @author Alessio Fachechi
- * @author Christoph Strobl
- * @author Nikolay Bogdanov
- * @since 1.3
- */
-public class Aggregation {
-
-	/**
-	 * References the root document, i.e. the top-level document, currently being processed in the aggregation pipeline
-	 * stage.
-	 */
-	public static final String ROOT = SystemVariable.ROOT.toString();
-
-	/**
-	 * References the start of the field path being processed in the aggregation pipeline stage. Unless documented
-	 * otherwise, all stages start with CURRENT the same as ROOT.
-	 */
-	public static final String CURRENT = SystemVariable.CURRENT.toString();
-
-	public static final AggregationOperationContext DEFAULT_CONTEXT = AggregationOperationRenderer.DEFAULT_CONTEXT;
-	public static final AggregationOptions DEFAULT_OPTIONS = newAggregationOptions().build();
-
-	protected final List<AggregationOperation> operations;
-	private final AggregationOptions options;
-
-	/**
-	 * Creates a new {@link Aggregation} from the given {@link AggregationOperation}s.
-	 *
-	 * @param operations must not be {@literal null} or empty.
-	 */
-	public static Aggregation newAggregation(List<? extends AggregationOperation> operations) {
-		return newAggregation(operations.toArray(new AggregationOperation[operations.size()]));
-	}
-
-	/**
-	 * Creates a new {@link Aggregation} from the given {@link AggregationOperation}s.
-	 *
-	 * @param operations must not be {@literal null} or empty.
-	 */
-	public static Aggregation newAggregation(AggregationOperation... operations) {
-		return new Aggregation(operations);
-	}
-
-	/**
-	 * Returns a copy of this {@link Aggregation} with the given {@link AggregationOptions} set. Note that options are
-	 * supported in MongoDB version 2.6+.
-	 *
-	 * @param options must not be {@literal null}.
-	 * @return
-	 * @since 1.6
-	 */
-	public Aggregation withOptions(AggregationOptions options) {
-
-		Assert.notNull(options, "AggregationOptions must not be null.");
-		return new Aggregation(this.operations, options);
-	}
-
-	/**
-	 * Creates a new {@link TypedAggregation} for the given type and {@link AggregationOperation}s.
-	 *
-	 * @param type must not be {@literal null}.
-	 * @param operations must not be {@literal null} or empty.
-	 */
-	public static <T> TypedAggregation<T> newAggregation(Class<T> type, List<? extends AggregationOperation> operations) {
-		return newAggregation(type, operations.toArray(new AggregationOperation[operations.size()]));
-	}
-
-	/**
-	 * Creates a new {@link TypedAggregation} for the given type and {@link AggregationOperation}s.
-	 *
-	 * @param type must not be {@literal null}.
-	 * @param operations must not be {@literal null} or empty.
-	 */
-	public static <T> TypedAggregation<T> newAggregation(Class<T> type, AggregationOperation... operations) {
-		return new TypedAggregation<T>(type, operations);
-	}
-
-	/**
-	 * Creates a new {@link Aggregation} from the given {@link AggregationOperation}s.
-	 *
-	 * @param aggregationOperations must not be {@literal null} or empty.
-	 */
-	protected Aggregation(AggregationOperation... aggregationOperations) {
-		this(asAggregationList(aggregationOperations));
-	}
-
-	/**
-	 * @param aggregationOperations must not be {@literal null} or empty.
-	 * @return
-	 */
-	protected static List<AggregationOperation> asAggregationList(AggregationOperation... aggregationOperations) {
-
-		Assert.notEmpty(aggregationOperations, "AggregationOperations must not be null or empty!");
-
-		return Arrays.asList(aggregationOperations);
-	}
-
-	/**
-	 * Creates a new {@link Aggregation} from the given {@link AggregationOperation}s.
-	 *
-	 * @param aggregationOperations must not be {@literal null} or empty.
-	 */
-	protected Aggregation(List<AggregationOperation> aggregationOperations) {
-		this(aggregationOperations, DEFAULT_OPTIONS);
-	}
-
-	/**
-	 * Creates a new {@link Aggregation} from the given {@link AggregationOperation}s.
-	 *
-	 * @param aggregationOperations must not be {@literal null} or empty.
-	 * @param options must not be {@literal null} or empty.
-	 */
-	protected Aggregation(List<AggregationOperation> aggregationOperations, AggregationOptions options) {
-
-		Assert.notNull(aggregationOperations, "AggregationOperations must not be null!");
-		Assert.isTrue(!aggregationOperations.isEmpty(), "At least one AggregationOperation has to be provided");
-		Assert.notNull(options, "AggregationOptions must not be null!");
-
-		// check $out is the last operation if it exists
-		for (AggregationOperation aggregationOperation : aggregationOperations) {
-			if (aggregationOperation instanceof OutOperation && !isLast(aggregationOperation, aggregationOperations)) {
-				throw new IllegalArgumentException("The $out operator must be the last stage in the pipeline.");
-			}
-		}
-
-		this.operations = aggregationOperations;
-		this.options = options;
-	}
-
-	private boolean isLast(AggregationOperation aggregationOperation, List<AggregationOperation> aggregationOperations) {
-		return aggregationOperations.indexOf(aggregationOperation) == aggregationOperations.size() - 1;
-	}
-
-	/**
-	 * A pointer to the previous {@link AggregationOperation}.
-	 *
-	 * @return
-	 */
-	public static String previousOperation() {
-		return "_id";
-	}
-
-	/**
-	 * Creates a new {@link ProjectionOperation} including the given fields.
-	 *
-	 * @param fields must not be {@literal null}.
-	 * @return
-	 */
-	public static ProjectionOperation project(String... fields) {
-		return project(fields(fields));
-	}
-
-	/**
-	 * Creates a new {@link ProjectionOperation} including the given {@link Fields}.
-	 *
-	 * @param fields must not be {@literal null}.
-	 * @return
-	 */
-	public static ProjectionOperation project(Fields fields) {
-		return new ProjectionOperation(fields);
-	}
-
-	/**
-	 * Factory method to create a new {@link UnwindOperation} for the field with the given name.
-	 *
-	 * @param field must not be {@literal null} or empty.
-	 * @return
-	 */
-	public static UnwindOperation unwind(String field) {
-		return new UnwindOperation(field(field));
-	}
-
-	/**
-	 * Factory method to create a new {@link ReplaceRootOperation} for the field with the given name.
-	 *
-	 * @param fieldName must not be {@literal null} or empty.
-	 * @return
-	 * @since 1.10
-	 */
-	public static ReplaceRootOperation replaceRoot(String fieldName) {
-		return ReplaceRootOperation.builder().withValueOf(fieldName);
-	}
-
-	/**
-	 * Factory method to create a new {@link ReplaceRootOperation} for the field with the given
-	 * {@link AggregationExpression}.
-	 *
-	 * @param aggregationExpression must not be {@literal null}.
-	 * @return
-	 * @since 1.10
-	 */
-	public static ReplaceRootOperation replaceRoot(AggregationExpression aggregationExpression) {
-		return ReplaceRootOperation.builder().withValueOf(aggregationExpression);
-	}
-
-	/**
-	 * Factory method to create a new {@link ReplaceRootDocumentOperationBuilder} to configure a
-	 * {@link ReplaceRootOperation}.
-	 *
-	 * @return the {@literal ReplaceRootDocumentOperationBuilder}.
-	 * @since 1.10
-	 */
-	public static ReplaceRootOperationBuilder replaceRoot() {
-		return ReplaceRootOperation.builder();
-	}
-
-	/**
-	 * Factory method to create a new {@link UnwindOperation} for the field with the given name and
-	 * {@code preserveNullAndEmptyArrays}. Note that extended unwind is supported in MongoDB version 3.2+.
-	 *
-	 * @param field must not be {@literal null} or empty.
-	 * @param preserveNullAndEmptyArrays {@literal true} to output the document if path is {@literal null}, missing or
-	 *          array is empty.
-	 * @return new {@link UnwindOperation}
-	 * @since 1.10
-	 */
-	public static UnwindOperation unwind(String field, boolean preserveNullAndEmptyArrays) {
-		return new UnwindOperation(field(field), preserveNullAndEmptyArrays);
-	}
-
-	/**
-	 * Factory method to create a new {@link UnwindOperation} for the field with the given name including the name of a
-	 * new field to hold the array index of the element as {@code arrayIndex}. Note that extended unwind is supported in
-	 * MongoDB version 3.2+.
-	 *
-	 * @param field must not be {@literal null} or empty.
-	 * @param arrayIndex must not be {@literal null} or empty.
-	 * @return new {@link UnwindOperation}
-	 * @since 1.10
-	 */
-	public static UnwindOperation unwind(String field, String arrayIndex) {
-		return new UnwindOperation(field(field), field(arrayIndex), false);
-	}
-
-	/**
-	 * Factory method to create a new {@link UnwindOperation} for the field with the given nameincluding the name of a new
-	 * field to hold the array index of the element as {@code arrayIndex} using {@code preserveNullAndEmptyArrays}. Note
-	 * that extended unwind is supported in MongoDB version 3.2+.
-	 *
-	 * @param field must not be {@literal null} or empty.
-	 * @param arrayIndex must not be {@literal null} or empty.
-	 * @param preserveNullAndEmptyArrays {@literal true} to output the document if path is {@literal null}, missing or
-	 *          array is empty.
-	 * @return new {@link UnwindOperation}
-	 * @since 1.10
-	 */
-	public static UnwindOperation unwind(String field, String arrayIndex, boolean preserveNullAndEmptyArrays) {
-		return new UnwindOperation(field(field), field(arrayIndex), preserveNullAndEmptyArrays);
-	}
-
-	/**
-	 * Creates a new {@link GroupOperation} for the given fields.
-	 *
-	 * @param fields must not be {@literal null}.
-	 * @return
-	 */
-	public static GroupOperation group(String... fields) {
-		return group(fields(fields));
-	}
-
-	/**
-	 * Creates a new {@link GroupOperation} for the given {@link Fields}.
-	 *
-	 * @param fields must not be {@literal null}.
-	 * @return
-	 */
-	public static GroupOperation group(Fields fields) {
-		return new GroupOperation(fields);
-	}
-
-	/**
-	 * Creates a new {@link GraphLookupOperation.GraphLookupOperationFromBuilder} to construct a
-	 * {@link GraphLookupOperation} given {@literal fromCollection}.
-	 *
-	 * @param fromCollection must not be {@literal null} or empty.
-	 * @return
-	 * @since 1.10
-	 */
-	public static StartWithBuilder graphLookup(String fromCollection) {
-		return GraphLookupOperation.builder().from(fromCollection);
-	}
-
-	/**
-	 * Factory method to create a new {@link SortOperation} for the given {@link Sort}.
-	 *
-	 * @param sort must not be {@literal null}.
-	 * @return
-	 */
-	public static SortOperation sort(Sort sort) {
-		return new SortOperation(sort);
-	}
-
-	/**
-	 * Factory method to create a new {@link SortOperation} for the given sort {@link Direction} and {@code fields}.
-	 *
-	 * @param direction must not be {@literal null}.
-	 * @param fields must not be {@literal null}.
-	 * @return
-	 */
-	public static SortOperation sort(Direction direction, String... fields) {
-		return new SortOperation(new Sort(direction, fields));
-	}
-
-	/**
-	 * Creates a new {@link SkipOperation} skipping the given number of elements.
-	 *
-	 * @param elementsToSkip must not be less than zero.
-	 * @return
-	 * @deprecated prepare to get this one removed in favor of {@link #skip(long)}.
-	 */
-	public static SkipOperation skip(int elementsToSkip) {
-		return new SkipOperation(elementsToSkip);
-	}
-
-	/**
-	 * Creates a new {@link SkipOperation} skipping the given number of elements.
-	 *
-	 * @param elementsToSkip must not be less than zero.
-	 * @return
-	 */
-	public static SkipOperation skip(long elementsToSkip) {
-		return new SkipOperation(elementsToSkip);
-	}
-
-	/**
-	 * Creates a new {@link LimitOperation} limiting the result to the given number of elements.
-	 *
-	 * @param maxElements must not be less than zero.
-	 * @return
-	 */
-	public static LimitOperation limit(long maxElements) {
-		return new LimitOperation(maxElements);
-	}
-
-	/**
-	 * Creates a new {@link MatchOperation} using the given {@link Criteria}.
-	 *
-	 * @param criteria must not be {@literal null}.
-	 * @return
-	 */
-	public static MatchOperation match(Criteria criteria) {
-		return new MatchOperation(criteria);
-	}
-
-	/**
-	 * Creates a new {@link MatchOperation} using the given {@link CriteriaDefinition}.
-	 *
-	 * @param criteria must not be {@literal null}.
-	 * @return
-	 * @since 1.10
-	 */
-	public static MatchOperation match(CriteriaDefinition criteria) {
-		return new MatchOperation(criteria);
-	}
-
-	/**
-	 * Creates a new {@link OutOperation} using the given collection name. This operation must be the last operation in
-	 * the pipeline.
-	 *
-	 * @param outCollectionName collection name to export aggregation results. The {@link OutOperation} creates a new
-	 *          collection in the current database if one does not already exist. The collection is not visible until the
-	 *          aggregation completes. If the aggregation fails, MongoDB does not create the collection. Must not be
-	 *          {@literal null}.
-	 * @return
-	 */
-	public static OutOperation out(String outCollectionName) {
-		return new OutOperation(outCollectionName);
-	}
-
-	/**
-	 * Creates a new {@link BucketOperation} given {@literal groupByField}.
-	 *
-	 * @param groupByField must not be {@literal null} or empty.
-	 * @return
-	 * @since 1.10
-	 */
-	public static BucketOperation bucket(String groupByField) {
-		return new BucketOperation(field(groupByField));
-	}
-
-	/**
-	 * Creates a new {@link BucketOperation} given {@link AggregationExpression group-by expression}.
-	 *
-	 * @param groupByExpression must not be {@literal null}.
-	 * @return
-	 * @since 1.10
-	 */
-	public static BucketOperation bucket(AggregationExpression groupByExpression) {
-		return new BucketOperation(groupByExpression);
-	}
-
-	/**
-	 * Creates a new {@link BucketAutoOperation} given {@literal groupByField}.
-	 *
-	 * @param groupByField must not be {@literal null} or empty.
-	 * @param buckets number of buckets, must be a positive integer.
-	 * @return
-	 * @since 1.10
-	 */
-	public static BucketAutoOperation bucketAuto(String groupByField, int buckets) {
-		return new BucketAutoOperation(field(groupByField), buckets);
-	}
-
-	/**
-	 * Creates a new {@link BucketAutoOperation} given {@link AggregationExpression group-by expression}.
-	 *
-	 * @param groupByExpression must not be {@literal null}.
-	 * @param buckets number of buckets, must be a positive integer.
-	 * @return
-	 * @since 1.10
-	 */
-	public static BucketAutoOperation bucketAuto(AggregationExpression groupByExpression, int buckets) {
-		return new BucketAutoOperation(groupByExpression, buckets);
-	}
-
-	/**
-	 * Creates a new {@link FacetOperation}.
-	 *
-	 * @return
-	 * @since 1.10
-	 */
-	public static FacetOperation facet() {
-		return FacetOperation.EMPTY;
-	}
-
-	/**
-	 * Creates a new {@link FacetOperationBuilder} given {@link Aggregation}.
-	 *
-	 * @param aggregationOperations the sub-pipeline, must not be {@literal null}.
-	 * @return
-	 * @since 1.10
-	 */
-	public static FacetOperationBuilder facet(AggregationOperation... aggregationOperations) {
-		return facet().and(aggregationOperations);
-	}
-
-	/**
-	 * Creates a new {@link LookupOperation}.
-	 *
-	 * @param from must not be {@literal null}.
-	 * @param localField must not be {@literal null}.
-	 * @param foreignField must not be {@literal null}.
-	 * @param as must not be {@literal null}.
-	 * @return never {@literal null}.
-	 * @since 1.9
-	 */
-	public static LookupOperation lookup(String from, String localField, String foreignField, String as) {
-		return lookup(field(from), field(localField), field(foreignField), field(as));
-	}
-
-	/**
-	 * Creates a new {@link LookupOperation} for the given {@link Fields}.
-	 *
-	 * @param from must not be {@literal null}.
-	 * @param localField must not be {@literal null}.
-	 * @param foreignField must not be {@literal null}.
-	 * @param as must not be {@literal null}.
-	 * @return never {@literal null}.
-	 * @since 1.9
-	 */
-	public static LookupOperation lookup(Field from, Field localField, Field foreignField, Field as) {
-		return new LookupOperation(from, localField, foreignField, as);
-	}
-
-	/**
-	 * Creates a new {@link CountOperationBuilder}.
-	 *
-	 * @return never {@literal null}.
-	 * @since 1.10
-	 */
-	public static CountOperationBuilder count() {
-		return new CountOperationBuilder();
-	}
-
-	/**
-	 * Creates a new {@link Fields} instance for the given field names.
-	 *
-	 * @param fields must not be {@literal null}.
-	 * @return
-	 * @see Fields#fields(String...)
-	 */
-	public static Fields fields(String... fields) {
-		return Fields.fields(fields);
-	}
-
-	/**
-	 * Creates a new {@link Fields} instance from the given field name and target reference.
-	 *
-	 * @param name must not be {@literal null} or empty.
-	 * @param target must not be {@literal null} or empty.
-	 * @return
-	 */
-	public static Fields bind(String name, String target) {
-		return Fields.from(field(name, target));
-	}
-
-	/**
-	 * Creates a new {@link GeoNearOperation} instance from the given {@link NearQuery} and the{@code distanceField}. The
-	 * {@code distanceField} defines output field that contains the calculated distance.
-	 *
-	 * @param query must not be {@literal null}.
-	 * @param distanceField must not be {@literal null} or empty.
-	 * @return
-	 * @since 1.7
-	 */
-	public static GeoNearOperation geoNear(NearQuery query, String distanceField) {
-		return new GeoNearOperation(query, distanceField);
-	}
-
-	/**
-	 * Returns a new {@link AggregationOptions.Builder}.
-	 *
-	 * @return
-	 * @since 1.6
-	 */
-	public static AggregationOptions.Builder newAggregationOptions() {
-		return new AggregationOptions.Builder();
-	}
-
-	/**
-	 * Converts this {@link Aggregation} specification to a {@link DBObject}.
-	 *
-	 * @param inputCollectionName the name of the input collection
-	 * @return the {@code DBObject} representing this aggregation
-	 */
-	public DBObject toDbObject(String inputCollectionName, AggregationOperationContext rootContext) {
-
-		List<DBObject> operationDocuments = AggregationOperationRenderer.toDBObject(operations, rootContext);
-
-		DBObject command = new BasicDBObject("aggregate", inputCollectionName);
-		command.put("pipeline", operationDocuments);
-
-		command = options.applyAndReturnPotentiallyChangedCommand(command);
-
-		return command;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return SerializationUtils.serializeToJsonSafely(toDbObject("__collection__", DEFAULT_CONTEXT));
-	}
-
-	/**
-	 * Describes the system variables available in MongoDB aggregation framework pipeline expressions.
-	 *
-	 * @author Thomas Darimont
-	 * @see http://docs.mongodb.org/manual/reference/aggregation-variables
-	 */
-	enum SystemVariable {
-
-		ROOT, CURRENT;
-
-		private static final String PREFIX = "$$";
-
-		/**
-		 * Return {@literal true} if the given {@code fieldRef} denotes a well-known system variable, {@literal false}
-		 * otherwise.
-		 *
-		 * @param fieldRef may be {@literal null}.
-		 * @return
-		 */
-		public static boolean isReferingToSystemVariable(String fieldRef) {
-
-			if (fieldRef == null || !fieldRef.startsWith(PREFIX) || fieldRef.length() <= 2) {
-				return false;
-			}
-
-			int indexOfFirstDot = fieldRef.indexOf('.');
-			String candidate = fieldRef.substring(2, indexOfFirstDot == -1 ? fieldRef.length() : indexOfFirstDot);
-
-			for (SystemVariable value : values()) {
-				if (value.name().equals(candidate)) {
-					return true;
-				}
-			}
-
-			return false;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Enum#toString()
-		 */
-		@Override
-		public String toString() {
-			return PREFIX.concat(name());
-		}
-	}
-}

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

@@ -1,38 +0,0 @@
-/*
- * Copyright 2015-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.aggregation;
-
-import com.mongodb.DBObject;
-
-/**
- * An {@link AggregationExpression} can be used with field expressions in aggregation pipeline stages like
- * {@code project} and {@code group}.
- *
- * @author Thomas Darimont
- * @author Oliver Gierke
- * @author Christoph Strobl
- */
-public interface AggregationExpression {
-
-	/**
-	 * Turns the {@link AggregationExpression} into a {@link DBObject} within the given
-	 * {@link AggregationOperationContext}.
-	 *
-	 * @param context
-	 * @return
-	 */
-	DBObject toDbObject(AggregationOperationContext context);
-}

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

@@ -1,82 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.aggregation;
-
-import org.springframework.data.mongodb.core.aggregation.AggregationExpressionTransformer.AggregationExpressionTransformationContext;
-import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
-import org.springframework.data.mongodb.core.spel.ExpressionNode;
-import org.springframework.data.mongodb.core.spel.ExpressionTransformationContextSupport;
-import org.springframework.data.mongodb.core.spel.ExpressionTransformer;
-import org.springframework.util.Assert;
-
-import com.mongodb.DBObject;
-
-/**
- * Interface to type an {@link ExpressionTransformer} to the contained
- * {@link AggregationExpressionTransformationContext}.
- * 
- * @author Oliver Gierke
- */
-interface AggregationExpressionTransformer extends
-		ExpressionTransformer<AggregationExpressionTransformationContext<ExpressionNode>> {
-
-	/**
-	 * A special {@link ExpressionTransformationContextSupport} to be aware of the {@link AggregationOperationContext}.
-	 * 
-	 * @author Oliver Gierke
-	 * @author Thomas Darimont
-	 */
-	public static class AggregationExpressionTransformationContext<T extends ExpressionNode> extends
-			ExpressionTransformationContextSupport<T> {
-
-		private final AggregationOperationContext aggregationContext;
-
-		/**
-		 * Creates an {@link AggregationExpressionTransformationContext}.
-		 * 
-		 * @param currentNode must not be {@literal null}.
-		 * @param parentNode
-		 * @param previousOperationObject
-		 * @param aggregationContext must not be {@literal null}.
-		 */
-		public AggregationExpressionTransformationContext(T currentNode, ExpressionNode parentNode,
-				DBObject previousOperationObject, AggregationOperationContext context) {
-
-			super(currentNode, parentNode, previousOperationObject);
-
-			Assert.notNull(context, "AggregationOperationContext must not be null!");
-			this.aggregationContext = context;
-		}
-
-		/**
-		 * Returns the underlying {@link AggregationOperationContext}.
-		 * 
-		 * @return
-		 */
-		public AggregationOperationContext getAggregationContext() {
-			return aggregationContext;
-		}
-
-		/**
-		 * Returns the {@link FieldReference} for the current {@link ExpressionNode}.
-		 * 
-		 * @return
-		 */
-		public FieldReference getFieldReference() {
-			return aggregationContext.getReference(getCurrentNode().getName());
-		}
-	}
-}

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

@@ -1,109 +0,0 @@
-/*
- * Copyright 2015-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.aggregation;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.springframework.util.Assert;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-
-/**
- * An enum of supported {@link AggregationExpression}s in aggregation pipeline stages.
- * 
- * @author Thomas Darimont
- * @author Oliver Gierke
- * @author Christoph Strobl
- * @since 1.7
- * @deprecated since 1.10. Please use {@link ArithmeticOperators} and {@link ComparisonOperators} instead.
- */
-@Deprecated
-public enum AggregationFunctionExpressions {
-
-	SIZE, CMP, EQ, GT, GTE, LT, LTE, NE, SUBTRACT, ADD, MULTIPLY;
-
-	/**
-	 * Returns an {@link AggregationExpression} build from the current {@link Enum} name and the given parameters.
-	 * 
-	 * @param parameters must not be {@literal null}
-	 * @return
-	 */
-	public AggregationExpression of(Object... parameters) {
-
-		Assert.notNull(parameters, "Parameters must not be null!");
-		return new FunctionExpression(name().toLowerCase(), parameters);
-	}
-
-	/**
-	 * An {@link AggregationExpression} representing a function call.
-	 * 
-	 * @author Thomas Darimont
-	 * @author Oliver Gierke
-	 * @since 1.7
-	 */
-	static class FunctionExpression implements AggregationExpression {
-
-		private final String name;
-		private final List<Object> values;
-
-		/**
-		 * Creates a new {@link FunctionExpression} for the given name and values.
-		 * 
-		 * @param name must not be {@literal null} or empty.
-		 * @param values must not be {@literal null}.
-		 */
-		public FunctionExpression(String name, Object[] values) {
-
-			Assert.hasText(name, "Name must not be null!");
-			Assert.notNull(values, "Values must not be null!");
-
-			this.name = name;
-			this.values = Arrays.asList(values);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.Expression#toDbObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
-		@Override
-		public DBObject toDbObject(AggregationOperationContext context) {
-
-			List<Object> args = new ArrayList<Object>(values.size());
-
-			for (Object value : values) {
-				args.add(unpack(value, context));
-			}
-
-			return new BasicDBObject("$" + name, args);
-		}
-
-		private static Object unpack(Object value, AggregationOperationContext context) {
-
-			if (value instanceof AggregationExpression) {
-				return ((AggregationExpression) value).toDbObject(context);
-			}
-
-			if (value instanceof Field) {
-				return context.getReference((Field) value).toString();
-			}
-
-			return value;
-		}
-	}
-}

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

@@ -1,37 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.aggregation;
-
-import com.mongodb.DBObject;
-
-/**
- * Represents one single operation in an aggregation pipeline.
- * 
- * @author Sebastian Herold
- * @author Thomas Darimont
- * @author Oliver Gierke
- * @since 1.3
- */
-public interface AggregationOperation {
-
-	/**
-	 * Turns the {@link AggregationOperation} into a {@link DBObject} by using the given
-	 * {@link AggregationOperationContext}.
-	 * 
-	 * @return the DBObject
-	 */
-	DBObject toDBObject(AggregationOperationContext context);
-}

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

@@ -1,55 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.aggregation;
-
-import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
-
-import com.mongodb.DBObject;
-
-/**
- * The context for an {@link AggregationOperation}.
- * 
- * @author Oliver Gierke
- * @since 1.3
- */
-public interface AggregationOperationContext {
-
-	/**
-	 * Returns the mapped {@link DBObject}, potentially converting the source considering mapping metadata etc.
-	 * 
-	 * @param dbObject will never be {@literal null}.
-	 * @return must not be {@literal null}.
-	 */
-	DBObject getMappedObject(DBObject dbObject);
-
-	/**
-	 * Returns a {@link FieldReference} for the given field or {@literal null} if the context does not expose the given
-	 * field.
-	 * 
-	 * @param field must not be {@literal null}.
-	 * @return
-	 */
-	FieldReference getReference(Field field);
-
-	/**
-	 * Returns the {@link FieldReference} for the field with the given name or {@literal null} if the context does not
-	 * expose a field with the given name.
-	 * 
-	 * @param name must not be {@literal null} or empty.
-	 * @return
-	 */
-	FieldReference getReference(String name);
-}

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

@@ -1,109 +0,0 @@
-/*
- * Copyright 2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.aggregation;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.data.mongodb.core.aggregation.ExposedFields.DirectFieldReference;
-import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
-import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
-import org.springframework.data.mongodb.core.aggregation.Fields.AggregationField;
-import org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation.InheritsFieldsAggregationOperation;
-
-import com.mongodb.DBObject;
-
-/**
- * Rendering support for {@link AggregationOperation} into a {@link List} of {@link com.mongodb.DBObject}.
- *
- * @author Mark Paluch
- * @author Christoph Strobl
- * @since 1.10
- */
-class AggregationOperationRenderer {
-
-	static final AggregationOperationContext DEFAULT_CONTEXT = new NoOpAggregationOperationContext();
-
-	/**
-	 * Render a {@link List} of {@link AggregationOperation} given {@link AggregationOperationContext} into their
-	 * {@link DBObject} representation.
-	 *
-	 * @param operations must not be {@literal null}.
-	 * @param context must not be {@literal null}.
-	 * @return the {@link List} of {@link DBObject}.
-	 */
-	static List<DBObject> toDBObject(List<AggregationOperation> operations, AggregationOperationContext rootContext) {
-
-		List<DBObject> operationDocuments = new ArrayList<DBObject>(operations.size());
-
-		AggregationOperationContext contextToUse = rootContext;
-
-		for (AggregationOperation operation : operations) {
-
-			operationDocuments.add(operation.toDBObject(contextToUse));
-
-			if (operation instanceof FieldsExposingAggregationOperation) {
-
-				FieldsExposingAggregationOperation exposedFieldsOperation = (FieldsExposingAggregationOperation) operation;
-				ExposedFields fields = exposedFieldsOperation.getFields();
-
-				if (operation instanceof InheritsFieldsAggregationOperation) {
-					contextToUse = new InheritingExposedFieldsAggregationOperationContext(fields, contextToUse);
-				} else {
-					contextToUse = fields.exposesNoFields() ? DEFAULT_CONTEXT
-							: new ExposedFieldsAggregationOperationContext(exposedFieldsOperation.getFields(), contextToUse);
-				}
-			}
-		}
-
-		return operationDocuments;
-	}
-
-	/**
-	 * Simple {@link AggregationOperationContext} that just returns {@link FieldReference}s as is.
-	 *
-	 * @author Oliver Gierke
-	 */
-	private static class NoOpAggregationOperationContext implements AggregationOperationContext {
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(com.mongodb.DBObject)
-		 */
-		@Override
-		public DBObject getMappedObject(DBObject dbObject) {
-			return dbObject;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(org.springframework.data.mongodb.core.aggregation.ExposedFields.AvailableField)
-		 */
-		@Override
-		public FieldReference getReference(Field field) {
-			return new DirectFieldReference(new ExposedField(field, true));
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(java.lang.String)
-		 */
-		@Override
-		public FieldReference getReference(String name) {
-			return new DirectFieldReference(new ExposedField(new AggregationField(name), true));
-		}
-	}
-}

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

@@ -1,189 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.aggregation;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-
-/**
- * Holds a set of configurable aggregation options that can be used within an aggregation pipeline. A list of support
- * aggregation options can be found in the MongoDB reference documentation
- * http://docs.mongodb.org/manual/reference/command/aggregate/#aggregate
- * 
- * @author Thomas Darimont
- * @author Oliver Gierke
- * @see Aggregation#withOptions(AggregationOptions)
- * @see TypedAggregation#withOptions(AggregationOptions)
- * @since 1.6
- */
-public class AggregationOptions {
-
-	private static final String CURSOR = "cursor";
-	private static final String EXPLAIN = "explain";
-	private static final String ALLOW_DISK_USE = "allowDiskUse";
-
-	private final boolean allowDiskUse;
-	private final boolean explain;
-	private final DBObject cursor;
-
-	/**
-	 * Creates a new {@link AggregationOptions}.
-	 * 
-	 * @param allowDiskUse whether to off-load intensive sort-operations to disk.
-	 * @param explain whether to get the execution plan for the aggregation instead of the actual results.
-	 * @param cursor can be {@literal null}, used to pass additional options to the aggregation.
-	 */
-	public AggregationOptions(boolean allowDiskUse, boolean explain, DBObject cursor) {
-
-		this.allowDiskUse = allowDiskUse;
-		this.explain = explain;
-		this.cursor = cursor;
-	}
-
-	/**
-	 * Enables writing to temporary files. When set to true, aggregation stages can write data to the _tmp subdirectory in
-	 * the dbPath directory.
-	 * 
-	 * @return
-	 */
-	public boolean isAllowDiskUse() {
-		return allowDiskUse;
-	}
-
-	/**
-	 * Specifies to return the information on the processing of the pipeline.
-	 * 
-	 * @return
-	 */
-	public boolean isExplain() {
-		return explain;
-	}
-
-	/**
-	 * Specify a document that contains options that control the creation of the cursor object.
-	 * 
-	 * @return
-	 */
-	public DBObject getCursor() {
-		return cursor;
-	}
-
-	/**
-	 * Returns a new potentially adjusted copy for the given {@code aggregationCommandObject} with the configuration
-	 * applied.
-	 * 
-	 * @param command the aggregation command.
-	 * @return
-	 */
-	DBObject applyAndReturnPotentiallyChangedCommand(DBObject command) {
-
-		DBObject result = new BasicDBObject(command.toMap());
-
-		if (allowDiskUse && !result.containsField(ALLOW_DISK_USE)) {
-			result.put(ALLOW_DISK_USE, allowDiskUse);
-		}
-
-		if (explain && !result.containsField(EXPLAIN)) {
-			result.put(EXPLAIN, explain);
-		}
-
-		if (cursor != null && !result.containsField(CURSOR)) {
-			result.put("cursor", cursor);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Returns a {@link DBObject} representation of this {@link AggregationOptions}.
-	 * 
-	 * @return
-	 */
-	public DBObject toDbObject() {
-
-		DBObject dbo = new BasicDBObject();
-		dbo.put(ALLOW_DISK_USE, allowDiskUse);
-		dbo.put(EXPLAIN, explain);
-		dbo.put(CURSOR, cursor);
-
-		return dbo;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return toDbObject().toString();
-	}
-
-	/**
-	 * A Builder for {@link AggregationOptions}.
-	 * 
-	 * @author Thomas Darimont
-	 */
-	public static class Builder {
-
-		private boolean allowDiskUse;
-		private boolean explain;
-		private DBObject cursor;
-
-		/**
-		 * Defines whether to off-load intensive sort-operations to disk.
-		 * 
-		 * @param allowDiskUse
-		 * @return
-		 */
-		public Builder allowDiskUse(boolean allowDiskUse) {
-
-			this.allowDiskUse = allowDiskUse;
-			return this;
-		}
-
-		/**
-		 * Defines whether to get the execution plan for the aggregation instead of the actual results.
-		 * 
-		 * @param explain
-		 * @return
-		 */
-		public Builder explain(boolean explain) {
-
-			this.explain = explain;
-			return this;
-		}
-
-		/**
-		 * Additional options to the aggregation.
-		 * 
-		 * @param cursor
-		 * @return
-		 */
-		public Builder cursor(DBObject cursor) {
-
-			this.cursor = cursor;
-			return this;
-		}
-
-		/**
-		 * Returns a new {@link AggregationOptions} instance with the given configuration.
-		 * 
-		 * @return
-		 */
-		public AggregationOptions build() {
-			return new AggregationOptions(allowDiskUse, explain, cursor);
-		}
-	}
-}

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

@@ -1,109 +0,0 @@
-/*
- * Copyright 2013-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.aggregation;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.springframework.util.Assert;
-
-import com.mongodb.DBObject;
-
-/**
- * Collects the results of executing an aggregation operation.
- * 
- * @author Tobias Trelle
- * @author Oliver Gierke
- * @author Thomas Darimont
- * @param <T> The class in which the results are mapped onto.
- * @since 1.3
- */
-public class AggregationResults<T> implements Iterable<T> {
-
-	private final List<T> mappedResults;
-	private final DBObject rawResults;
-	private final String serverUsed;
-
-	/**
-	 * Creates a new {@link AggregationResults} instance from the given mapped and raw results.
-	 * 
-	 * @param mappedResults must not be {@literal null}.
-	 * @param rawResults must not be {@literal null}.
-	 */
-	public AggregationResults(List<T> mappedResults, DBObject rawResults) {
-
-		Assert.notNull(mappedResults);
-		Assert.notNull(rawResults);
-
-		this.mappedResults = Collections.unmodifiableList(mappedResults);
-		this.rawResults = rawResults;
-		this.serverUsed = parseServerUsed();
-	}
-
-	/**
-	 * Returns the aggregation results.
-	 * 
-	 * @return
-	 */
-	public List<T> getMappedResults() {
-		return mappedResults;
-	}
-
-	/**
-	 * Returns the unique mapped result. Assumes no result or exactly one.
-	 * 
-	 * @return
-	 * @throws IllegalArgumentException in case more than one result is available.
-	 */
-	public T getUniqueMappedResult() {
-		Assert.isTrue(mappedResults.size() < 2, "Expected unique result or null, but got more than one!");
-		return mappedResults.size() == 1 ? mappedResults.get(0) : null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Iterable#iterator()
-	 */
-	public Iterator<T> iterator() {
-		return mappedResults.iterator();
-	}
-
-	/**
-	 * Returns the server that has been used to perform the aggregation.
-	 * 
-	 * @return
-	 */
-	public String getServerUsed() {
-		return serverUsed;
-	}
-
-	/**
-	 * Returns the raw result that was returned by the server.
-	 * 
-	 * @return
-	 * @since 1.6
-	 */
-	public DBObject getRawResults() {
-		return rawResults;
-	}
-
-	private String parseServerUsed() {
-
-		Object object = rawResults.get("serverUsed");
-		return object instanceof String ? (String) object : null;
-	}
-}