DATAMONGO-799 - Release version 1.4.0.M1.

Updated project metadata and bumped versions.

README.md

@@ -1,101 +1,100 @@
-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/).
 
-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
 
-The [User Guide](http://static.springsource.org/spring-data/data-document/docs/1.0.0.BUILD-SNAPSHOT/reference/html/) (A work in progress). 
+For a comprehensive treatment of all the Spring Data MongoDB features, please refer to:
+
+* the [User Guide](http://static.springsource.org/spring-data/data-mongodb/docs/current/reference/html/) 
+* the [JavaDocs](http://static.springsource.org/spring-data/data-mongodb/docs/current/api/) have extensive comments in them as well.
+* the home page of [Spring Data MongoDB](http://www.springsource.org/spring-data/mongodb) contains links to articles and other resources.
+* for more detailed questions, use the [forum](http://forum.springsource.org/forumdisplay.php?f=80). 
+
+If you are new to Spring as well as to Spring Data, look for information about [Spring projects](http://www.springsource.org/projects). 
 
 
+## Quick Start
 
-Quick Start
+### Maven configuration
------------
 
-## MongoDB
+Add the Maven dependency:
 
-For those in a hurry:
+```xml
-
+<dependency>
-
-* Download the jar through Maven:
-
-      <dependency>
   <groupId>org.springframework.data</groupId>
   <artifactId>spring-data-mongodb</artifactId>
-        <version>1.0.0.BUILD-SNAPSHOT</version>
+  <version>1.3.2.RELEASE</version>
-      </dependency> 
+</dependency>
+```
 
+If you'd rather like the latest snapshots of the upcoming major version, use our Maven snapshot repository and declare the appropriate dependency version.
 
-      <repository>
+```xml
-        <id>spring-maven-snapshot</id>
+<dependency>
-        <snapshots><enabled>true</enabled></snapshots>
+  <groupId>org.springframework.data</groupId>
-        <name>Springframework Maven SNAPSHOT Repository</name>
+  <artifactId>spring-data-mongodb</artifactId>
-        <url>http://maven.springframework.org/snapshot</url>
+  <version>1.4.0.BUILD-SNAPSHOT</version>
-      </repository> 
+</dependency>
+
+<repository>
+  <id>spring-libs-snapshot</id>
+  <name>Spring Snapshot Repository</name>
+  <url>http://repo.springsource.org/libs-snapshot</url>
+</repository>
+```
 
 ### MongoTemplate
-MongoTemplate is the central support class for Mongo database operations.  It provides
+
+MongoTemplate is the central support class for Mongo database operations. It provides:
 
 * Basic POJO mapping support to and from BSON
-* Connection Affinity callback
+* 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://static.springsource.org/spring/docs/3.0.x/spring-framework-reference/html/dao.html#dao-exceptions).
 
-Future plans are to support optional logging and/or exception throwing based on WriteResult return value, common map-reduce operations, GridFS operations.  A simple API for partial document updates is also planned.
+### Spring Data repositories
 
-### Easy Data Repository generation
+To simplify the creation of data repositories Spring Data MongoDB provides a generic repository programming model. It will automatically create a repository proxy for you that adds implementations of finder methods you specify on an interface.  
 
-To simplify the creation of Data Repositories a generic Repository interface and default implementation is provided.  Furthermore, Spring will automatically create a Repository implementation for you that adds implementations of finder methods you specify on an interface.  
+For example, given a `Person` class with first and last name properties, a `PersonRepository` interface that can query for `Person` by last name and when the first name matches a like expression is shown below:
 
-The Repository interface is
+```java
-
+public interface PersonRepository extends CrudRepository<Person, Long> {
-        public interface Repository<T, ID extends Serializable> { 
-
-          T save(T entity);
-
-          List<T> save(Iterable<? extends T> entities);
-
-          T findById(ID id);
-
-          boolean exists(ID id);
-
-          List<T> findAll();
-
-          Long count();
-
-          void delete(T entity);
-
-          void delete(Iterable<? extends T> entities);
-
-          void deleteAll();
-        }
-
-
-The MongoRepository extends Repository and will in future add more Mongo specific methods.
-
-    public interface MongoRepository<T, ID extends Serializable> extends
-        Repository<T, ID> {
-    }
-
-SimpleMongoRepository is the out of the box implementation of the MongoRepository you can use for basid CRUD operations.  
-
-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.  
-
-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
-
-    public interface PersonRepository extends MongoRepository<Person, Long> {
 
   List<Person> findByLastname(String lastname);
 
   List<Person> findByFirstnameLike(String firstname);
+}
+```
+
+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.
+
+You can have Spring automatically create a proxy for the interface by using the following JavaConfig:
+
+```java
+@Configuration
+@EnableMongoRepositories
+class ApplicationConfig extends AbstractMongoConfiguration {
+
+  @Override
+  public Mongo mongo() throws Exception {
+    return new Mongo();
   }
 
-You can have Spring automatically generate the implemention as shown below
+  @Override
+  protected String getDatabaseName() {
+    return "springdata";
+  }
+}
+```
 
-        <bean id="template" class="org.springframework.data.document.mongodb.MongoTemplate">
+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:
+
+```xml
+<bean id="template" class="org.springframework.data.document.mongodb.MongoTemplate">
   <constructor-arg>
     <bean class="com.mongodb.Mongo">
        <constructor-arg value="localhost" />
@@ -103,22 +102,23 @@ You can have Spring automatically generate the implemention as shown below
     </bean>
   </constructor-arg>
   <constructor-arg value="database" />
-                <property name="defaultCollectionName" value="springdata" />
+</bean>
-        </bean>
 
-        <bean class="org.springframework.data.document.mongodb.repository.MongoRepositoryFactoryBean">
+<mongo:repositories base-package="com.acme.repository" />
-                <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
+This will find the repository interface and register a proxy object in the container. You can use it as shown below:
 
-     @Service
+```java
-     public class MyService {
+@Service
+public class MyService {
+
+  private final PersonRepository repository;
 
   @Autowired
-        PersonRepository repository;
+  public MyService(PersonRepository repository) {
-
+    this.repository = repository;
+  }
 
   public void doWork() {
 
@@ -130,20 +130,12 @@ This will register an object in the container named PersonRepository.  You can u
      person = repository.save(person);
 
      List<Person> lastNameResults = repository.findByLastname("Gierke");
-
      List<Person> firstNameResults = repository.findByFirstnameLike("Oli*");
-
-       }
  }
+}
+```
 
-
+## Contributing to Spring Data
-## CouchDB
-
-TBD
-
-
-Contributing to Spring Data
----------------------------
 
 Here are some ways for you to get involved in the community:
 

etc/formatting.xml

@@ -73,7 +73,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.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"/>
@@ -102,7 +102,7 @@
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.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"/>
@@ -124,7 +124,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.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"/>
@@ -135,9 +135,9 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.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"/>
@@ -150,12 +150,12 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_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="false"/>
+<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"/>
@@ -182,11 +182,11 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.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="do not 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"/>
@@ -237,7 +237,7 @@
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_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"/>
@@ -251,12 +251,12 @@
 <setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.7"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
 <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.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="insert"/>
+<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"/>

pom.xml

@@ -1,27 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
 	<modelVersion>4.0.0</modelVersion>
+	
 	<groupId>org.springframework.data</groupId>
-  <artifactId>spring-data-mongodb-dist</artifactId>
+	<artifactId>spring-data-mongodb-parent</artifactId>
-  <name>Spring Data MongoDB Distribution</name>
+	<version>1.4.0.M1</version>
-  <version>1.1.0.M2</version>
 	<packaging>pom</packaging>
+
+	<name>Spring Data MongoDB</name>
+	<description>MongoDB support for Spring Data</description>
+	<url>http://www.springsource.org/spring-data/mongodb</url>
+
+	<parent>
+		<groupId>org.springframework.data.build</groupId>
+		<artifactId>spring-data-parent</artifactId>
+		<version>1.3.0.M1</version>
+		<relativePath>../spring-data-build/parent/pom.xml</relativePath>
+	</parent>
+	
 	<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>
+		<module>spring-data-mongodb-distribution</module>
 	</modules>
 
+	<properties>
+		<project.type>multi</project.type>
+		<dist.id>spring-data-mongodb</dist.id>
+		<springdata.commons>1.7.0.M1</springdata.commons>
+		<mongo>2.11.3</mongo>
+	</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>SpringSource</organization>
+			<organization>Pivotal</organization>
-      <organizationUrl>http://www.SpringSource.com</organizationUrl>
+			<organizationUrl>http://www.gopivotal.com</organizationUrl>
 			<roles>
-        <role>Project Admin</role>
 				<role>Developer</role>
 			</roles>
 			<timezone>-5</timezone>
@@ -29,263 +59,52 @@
 		<developer>
 			<id>mpollack</id>
 			<name>Mark Pollack</name>
-      <email>mpollack at vmware.com</email>
+			<email>mpollack at gopivotal.com</email>
-      <organization>SpringSource</organization>
+			<organization>Pivotal</organization>
-      <organizationUrl>http://www.SpringSource.com</organizationUrl>
+			<organizationUrl>http://www.gopivotal.com</organizationUrl>
 			<roles>
-        <role>Project Admin</role>
 				<role>Developer</role>
 			</roles>
 			<timezone>-5</timezone>
 		</developer>
-    <developer>
-      <id>ogierke</id>
-      <name>Oliver Gierke</name>
-      <email>ogierke at vmware.com</email>
-      <organization>SpringSource</organization>
-      <organizationUrl>http://www.springsource.com</organizationUrl>
-      <roles>
-        <role>Developer</role>
-      </roles>
-      <timezone>+1</timezone>
-    </developer>
 		<developer>
 			<id>jbrisbin</id>
 			<name>Jon Brisbin</name>
-      <email>jbrisbin at vmware.com</email>
+			<email>jbrisbin at gopivotal.com</email>
-      <organization>SpringSource</organization>
+			<organization>Pivotal</organization>
-      <organizationUrl>http://www.springsource.com</organizationUrl>
+			<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>
 	</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>
-
-  <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>
-
-  <build>
-    <extensions>
-      <extension>
-        <groupId>org.springframework.build.aws</groupId>
-        <artifactId>org.springframework.build.aws.maven</artifactId>
-        <version>3.1.0.RELEASE</version>
-      </extension>
-    </extensions>
-
-    <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>
+		<!-- MongoDB -->
 		<dependency>
-            <groupId>org.docbook</groupId>
+			<groupId>org.mongodb</groupId>
-            <artifactId>docbook-xml</artifactId>
+			<artifactId>mongo-java-driver</artifactId>
-            <version>4.4</version>
+			<version>${mongo}</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>
 	
-      <plugin>
+	<repositories>
-        <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>
-
-  <pluginRepositories>
-    <!-- Necessary for the build extension -->
-    <pluginRepository>
-      <id>spring-plugins-release</id>
-      <url>http://repo.springsource.org/plugins-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-milestone</id>
+			<id>spring-libs-milestone</id>
-      <name>Spring Milestone Repository</name>
+			<url>http://repo.springsource.org/libs-milestone-local</url>
-      <url>s3://maven.springframework.org/milestone</url>
 		</repository>
-    <snapshotRepository>
+	</repositories>
-      <id>spring-snapshot</id>
-      <name>Spring Snapshot Repository</name>
-      <url>s3://maven.springframework.org/snapshot</url>
-    </snapshotRepository>
-  </distributionManagement>
 
 </project>

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

@@ -1,54 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
 	<modelVersion>4.0.0</modelVersion>
+	
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-    <version>1.1.0.M2</version>
+		<version>1.4.0.M1</version>
-    <relativePath>../spring-data-mongodb-parent/pom.xml</relativePath>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
+	
 	<artifactId>spring-data-mongodb-cross-store</artifactId>
-  <name>Spring Data MongoDB Cross-store Persistence Support</name>
+	<name>Spring Data MongoDB - Cross-Store Persistence Support</name>
+	
+	<properties>
+		<jpa>1.0.0.Final</jpa>
+		<hibernate>3.6.10.Final</hibernate>
+	</properties>
+	
 	<dependencies>
 
 		<!-- Spring -->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
-      <version>${org.springframework.version.range}</version>
+			<version>${spring}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-tx</artifactId>
-      <version>${org.springframework.version.range}</version>
+			<version>${spring}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-aspects</artifactId>
-      <version>${org.springframework.version.range}</version>
+			<version>${spring}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-orm</artifactId>
-      <version>${org.springframework.version.range}</version>
+			<version>${spring}</version>
 		</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-mongodb</artifactId>
-      <version>1.1.0.M2</version>
+			<version>1.4.0.M1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjrt</artifactId>
-      <version>${aspectj.version}</version>
+			<version>${aspectj}</version>
 		</dependency>
 		<dependency>
 			<groupId>cglib</groupId>
@@ -60,14 +70,14 @@
 		<dependency>
 			<groupId>org.hibernate.javax.persistence</groupId>
 			<artifactId>hibernate-jpa-2.0-api</artifactId>
-      <version>1.0.0.Final</version>
+			<version>${jpa}</version>
 		</dependency>
 
 		<!-- For Tests -->
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-entitymanager</artifactId>
-        <version>3.5.5-Final</version>
+			<version>${hibernate}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -96,17 +106,17 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>aspectj-maven-plugin</artifactId>
-        <version>1.2</version>
+				<version>1.4</version>
 				<dependencies>
 					<dependency>
 						<groupId>org.aspectj</groupId>
 						<artifactId>aspectjrt</artifactId>
-            <version>${aspectj.version}</version>
+						<version>${aspectj}</version>
 					</dependency>
 					<dependency>
 						<groupId>org.aspectj</groupId>
 						<artifactId>aspectjtools</artifactId>
-            <version>${aspectj.version}</version>
+						<version>${aspectj}</version>
 					</dependency>
 				</dependencies>
 				<executions>
@@ -124,13 +134,9 @@
 							<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>
+					<source>${source.level}</source>
-          <target>1.5</target>
+					<target>${source.level}</target>
 				</configuration>
 			</plugin>
 		</plugins>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-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.
@@ -17,8 +17,8 @@ package org.springframework.data.mongodb.crossstore;
 
 import javax.persistence.EntityManagerFactory;
 
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.dao.DataIntegrityViolationException;
@@ -34,6 +34,10 @@ import com.mongodb.DBCollection;
 import com.mongodb.DBObject;
 import com.mongodb.MongoException;
 
+/**
+ * @author Thomas Risberg
+ * @author Oliver Gierke
+ */
 public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 
 	private static final String ENTITY_CLASS = "_entity_class";
@@ -44,7 +48,7 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 
 	private static final String ENTITY_FIELD_CLASS = "_entity_field_class";
 
-	protected final Log log = LogFactory.getLog(getClass());
+	protected final Logger log = LoggerFactory.getLogger(getClass());
 
 	private MongoTemplate mongoTemplate;
 
@@ -58,6 +62,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 {
 
@@ -100,6 +108,10 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 		});
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.crossstore.ChangeSetPersister#getPersistentId(org.springframework.data.crossstore.ChangeSetBacked, org.springframework.data.crossstore.ChangeSet)
+	 */
 	public Object getPersistentId(ChangeSetBacked entity, ChangeSet cs) throws DataAccessException {
 		log.debug("getPersistentId called on " + entity);
 		if (entityManagerFactory == null) {
@@ -109,6 +121,10 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 		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.");
@@ -169,8 +185,13 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 		return 0L;
 	}
 
+	/**
+	 * Returns the collection the given entity type shall be persisted to.
+	 * 
+	 * @param entityClass must not be {@literal null}.
+	 * @return
+	 */
 	private String getCollectionNameForEntity(Class<? extends ChangeSetBacked> entityClass) {
-		return ClassUtils.getQualifiedName(entityClass);
+		return mongoTemplate.getCollectionName(entityClass);
 	}
-
 }

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

@@ -21,13 +21,12 @@ import javax.persistence.EntityManager;
 import javax.persistence.Transient;
 import javax.persistence.Entity;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.reflect.FieldSignature;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataAccessException;
-
 import org.springframework.data.mongodb.crossstore.RelatedDocument;
 import org.springframework.data.mongodb.crossstore.DocumentBacked;
 import org.springframework.data.crossstore.ChangeSetBackedTransactionSynchronization;
@@ -44,7 +43,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  */
 public aspect MongoDocumentBacking {
 
-	private static final Log LOGGER = LogFactory.getLog(MongoDocumentBacking.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(MongoDocumentBacking.class);
 
 	// Aspect shared config
 	private ChangeSetPersister<Object> changeSetPersister;

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,18 @@
+Bundle-SymbolicName: org.springframework.data.mongodb.crossstore
+Bundle-Name: Spring Data MongoDB Cross Store Support
+Bundle-Vendor: SpringSource
+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="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

@@ -0,0 +1,38 @@
+<?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.4.0.M1</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>
+		</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.AppenderTest",
+      "name" : "org.springframework.data.mongodb.log4j.MongoLog4jAppenderIntegrationTests",
       "level" : "DEBUG",
       "timestamp" : ISODate("2011-03-23T16:53:46.778Z"),
       "properties" : {

spring-data-mongodb-log4j/pom.xml

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 by the original author(s).
+ * 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.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.mongodb.log4j;
 
 import java.net.UnknownHostException;
@@ -21,19 +20,23 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Map;
 
-import com.mongodb.BasicDBList;
-import com.mongodb.BasicDBObject;
-import com.mongodb.DB;
-import com.mongodb.Mongo;
-import com.mongodb.WriteConcern;
 import org.apache.log4j.AppenderSkeleton;
 import org.apache.log4j.Level;
 import org.apache.log4j.MDC;
 import org.apache.log4j.PatternLayout;
 import org.apache.log4j.spi.LoggingEvent;
 
+import com.mongodb.BasicDBList;
+import com.mongodb.BasicDBObject;
+import com.mongodb.DB;
+import com.mongodb.Mongo;
+import com.mongodb.WriteConcern;
+
 /**
- * @author Jon Brisbin <jbrisbin@vmware.com>
+ * Log4j appender writing log entries into a MongoDB instance.
+ * 
+ * @author Jon Brisbin
+ * @author Oliver Gierke
  */
 public class MongoLog4jAppender extends AppenderSkeleton {
 
@@ -129,8 +132,12 @@ public class MongoLog4jAppender extends AppenderSkeleton {
 		this.db = mongo.getDB(database);
 	}
 
-  @SuppressWarnings({"unchecked"})
+	/*
+	 * (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 {
@@ -198,10 +205,21 @@ public class MongoLog4jAppender extends AppenderSkeleton {
 		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;
 	}

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

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

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

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

@@ -0,0 +1,77 @@
+/*
+ * 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.log4j;
+
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+
+import java.util.Calendar;
+
+import org.apache.log4j.Logger;
+import org.apache.log4j.MDC;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.mongodb.DB;
+import com.mongodb.DBCursor;
+import com.mongodb.Mongo;
+
+/**
+ * Integration tests for {@link MongoLog4jAppender}.
+ * 
+ * @author Jon Brisbin
+ * @author Oliver Gierke
+ */
+public class MongoLog4jAppenderIntegrationTests {
+
+	static final String NAME = MongoLog4jAppenderIntegrationTests.class.getName();
+
+	Logger log = Logger.getLogger(NAME);
+	Mongo mongo;
+	DB db;
+	String collection;
+
+	@Before
+	public void setUp() throws Exception {
+
+		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();
+	}
+
+	@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

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.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.properties

@@ -10,11 +10,4 @@ log4j.appender.stdout.collectionPattern = %X{year}%X{month}
 log4j.appender.stdout.applicationId = my.application
 log4j.appender.stdout.warnOrHigherWriteConcern = FSYNC_SAFE
 
-log4j.category.org.apache.activemq=ERROR
+log4j.category.org.springframework.data.mongodb=DEBUG
-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

@@ -5,6 +5,5 @@ Bundle-ManifestVersion: 2
 Import-Package:
  sun.reflect;version="0";resolution:=optional
 Import-Template:
- com.mongodb.*;version="${mongo.version:[=.=,+1.0.0)}",
+ com.mongodb.*;version="${mongo:[=.=,+1.0.0)}",
- org.apache.log4j.*;version="[1.2.15, 2.0.0)",
+ org.apache.log4j.*;version="${log4j:[=.=.=,+1.0.0)}"
- org.apache.log4j.spi.*;version="[1.2.15, 2.0.0)"

spring-data-mongodb-parent/pom.xml

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

spring-data-mongodb/Spring Data MongoDB.sonargraph

@@ -1,146 +1,176 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<context version="7.0.3.1152">
+<context version="7.1.9.205">
-    <scope name="spring-data-mongodb" type="Project">
+    <scope type="Project" name="spring-data-mongodb">
-        <element name="Filter" type="TypeFilterReferenceOverridden">
+        <element type="TypeFilterReferenceOverridden" name="Filter">
-            <element name="org.springframework.data.mongodb.**" type="IncludeTypePattern"/>
+            <element type="IncludeTypePattern" name="org.springframework.data.mongodb.**"/>
         </element>
         <architecture>
-            <element name="Config" type="Layer">
+            <element type="Layer" name="Config">
-                <element name="Assignment" type="TypeFilter">
+                <element type="TypeFilter" name="Assignment">
-                    <element name="**.config.**" type="WeakTypePattern"/>
+                    <element type="WeakTypePattern" name="**.config.**"/>
                 </element>
-                <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core"/>
+                <dependency toName="Project|spring-data-mongodb::Layer|Core" type="AllowedDependency"/>
-                <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Monitoring"/>
+                <dependency toName="Project|spring-data-mongodb::Layer|GridFS" type="AllowedDependency"/>
-                <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Repositories"/>
+                <dependency toName="Project|spring-data-mongodb::Layer|Monitoring" type="AllowedDependency"/>
+                <dependency toName="Project|spring-data-mongodb::Layer|Repositories" type="AllowedDependency"/>
             </element>
-            <element name="Repositories" type="Layer">
+            <element type="Layer" name="Repositories">
-                <element name="Assignment" type="TypeFilter">
+                <element type="TypeFilter" name="Assignment">
-                    <element name="**.repository.**" type="IncludeTypePattern"/>
+                    <element type="IncludeTypePattern" name="**.repository.**"/>
                 </element>
-                <element name="API" type="Subsystem">
+                <element type="Subsystem" name="API">
-                    <element name="Assignment" type="TypeFilter">
+                    <element type="TypeFilter" name="Assignment">
-                        <element name="**.repository.*" type="IncludeTypePattern"/>
+                        <element type="IncludeTypePattern" name="**.repository.*"/>
                     </element>
                 </element>
-                <element name="Query" type="Subsystem">
+                <element type="Subsystem" name="Query">
-                    <element name="Assignment" type="TypeFilter">
+                    <element type="TypeFilter" name="Assignment">
-                        <element name="**.query.**" type="IncludeTypePattern"/>
+                        <element type="IncludeTypePattern" name="**.query.**"/>
                     </element>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Repositories::Subsystem|API"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Repositories::Subsystem|API" type="AllowedDependency"/>
                 </element>
-                <element name="Implementation" type="Subsystem">
+                <element type="Subsystem" name="Implementation">
-                    <element name="Assignment" type="TypeFilter">
+                    <element type="TypeFilter" name="Assignment">
-                        <element name="**.support.**" type="IncludeTypePattern"/>
+                        <element type="IncludeTypePattern" name="**.support.**"/>
                     </element>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Repositories::Subsystem|API"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Repositories::Subsystem|API" type="AllowedDependency"/>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Repositories::Subsystem|Query"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Repositories::Subsystem|Query" type="AllowedDependency"/>
                 </element>
-                <element name="Config" type="Subsystem">
+                <element type="Subsystem" name="Config">
-                    <element name="Assignment" type="TypeFilter">
+                    <element type="TypeFilter" name="Assignment">
-                        <element name="**.config.**" type="IncludeTypePattern"/>
+                        <element type="IncludeTypePattern" name="**.config.**"/>
                     </element>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Repositories::Subsystem|Implementation"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Repositories::Subsystem|Implementation" type="AllowedDependency"/>
                 </element>
-                <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core"/>
+                <dependency toName="Project|spring-data-mongodb::Layer|Core" type="AllowedDependency"/>
             </element>
-            <element name="Monitoring" type="Layer">
+            <element type="Layer" name="Monitoring">
-                <element name="Assignment" type="TypeFilter">
+                <element type="TypeFilter" name="Assignment">
-                    <element name="**.monitor.**" type="IncludeTypePattern"/>
+                    <element type="IncludeTypePattern" name="**.monitor.**"/>
                 </element>
-                <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core"/>
+                <dependency toName="Project|spring-data-mongodb::Layer|Core" type="AllowedDependency"/>
             </element>
-            <element name="GridFS" type="Layer">
+            <element type="Layer" name="GridFS">
-                <element name="Assignment" type="TypeFilter">
+                <element type="TypeFilter" name="Assignment">
-                    <element name="**.gridfs.**" type="IncludeTypePattern"/>
+                    <element type="IncludeTypePattern" name="**.gridfs.**"/>
                 </element>
-                <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core"/>
+                <dependency toName="Project|spring-data-mongodb::Layer|Core" type="AllowedDependency"/>
             </element>
-            <element name="Core" type="Layer">
+            <element type="Layer" name="Core">
-                <element name="Assignment" type="TypeFilter">
+                <element type="TypeFilter" name="Assignment">
-                    <element name="**.core.**" type="IncludeTypePattern"/>
+                    <element type="IncludeTypePattern" name="**.core.**"/>
                 </element>
-                <element name="Mapping" type="Subsystem">
+                <element type="Subsystem" name="Mapping">
-                    <element name="Assignment" type="TypeFilter">
+                    <element type="TypeFilter" name="Assignment">
-                        <element name="**.mapping.**" type="IncludeTypePattern"/>
+                        <element type="IncludeTypePattern" name="**.mapping.**"/>
                     </element>
                 </element>
-                <element name="Geospatial" type="Subsystem">
+                <element type="Subsystem" name="Geospatial">
-                    <element name="Assignment" type="TypeFilter">
+                    <element type="TypeFilter" name="Assignment">
-                        <element name="**.geo.**" type="IncludeTypePattern"/>
+                        <element type="IncludeTypePattern" name="**.geo.**"/>
                     </element>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Mapping"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Mapping" type="AllowedDependency"/>
                 </element>
-                <element name="Query" type="Subsystem">
+                <element type="Subsystem" name="Query">
-                    <element name="Assignment" type="TypeFilter">
+                    <element type="TypeFilter" name="Assignment">
-                        <element name="**.query.**" type="IncludeTypePattern"/>
+                        <element type="IncludeTypePattern" name="**.query.**"/>
                     </element>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Geospatial"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Geospatial" type="AllowedDependency"/>
                 </element>
-                <element name="Index" type="Subsystem">
+                <element type="Subsystem" name="Conversion">
-                    <element name="Assignment" type="TypeFilter">
+                    <element type="TypeFilter" name="Assignment">
-                        <element name="**.index.**" type="IncludeTypePattern"/>
+                        <element type="IncludeTypePattern" name="**.convert.**"/>
                     </element>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Mapping"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Mapping" type="AllowedDependency"/>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Query"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Query" type="AllowedDependency"/>
                 </element>
-                <element name="Core" type="Subsystem">
+                <element type="Subsystem" name="SpEL">
-                    <element name="Assignment" type="TypeFilter">
+                    <element type="TypeFilter" name="Assignment">
-                        <element name="**.core.**" type="WeakTypePattern"/>
+                        <element type="IncludeTypePattern" name="**.spel.**"/>
                     </element>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Geospatial"/>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Index"/>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Mapping"/>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Query"/>
                 </element>
+                <element type="Subsystem" name="Aggregation">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.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="**.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="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|Mapping" type="AllowedDependency"/>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Query" type="AllowedDependency"/>
+                </element>
+            </element>
+            <element type="Subsystem" name="API">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="org.springframework.data.mongodb.*"/>
+                </element>
+                <stereotype name="Public"/>
             </element>
         </architecture>
         <workspace>
-            <element name="src/main/java" type="JavaRootDirectory">
+            <element type="JavaRootDirectory" name="src/main/java">
                 <reference name="Project|spring-data-mongodb::BuildUnit|spring-data-mongodb"/>
             </element>
-            <element name="target/classes" type="JavaRootDirectory">
+            <element type="JavaRootDirectory" name="target/classes">
                 <reference name="Project|spring-data-mongodb::BuildUnit|spring-data-mongodb"/>
             </element>
         </workspace>
         <physical>
-            <element name="spring-data-mongodb" type="BuildUnit"/>
+            <element type="BuildUnit" name="spring-data-mongodb"/>
         </physical>
     </scope>
-    <scope name="External" type="External">
+    <scope type="External" name="External">
-        <element name="Filter" type="TypeFilter">
+        <element type="TypeFilter" name="Filter">
-            <element name="**" type="IncludeTypePattern"/>
+            <element type="IncludeTypePattern" name="**"/>
-            <element name="java.**" type="ExcludeTypePattern"/>
+            <element type="ExcludeTypePattern" name="java.**"/>
-            <element name="javax.**" type="ExcludeTypePattern"/>
+            <element type="ExcludeTypePattern" name="javax.**"/>
         </element>
         <architecture>
-            <element name="Spring" type="Subsystem">
+            <element type="Subsystem" name="Spring">
-                <element name="Assignment" type="TypeFilter">
+                <element type="TypeFilter" name="Assignment">
-                    <element name="org.springframework.**" type="IncludeTypePattern"/>
+                    <element type="IncludeTypePattern" name="org.springframework.**"/>
-                    <element name="org.springframework.data.**" type="ExcludeTypePattern"/>
+                    <element type="ExcludeTypePattern" name="org.springframework.data.**"/>
                 </element>
             </element>
-            <element name="Spring Data Core" type="Subsystem">
+            <element type="Subsystem" name="Spring Data Core">
-                <element name="Assignment" type="TypeFilter">
+                <element type="TypeFilter" name="Assignment">
-                    <element name="org.springframework.data.**" type="IncludeTypePattern"/>
+                    <element type="IncludeTypePattern" name="org.springframework.data.**"/>
                 </element>
             </element>
-            <element name="Mongo Java Driver" type="Subsystem">
+            <element type="Subsystem" name="Mongo Java Driver">
-                <element name="Assignment" type="TypeFilter">
+                <element type="TypeFilter" name="Assignment">
-                    <element name="com.mongodb.**" type="IncludeTypePattern"/>
+                    <element type="IncludeTypePattern" name="com.mongodb.**"/>
-                    <element name="org.bson.**" type="IncludeTypePattern"/>
+                    <element type="IncludeTypePattern" name="org.bson.**"/>
                 </element>
             </element>
-            <element name="Querydsl" type="Subsystem">
+            <element type="Subsystem" name="Querydsl">
-                <element name="Assignment" type="TypeFilter">
+                <element type="TypeFilter" name="Assignment">
-                    <element name="com.mysema.query.**" type="IncludeTypePattern"/>
+                    <element type="IncludeTypePattern" name="com.mysema.query.**"/>
                 </element>
             </element>
         </architecture>
     </scope>
-    <scope name="Global" type="Global">
+    <scope type="Global" name="Global">
-        <element name="Configuration" type="Configuration"/>
+        <element type="Configuration" name="Configuration"/>
-        <element name="Filter" type="TypeFilter">
+        <element type="TypeFilter" name="Filter">
-            <element name="**" type="IncludeTypePattern"/>
+            <element type="IncludeTypePattern" name="**"/>
         </element>
     </scope>
 </context>

spring-data-mongodb/pom.xml

@@ -1,21 +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/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
 	<modelVersion>4.0.0</modelVersion>
+	
+	<artifactId>spring-data-mongodb</artifactId>
+
+	<name>Spring Data MongoDB - Core</name>
+	<description>MongoDB support for Spring Data</description>
+
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.1.0.M2</version>
+		<version>1.4.0.M1</version>
-		<relativePath>../spring-data-mongodb-parent/pom.xml</relativePath>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
-	<artifactId>spring-data-mongodb</artifactId>
-	<name>Spring Data MongoDB</name>
 
 	<properties>
-		<mongo.version>2.7.1</mongo.version>
+		<validation>1.0.0.GA</validation>
-		<querydsl.version>2.6.0</querydsl.version>
+		<objenesis>1.3</objenesis>
-		<cdi.version>1.0</cdi.version>
-		<validation.version>1.0.0.GA</validation.version>
-		<webbeans.version>1.1.3</webbeans.version>
 	</properties>
 
 	<dependencies>
@@ -24,22 +26,22 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-tx</artifactId>
-			<version>${org.springframework.version.range}</version>
+			<version>${spring}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<version>${org.springframework.version.range}</version>
+			<version>${spring}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
-			<version>${org.springframework.version.range}</version>
+			<version>${spring}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
-			<version>${org.springframework.version.range}</version>
+			<version>${spring}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>commons-logging</groupId>
@@ -50,46 +52,27 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-expression</artifactId>
-			<version>${org.springframework.version.range}</version>
+			<version>${spring}</version>
 		</dependency>
 
 		<!--  Spring Data -->
 		<dependency>
-			<groupId>org.springframework.data</groupId>
+			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-data-commons-core</artifactId>
+			<artifactId>spring-data-commons</artifactId>
-			<version>${data.commons.version}</version>
+			<version>${springdata.commons}</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.mysema.querydsl</groupId>
 			<artifactId>querydsl-mongodb</artifactId>
-			<version>${querydsl.version}</version>
+			<version>${querydsl}</version>
 			<optional>true</optional>
-			<exclusions>
-				<exclusion>
-					<groupId>com.google.code.morphia</groupId>
-					<artifactId>morphia</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 
 		<dependency>
 			<groupId>com.mysema.querydsl</groupId>
 			<artifactId>querydsl-apt</artifactId>
-			<version>${querydsl.version}</version>
+			<version>${querydsl}</version>
 			<scope>provided</scope>
 		</dependency>
 
@@ -104,7 +87,7 @@
 		<dependency>
 			<groupId>javax.enterprise</groupId>
 			<artifactId>cdi-api</artifactId>
-			<version>${cdi.version}</version>
+			<version>${cdi}</version>
 			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
@@ -112,14 +95,14 @@
 		<dependency>
 			<groupId>javax.el</groupId>
 			<artifactId>el-api</artifactId>
-			<version>${cdi.version}</version>
+			<version>${cdi}</version>
 			<scope>test</scope>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.apache.openwebbeans.test</groupId>
 			<artifactId>cditest-owb</artifactId>
-			<version>${webbeans.version}</version>
+			<version>${webbeans}</version>
 			<scope>test</scope>
 		</dependency>
 		
@@ -134,7 +117,14 @@
 		<dependency>
 			<groupId>javax.validation</groupId>
 			<artifactId>validation-api</artifactId>
-			<version>${validation.version}</version>
+			<version>${validation}</version>
+			<optional>true</optional>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.objenesis</groupId>
+			<artifactId>objenesis</artifactId>
+			<version>${objenesis}</version>
 			<optional>true</optional>
 		</dependency>
 
@@ -145,43 +135,29 @@
 			<scope>test</scope>
 		</dependency>
 		
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+			<version>${jodatime}</version>
+			<scope>test</scope>
+		</dependency>
+		
 	</dependencies>
 	
-	<profiles>
-		<profile>
-			<id>performance-tests</id>
 	<build>
 		<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<version>2.8</version>
-						<configuration>
-							<includes>
-								<include>**/PerformanceTests.java</include>
-							</includes>
-							<excludes>
-								<exclude>none</exclude>
-							</excludes>
-							<junitArtifactName>junit:junit-dep</junitArtifactName>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-	
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>com.springsource.bundlor</groupId>
-				<artifactId>com.springsource.bundlor.maven</artifactId>
-			</plugin>
 
 			<plugin>
 				<groupId>com.mysema.maven</groupId>
-				<artifactId>maven-apt-plugin</artifactId>
+				<artifactId>apt-maven-plugin</artifactId>
-				<version>1.0.2</version>
+				<version>1.0.8</version>
+				<dependencies>
+					<dependency>
+						<groupId>com.mysema.querydsl</groupId>
+						<artifactId>querydsl-apt</artifactId>
+						<version>${querydsl}</version>
+					</dependency>
+				</dependencies>
 				<executions>
 					<execution>
 						<phase>generate-test-sources</phase>
@@ -195,6 +171,24 @@
 					</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>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 

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

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

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

@@ -1,6 +1,23 @@
+/*
+ * 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;
 
@@ -8,6 +25,7 @@ import com.mongodb.DB;
  * Interface for factories creating {@link DB} instances.
  * 
  * @author Mark Pollack
+ * @author Thomas Darimont
  */
 public interface MongoDbFactory {
 
@@ -27,4 +45,11 @@ 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-2012 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,22 +27,29 @@ import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.data.annotation.Persistent;
 import org.springframework.data.authentication.UserCredentials;
+import org.springframework.data.mapping.context.MappingContextIsNewStrategyFactory;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
 import org.springframework.data.mongodb.core.convert.CustomConversions;
+import org.springframework.data.mongodb.core.convert.DbRefResolver;
+import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.mapping.CamelCaseAbbreviatingFieldNamingStrategy;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.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;
 
 /**
- * Base class for Spring Data Mongo configuration using JavaConfig.
+ * Base class for Spring Data MongoDB configuration using JavaConfig.
  * 
  * @author Mark Pollack
  * @author Oliver Gierke
+ * @author Thomas Darimont
  */
 @Configuration
 public abstract class AbstractMongoConfiguration {
@@ -55,12 +62,22 @@ public abstract class AbstractMongoConfiguration {
 	protected abstract String getDatabaseName();
 
 	/**
-	 * Return the {@link Mongo} instance to connect to.
+	 * 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
+	 */
+	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;
 
 	/**
@@ -85,23 +102,20 @@ public abstract class AbstractMongoConfiguration {
 	 */
 	@Bean
 	public SimpleMongoDbFactory 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.
+	 * Return the base package to scan for mapped {@link Document}s. Will return the package name of the configuration
+	 * class' (the concrete class, not this one here) by default. So if you have a {@code com.acme.AppConfig} extending
+	 * {@link AbstractMongoConfiguration} the base package will be considered {@code com.acme} unless the method is
+	 * overriden to implement alternate behaviour.
 	 * 
-	 * @return
+	 * @return the base package to scan for mapped {@link Document} classes or {@literal null} to not enable scanning for
+	 *         entities.
 	 */
 	protected String getMappingBasePackage() {
-		return null;
+		return getClass().getPackage().getName();
 	}
 
 	/**
@@ -127,11 +141,25 @@ public abstract class AbstractMongoConfiguration {
 		MongoMappingContext mappingContext = new MongoMappingContext();
 		mappingContext.setInitialEntitySet(getInitialEntitySet());
 		mappingContext.setSimpleTypeHolder(customConversions().getSimpleTypeHolder());
-		mappingContext.initialize();
+
+		if (abbreviateFieldNames()) {
+			mappingContext.setFieldNamingStrategy(new CamelCaseAbbreviatingFieldNamingStrategy());
+		}
 
 		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
@@ -156,8 +184,11 @@ public abstract class AbstractMongoConfiguration {
 	 */
 	@Bean
 	public MappingMongoConverter mappingMongoConverter() throws Exception {
-		MappingMongoConverter converter = new MappingMongoConverter(mongoDbFactory(), mongoMappingContext());
+
+		DbRefResolver dbRefResolver = new DefaultDbRefResolver(mongoDbFactory());
+		MappingMongoConverter converter = new MappingMongoConverter(dbRefResolver, mongoMappingContext());
 		converter.setCustomConversions(customConversions());
+
 		return converter;
 	}
 
@@ -187,4 +218,15 @@ public abstract class AbstractMongoConfiguration {
 
 		return initialEntitySet;
 	}
+
+	/**
+	 * Configures whether to abbreviate field names for domain objects by configuring a
+	 * {@link CamelCaseAbbreviatingFieldNamingStrategy} on the {@link MongoMappingContext} instance created. For advanced
+	 * customization needs, consider overriding {@link #mappingMongoConverter()}.
+	 * 
+	 * @return
+	 */
+	protected boolean abbreviateFieldNames() {
+		return false;
+	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 by the original author(s).
+ * 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.
@@ -13,11 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.mongodb.config;
 
 /**
- * @author Jon Brisbin <jbrisbin@vmware.com>
+ * Constants to declare bean names used by the namespace configuration.
+ * 
+ * @author Jon Brisbin
+ * @author Oliver Gierke
+ * @author Martin Baumgartner
  */
 public abstract class BeanNames {
 
@@ -26,4 +29,8 @@ public abstract class BeanNames {
 	static final String MONGO = "mongo";
 	static final String DB_FACTORY = "mongoDbFactory";
 	static final String VALIDATING_EVENT_LISTENER = "validatingMongoEventListener";
+	static final String IS_NEW_STRATEGY_FACTORY = "isNewStrategyFactory";
+	static final String DEFAULT_CONVERTER_BEAN_NAME = "mappingConverter";
+	static final String MONGO_TEMPLATE = "mongoTemplate";
+	static final String GRID_FS_TEMPLATE = "gridFsTemplate";
 }

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

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

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

@@ -0,0 +1,78 @@
+/*
+ * 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 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;
+	}
+
+	/*
+	 * (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 gridFsTemplateBuilder = BeanDefinitionBuilder.genericBeanDefinition(GridFsTemplate.class);
+
+		if (StringUtils.hasText(dbFactoryRef)) {
+			gridFsTemplateBuilder.addConstructorArgReference(dbFactoryRef);
+		} else {
+			gridFsTemplateBuilder.addConstructorArgReference(BeanNames.DB_FACTORY);
+		}
+
+		if (StringUtils.hasText(converterRef)) {
+			gridFsTemplateBuilder.addConstructorArgReference(converterRef);
+		} else {
+			gridFsTemplateBuilder.addConstructorArgReference(BeanNames.DEFAULT_CONVERTER_BEAN_NAME);
+		}
+
+		return (AbstractBeanDefinition) helper.getComponentIdButFallback(gridFsTemplateBuilder, BeanNames.GRID_FS_TEMPLATE)
+				.getBeanDefinition();
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,12 +24,12 @@ import java.util.List;
 import java.util.Set;
 
 import org.springframework.beans.BeanMetadataElement;
-import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.parsing.BeanComponentDefinition;
+import org.springframework.beans.factory.parsing.CompositeComponentDefinition;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -38,6 +38,7 @@ import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.support.ManagedSet;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
+import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
 import org.springframework.core.convert.converter.Converter;
@@ -48,9 +49,12 @@ import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.core.type.filter.AssignableTypeFilter;
 import org.springframework.core.type.filter.TypeFilter;
 import org.springframework.data.annotation.Persistent;
+import org.springframework.data.config.BeanComponentDefinitionBuilder;
+import org.springframework.data.mapping.context.MappingContextIsNewStrategyFactory;
 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.CamelCaseAbbreviatingFieldNamingStrategy;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.event.ValidatingMongoEventListener;
@@ -66,26 +70,30 @@ import org.w3c.dom.Element;
  * @author Jon Brisbin
  * @author Oliver Gierke
  * @author Maciej Walkowiak
+ * @author Thomas Darimont
  */
-public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
+public class MappingMongoConverterParser implements BeanDefinitionParser {
 
 	private static final String BASE_PACKAGE = "base-package";
 	private static final boolean jsr303Present = ClassUtils.isPresent("javax.validation.Validator",
 			MappingMongoConverterParser.class.getClassLoader());
 
-	@Override
+	/* (non-Javadoc)
-	protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext)
+	 * @see org.springframework.beans.factory.xml.BeanDefinitionParser#parse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext)
-			throws BeanDefinitionStoreException {
+	 */
-		String id = super.resolveId(element, definition, parserContext);
+	public BeanDefinition parse(Element element, ParserContext parserContext) {
-		return StringUtils.hasText(id) ? id : "mappingConverter";
-	}
 
-	@Override
-	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
 		BeanDefinitionRegistry registry = parserContext.getRegistry();
 
+		String id = element.getAttribute(AbstractBeanDefinitionParser.ID_ATTRIBUTE);
+		id = StringUtils.hasText(id) ? id : "mappingConverter";
+
+		parserContext.pushContainingComponent(new CompositeComponentDefinition("Mapping Mongo Converter", element));
+
 		BeanDefinition conversionsDefinition = getCustomConversions(element, parserContext);
-		String ctxRef = potentiallyCreateMappingContext(element, parserContext, conversionsDefinition);
+		String ctxRef = potentiallyCreateMappingContext(element, parserContext, conversionsDefinition, id);
+
+		createIsNewStrategyFactoryBeanDefinition(ctxRef, parserContext, element);
 
 		// Need a reference to a Mongo instance
 		String dbFactoryRef = element.getAttribute("db-factory-ref");
@@ -98,6 +106,11 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 		converterBuilder.addConstructorArgReference(dbFactoryRef);
 		converterBuilder.addConstructorArgReference(ctxRef);
 
+		String typeMapperRef = element.getAttribute("type-mapper-ref");
+		if (StringUtils.hasText(typeMapperRef)) {
+			converterBuilder.addPropertyReference("typeMapper", typeMapperRef);
+		}
+
 		if (conversionsDefinition != null) {
 			converterBuilder.addPropertyValue("customConversions", conversionsDefinition);
 		}
@@ -110,18 +123,24 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 			}
 			BeanDefinitionBuilder indexHelperBuilder = BeanDefinitionBuilder
 					.genericBeanDefinition(MongoPersistentEntityIndexCreator.class);
-			indexHelperBuilder.addConstructorArgValue(new RuntimeBeanReference(ctxRef));
+			indexHelperBuilder.addConstructorArgReference(ctxRef);
-			indexHelperBuilder.addConstructorArgValue(new RuntimeBeanReference(dbFactoryRef));
+			indexHelperBuilder.addConstructorArgReference(dbFactoryRef);
-			registry.registerBeanDefinition(INDEX_HELPER, indexHelperBuilder.getBeanDefinition());
+			indexHelperBuilder.addDependsOn(ctxRef);
+
+			parserContext.registerBeanComponent(new BeanComponentDefinition(indexHelperBuilder.getBeanDefinition(),
+					INDEX_HELPER));
 		}
 
 		BeanDefinition validatingMongoEventListener = potentiallyCreateValidatingMongoEventListener(element, parserContext);
 
 		if (validatingMongoEventListener != null) {
-			registry.registerBeanDefinition(VALIDATING_EVENT_LISTENER, validatingMongoEventListener);
+			parserContext.registerBeanComponent(new BeanComponentDefinition(validatingMongoEventListener,
+					VALIDATING_EVENT_LISTENER));
 		}
 
-		return converterBuilder.getBeanDefinition();
+		parserContext.registerBeanComponent(new BeanComponentDefinition(converterBuilder.getBeanDefinition(), id));
+		parserContext.popAndRegisterContainingComponent();
+		return null;
 	}
 
 	private BeanDefinition potentiallyCreateValidatingMongoEventListener(Element element, ParserContext parserContext) {
@@ -135,7 +154,6 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 			RuntimeBeanReference validator = getValidator(builder, parserContext);
 
 			if (validator != null) {
-
 				builder.getRawBeanDefinition().setBeanClass(ValidatingMongoEventListener.class);
 				builder.addConstructorArgValue(validator);
 
@@ -157,16 +175,23 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 		validatorDef.setSource(source);
 		validatorDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
 		String validatorName = parserContext.getReaderContext().registerWithGeneratedName(validatorDef);
-		parserContext.registerComponent(new BeanComponentDefinition(validatorDef, validatorName));
+		parserContext.registerBeanComponent(new BeanComponentDefinition(validatorDef, validatorName));
 
 		return new RuntimeBeanReference(validatorName);
 	}
 
-	private String potentiallyCreateMappingContext(Element element, ParserContext parserContext,
+	static String potentiallyCreateMappingContext(Element element, ParserContext parserContext,
-			BeanDefinition conversionsDefinition) {
+			BeanDefinition conversionsDefinition, String converterId) {
 
 		String ctxRef = element.getAttribute("mapping-context-ref");
-		if (!StringUtils.hasText(ctxRef)) {
+
+		if (StringUtils.hasText(ctxRef)) {
+			return ctxRef;
+		}
+
+		BeanComponentDefinitionBuilder componentDefinitionBuilder = new BeanComponentDefinitionBuilder(element,
+				parserContext);
+
 		BeanDefinitionBuilder mappingContextBuilder = BeanDefinitionBuilder
 				.genericBeanDefinition(MongoMappingContext.class);
 
@@ -183,10 +208,15 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 			mappingContextBuilder.addPropertyValue("simpleTypeHolder", simpleTypesDefinition);
 		}
 
-			parserContext.getRegistry().registerBeanDefinition(MAPPING_CONTEXT, mappingContextBuilder.getBeanDefinition());
+		String abbreviateFieldNames = element.getAttribute("abbreviate-field-names");
-			ctxRef = MAPPING_CONTEXT;
+		if ("true".equals(abbreviateFieldNames)) {
+			mappingContextBuilder.addPropertyValue("fieldNamingStrategy", new RootBeanDefinition(
+					CamelCaseAbbreviatingFieldNamingStrategy.class));
 		}
 
+		ctxRef = converterId + "." + MAPPING_CONTEXT;
+
+		parserContext.registerBeanComponent(componentDefinitionBuilder.getComponent(mappingContextBuilder, ctxRef));
 		return ctxRef;
 	}
 
@@ -224,7 +254,7 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 			AbstractBeanDefinition conversionsBean = conversionsBuilder.getBeanDefinition();
 			conversionsBean.setSource(parserContext.extractSource(element));
 
-			parserContext.getRegistry().registerBeanDefinition("customConversions", conversionsBean);
+			parserContext.registerBeanComponent(new BeanComponentDefinition(conversionsBean, "customConversions"));
 
 			return conversionsBean;
 		}
@@ -232,7 +262,7 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 		return null;
 	}
 
-	public Set<String> getInititalEntityClasses(Element element, BeanDefinitionBuilder builder) {
+	private static Set<String> getInititalEntityClasses(Element element, BeanDefinitionBuilder builder) {
 
 		String basePackage = element.getAttribute(BASE_PACKAGE);
 
@@ -271,6 +301,19 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 		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));
+
+		return IS_NEW_STRATEGY_FACTORY;
+	}
+
 	/**
 	 * {@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

@@ -0,0 +1,80 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.config;
+
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+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.config.IsNewAwareAuditingHandlerBeanDefinitionParser;
+import org.springframework.data.mongodb.core.mapping.event.AuditingEventListener;
+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) {
+
+		BeanDefinitionRegistry registry = parserContext.getRegistry();
+
+		if (!registry.containsBeanDefinition(BeanNames.IS_NEW_STRATEGY_FACTORY)) {
+
+			String mappingContextName = BeanNames.MAPPING_CONTEXT;
+
+			if (!registry.containsBeanDefinition(BeanNames.MAPPING_CONTEXT)) {
+				mappingContextName = MappingMongoConverterParser.potentiallyCreateMappingContext(element, parserContext, null,
+						BeanNames.DEFAULT_CONVERTER_BEAN_NAME);
+			}
+
+			MappingMongoConverterParser.createIsNewStrategyFactoryBeanDefinition(mappingContextName, parserContext, element);
+		}
+
+		BeanDefinitionParser parser = new IsNewAwareAuditingHandlerBeanDefinitionParser(BeanNames.IS_NEW_STRATEGY_FACTORY);
+		BeanDefinition handlerBeanDefinition = parser.parse(element, parserContext);
+
+		builder.addConstructorArgValue(handlerBeanDefinition);
+	}
+}

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

@@ -0,0 +1,105 @@
+/*
+ * 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.Annotation;
+
+import org.springframework.beans.factory.config.BeanDefinition;
+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.AnnotationAuditingConfiguration;
+import org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport;
+import org.springframework.data.mapping.context.MappingContextIsNewStrategyFactory;
+import org.springframework.data.mongodb.core.mapping.event.AuditingEventListener;
+import org.springframework.data.support.IsNewStrategyFactory;
+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#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!");
+
+		registerIsNewStrategyFactoryIfNecessary(registry);
+		super.registerBeanDefinitions(annotationMetadata, registry);
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#getAuditHandlerBeanDefinitionBuilder(org.springframework.data.auditing.config.AnnotationAuditingConfiguration)
+	 */
+	@Override
+	protected BeanDefinitionBuilder getAuditHandlerBeanDefinitionBuilder(AnnotationAuditingConfiguration configuration) {
+
+		Assert.notNull(configuration, "AnnotationAuditingConfiguration must not be null!");
+
+		return configureDefaultAuditHandlerAttributes(configuration,
+				BeanDefinitionBuilder.rootBeanDefinition(IsNewAwareAuditingHandler.class)).addConstructorArgReference(
+				BeanNames.IS_NEW_STRATEGY_FACTORY);
+	}
+
+	/* 
+	 * (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!");
+
+		registerInfrastructureBeanWithId(BeanDefinitionBuilder.rootBeanDefinition(AuditingEventListener.class)
+				.addConstructorArgValue(auditingHandlerDefinition).getRawBeanDefinition(),
+				AuditingEventListener.class.getName(), registry);
+	}
+
+	/**
+	 * @param registry, the {@link BeanDefinitionRegistry} to use to register an {@link IsNewStrategyFactory} to.
+	 */
+	private void registerIsNewStrategyFactoryIfNecessary(BeanDefinitionRegistry registry) {
+
+		if (!registry.containsBeanDefinition(BeanNames.IS_NEW_STRATEGY_FACTORY)) {
+			registry.registerBeanDefinition(BeanNames.IS_NEW_STRATEGY_FACTORY,
+					BeanDefinitionBuilder.rootBeanDefinition(MappingContextIsNewStrategyFactory.class)
+							.addConstructorArgReference(BeanNames.MAPPING_CONTEXT).getBeanDefinition());
+		}
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 by the original author(s).
+ * Copyright 2011-2013 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.
@@ -41,6 +41,7 @@ import com.mongodb.MongoURI;
  * 
  * @author Jon Brisbin
  * @author Oliver Gierke
+ * @author Thomas Darimont
  */
 public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 
@@ -70,6 +71,7 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 		String uri = element.getAttribute("uri");
 		String mongoRef = element.getAttribute("mongo-ref");
 		String dbname = element.getAttribute("dbname");
+
 		BeanDefinition userCredentials = getUserCredentialsBeanDefinition(element, parserContext);
 
 		// Common setup
@@ -92,12 +94,9 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 			dbFactoryBuilder.addConstructorArgValue(registerMongoBeanDefinition(element, parserContext));
 		}
 
-		dbname = StringUtils.hasText(dbname) ? dbname : "db";
+		dbFactoryBuilder.addConstructorArgValue(StringUtils.hasText(dbname) ? dbname : "db");
-		dbFactoryBuilder.addConstructorArgValue(dbname);
-
-		if (userCredentials != null) {
 		dbFactoryBuilder.addConstructorArgValue(userCredentials);
-		}
+		dbFactoryBuilder.addConstructorArgValue(element.getAttribute("authentication-dbname"));
 
 		BeanDefinitionBuilder writeConcernPropertyEditorBuilder = getWriteConcernPropertyEditorBuilder();
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-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.
@@ -21,15 +21,15 @@ import org.springframework.data.repository.config.RepositoryBeanDefinitionParser
 import org.springframework.data.repository.config.RepositoryConfigurationExtension;
 
 /**
- * {@link org.springframework.beans.factory.xml.NamespaceHandler} for Mongo DB based repositories.
+ * {@link org.springframework.beans.factory.xml.NamespaceHandler} for Mongo DB configuration.
  * 
  * @author Oliver Gierke
+ * @author Martin Baumgartner
  */
 public class MongoNamespaceHandler extends NamespaceHandlerSupport {
 
 	/*
 	 * (non-Javadoc)
-	*
 	 * @see org.springframework.beans.factory.xml.NamespaceHandler#init()
 	 */
 	public void init() {
@@ -42,5 +42,8 @@ public class MongoNamespaceHandler extends NamespaceHandlerSupport {
 		registerBeanDefinitionParser("mongo", new MongoParser());
 		registerBeanDefinitionParser("db-factory", new MongoDbFactoryParser());
 		registerBeanDefinitionParser("jmx", new MongoJmxParser());
+		registerBeanDefinitionParser("auditing", new MongoAuditingBeanDefinitionParser());
+		registerBeanDefinitionParser("template", new MongoTemplateParser());
+		registerBeanDefinitionParser("gridFsTemplate", new GridFsTemplateParser());
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@ import org.w3c.dom.Element;
  * 
  * @author Mark Pollack
  * @author Oliver Gierke
+ * @author Thomas Darimont
  */
 abstract class MongoParsingUtils {
 
@@ -79,6 +80,8 @@ abstract class MongoParsingUtils {
 		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;

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

@@ -0,0 +1,86 @@
+/*
+ * 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.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
+ */
+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;
+	}
+
+	/*
+	 * (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);
+		}
+
+		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)
+				.getBeanDefinition();
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-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.
@@ -31,6 +31,7 @@ import com.mongodb.ServerAddress;
  * 
  * @author Mark Pollack
  * @author Oliver Gierke
+ * @author Thomas Darimont
  */
 public class ServerAddressPropertyEditor extends PropertyEditorSupport {
 
@@ -43,6 +44,11 @@ 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);
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 package org.springframework.data.mongodb.core;
 
+import static org.springframework.data.domain.Sort.Direction.*;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -22,7 +24,6 @@ import org.springframework.dao.DataAccessException;
 import org.springframework.data.mongodb.core.index.IndexDefinition;
 import org.springframework.data.mongodb.core.index.IndexField;
 import org.springframework.data.mongodb.core.index.IndexInfo;
-import org.springframework.data.mongodb.core.query.Order;
 import org.springframework.util.Assert;
 
 import com.mongodb.DBCollection;
@@ -34,9 +35,13 @@ import com.mongodb.MongoException;
  * 
  * @author Mark Pollack
  * @author Oliver Gierke
+ * @author Komi Innocent
  */
 public class DefaultIndexOperations implements IndexOperations {
 
+	private static final Double ONE = Double.valueOf(1);
+	private static final Double MINUS_ONE = Double.valueOf(-1);
+
 	private final MongoOperations mongoOperations;
 	private final String collectionName;
 
@@ -135,12 +140,17 @@ public class DefaultIndexOperations implements IndexOperations {
 
 						Object value = keyDbObject.get(key);
 
-						if (Integer.valueOf(1).equals(value)) {
+						if ("2d".equals(value)) {
-							indexFields.add(IndexField.create(key, Order.ASCENDING));
-						} else if (Integer.valueOf(-1).equals(value)) {
-							indexFields.add(IndexField.create(key, Order.DESCENDING));
-						} else if ("2d".equals(value)) {
 							indexFields.add(IndexField.geo(key));
+						} else {
+
+							Double keyValue = new Double(value.toString());
+
+							if (ONE.equals(keyValue)) {
+								indexFields.add(IndexField.create(key, ASC));
+							} else if (MINUS_ONE.equals(keyValue)) {
+								indexFields.add(IndexField.create(key, DESC));
+							}
 						}
 					}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-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.
@@ -13,59 +13,53 @@
  * 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.DBObject;
 import com.mongodb.WriteConcern;
 
 /**
  * Represents an action taken against the collection. Used by {@link WriteConcernResolver} to determine a custom
- * WriteConcern based on this information.
+ * {@link 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 entityClass, document, and query</li>
+ * <li>INSERT_LIST has null entityType, document, and query</li>
  * </ul>
  * 
  * @author Mark Pollack
- * 
+ * @author Oliver Gierke
  */
 public class MongoAction {
 
-	private String collectionName;
+	private final String collectionName;
-
+	private final WriteConcern defaultWriteConcern;
-	private WriteConcern defaultWriteConcern;
+	private final Class<?> entityType;
-
+	private final MongoActionOperation mongoActionOperation;
-	private Class<?> entityClass;
+	private final DBObject query;
-
+	private final DBObject document;
-	private MongoActionOperation mongoActionOperation;
-
-	private DBObject query;
-
-	private DBObject document;
 
 	/**
-	 * Create an instance of a MongoAction
+	 * Create an instance of a {@link 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
+	 * @param collectionName the collection name, must not be {@literal null} or empty.
-	 * @param entityClass the POJO that is being operated against
+	 * @param entityType the POJO that is being operated against
 	 * @param document the converted DBObject from the POJO or Spring Update object
 	 * @param query the converted DBOjbect from the Spring Query object
 	 */
 	public MongoAction(WriteConcern defaultWriteConcern, MongoActionOperation mongoActionOperation,
-			String collectionName, Class<?> entityClass, DBObject document, DBObject query) {
+			String collectionName, Class<?> entityType, DBObject document, DBObject query) {
-		super();
+
+		Assert.hasText(collectionName, "Collection name must not be null or empty!");
+
 		this.defaultWriteConcern = defaultWriteConcern;
 		this.mongoActionOperation = mongoActionOperation;
 		this.collectionName = collectionName;
-		this.entityClass = entityClass;
+		this.entityType = entityType;
 		this.query = query;
 		this.document = document;
 	}
@@ -78,8 +72,16 @@ public class MongoAction {
 		return defaultWriteConcern;
 	}
 
+	/**
+	 * @deprecated use {@link #getEntityType()} instead.
+	 */
+	@Deprecated
 	public Class<?> getEntityClass() {
-		return entityClass;
+		return entityType;
+	}
+
+	public Class<?> getEntityType() {
+		return entityType;
 	}
 
 	public MongoActionOperation getMongoActionOperation() {

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ * Copyright 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.
@@ -27,6 +27,7 @@ import com.mongodb.Mongo;
  * Mongo server administration exposed via JMX annotations
  * 
  * @author Mark Pollack
+ * @author Thomas Darimont
  */
 @ManagedResource(description = "Mongo Admin Operations")
 public class MongoAdmin implements MongoAdminOperations {
@@ -34,6 +35,7 @@ public class MongoAdmin implements MongoAdminOperations {
 	private final Mongo mongo;
 	private String username;
 	private String password;
+	private String authenticationDatabaseName;
 
 	public MongoAdmin(Mongo mongo) {
 		Assert.notNull(mongo);
@@ -82,7 +84,16 @@ public class MongoAdmin implements MongoAdminOperations {
 		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));
+		return MongoDbUtils.getDB(mongo, databaseName, new UserCredentials(username, password), authenticationDatabaseName);
 	}
 }

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

@@ -0,0 +1,71 @@
+/*
+ * 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-2011 the original author or authors.
+ * Copyright 2010-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,14 +26,14 @@ import com.mongodb.DB;
 import com.mongodb.Mongo;
 
 /**
- * Helper class featuring helper methods for internal MongoDb classes.
+ * Helper class featuring helper methods for internal MongoDb classes. Mainly intended for internal use within the
- * <p/>
+ * framework.
- * <p>
- * Mainly intended for internal use within the framework.
  * 
  * @author Thomas Risberg
  * @author Graeme Rocher
  * @author Oliver Gierke
+ * @author Randy Watler
+ * @author Thomas Darimont
  * @since 1.0
  */
 public abstract class MongoDbUtils {
@@ -55,7 +55,7 @@ public abstract class MongoDbUtils {
 	 * @return the {@link DB} connection
 	 */
 	public static DB getDB(Mongo mongo, String databaseName) {
-		return doGetDB(mongo, databaseName, UserCredentials.NO_CREDENTIALS, true);
+		return doGetDB(mongo, databaseName, UserCredentials.NO_CREDENTIALS, true, databaseName);
 	}
 
 	/**
@@ -67,26 +67,31 @@ public abstract class MongoDbUtils {
 	 * @return the {@link DB} connection
 	 */
 	public static DB getDB(Mongo mongo, String databaseName, UserCredentials credentials) {
+		return getDB(mongo, databaseName, credentials, databaseName);
+	}
+
+	public static DB getDB(Mongo mongo, String databaseName, UserCredentials credentials,
+			String authenticationDatabaseName) {
 
 		Assert.notNull(mongo, "No Mongo instance specified!");
 		Assert.hasText(databaseName, "Database name must be given!");
 		Assert.notNull(credentials, "Credentials must not be null, use UserCredentials.NO_CREDENTIALS!");
+		Assert.hasText(authenticationDatabaseName, "Authentication database name must not be null or empty!");
 
-		return doGetDB(mongo, databaseName, credentials, true);
+		return doGetDB(mongo, databaseName, credentials, true, authenticationDatabaseName);
 	}
 
-	private static DB doGetDB(Mongo mongo, String databaseName, UserCredentials credentials, boolean allowCreate) {
+	private static DB doGetDB(Mongo mongo, String databaseName, UserCredentials credentials, boolean allowCreate,
+			String authenticationDatabaseName) {
 
 		DbHolder dbHolder = (DbHolder) TransactionSynchronizationManager.getResource(mongo);
 
-		if (dbHolder != null && !dbHolder.isEmpty()) {
+		// Do we have a populated holder and TX sync active?
+		if (dbHolder != null && !dbHolder.isEmpty() && TransactionSynchronizationManager.isSynchronizationActive()) {
 
-			DB db = null;
+			DB db = dbHolder.getDB(databaseName);
-
-			if (TransactionSynchronizationManager.isSynchronizationActive() && dbHolder.doesNotHoldNonDefaultDB()) {
-
-				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);
@@ -94,31 +99,35 @@ public abstract class MongoDbUtils {
 				TransactionSynchronizationManager.registerSynchronization(new MongoSynchronization(dbHolder, mongo));
 				dbHolder.setSynchronizedWithTransaction(true);
 			}
-			}
 
 			if (db != null) {
 				return db;
 			}
 		}
 
+		// Lookup fresh database instance
 		LOGGER.debug("Getting Mongo Database name=[{}]", databaseName);
 
 		DB db = mongo.getDB(databaseName);
 		boolean credentialsGiven = credentials.hasUsername() && credentials.hasPassword();
 
-		if (credentialsGiven && !db.isAuthenticated()) {
+		DB authDb = databaseName.equals(authenticationDatabaseName) ? db : mongo.getDB(authenticationDatabaseName);
+
+		synchronized (authDb) {
+
+			if (credentialsGiven && !authDb.isAuthenticated()) {
 
 				String username = credentials.getUsername();
 				String password = credentials.hasPassword() ? credentials.getPassword() : null;
 
-			if (!db.authenticate(username, password == null ? null : password.toCharArray())) {
+				if (!authDb.authenticate(username, password == null ? null : password.toCharArray())) {
-				throw new CannotGetMongoDbConnectionException("Failed to authenticate to database [" + databaseName
+					throw new CannotGetMongoDbConnectionException("Failed to authenticate to database [" + databaseName + "], "
-						+ "], username = [" + username + "], password = [" + password + "]", databaseName, credentials);
+							+ credentials.toString(), databaseName, credentials);
+				}
 			}
 		}
 
-		// Use same Session for further Mongo actions within the transaction.
+		// TX sync active, bind new database to thread
-		// Thread object will get removed by synchronization at transaction completion.
 		if (TransactionSynchronizationManager.isSynchronizationActive()) {
 
 			LOGGER.debug("Registering Spring transaction synchronization for MongoDB instance {}.", databaseName);
@@ -131,8 +140,11 @@ public abstract class MongoDbUtils {
 				holderToUse.addDB(databaseName, db);
 			}
 
+			// synchronize holder only if not yet synchronized
+			if (!holderToUse.isSynchronizedWithTransaction()) {
 				TransactionSynchronizationManager.registerSynchronization(new MongoSynchronization(holderToUse, mongo));
 				holderToUse.setSynchronizedWithTransaction(true);
+			}
 
 			if (holderToUse != dbHolder) {
 				TransactionSynchronizationManager.bindResource(mongo, holderToUse);
@@ -162,7 +174,7 @@ public abstract class MongoDbUtils {
 			return false;
 		}
 		DbHolder dbHolder = (DbHolder) TransactionSynchronizationManager.getResource(mongo);
-		return (dbHolder != null && dbHolder.containsDB(db));
+		return dbHolder != null && dbHolder.containsDB(db);
 	}
 
 	/**

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,6 @@
  */
 package org.springframework.data.mongodb.core;
 
-import com.mongodb.MongoException;
-import com.mongodb.MongoException.CursorNotFound;
-import com.mongodb.MongoException.DuplicateKey;
-import com.mongodb.MongoException.Network;
-import com.mongodb.MongoInternalException;
-
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.dao.DuplicateKeyException;
@@ -29,20 +23,25 @@ import org.springframework.dao.InvalidDataAccessResourceUsageException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.mongodb.UncategorizedMongoDbException;
 
+import com.mongodb.MongoException;
+import com.mongodb.MongoException.CursorNotFound;
+import com.mongodb.MongoException.DuplicateKey;
+import com.mongodb.MongoException.Network;
+import com.mongodb.MongoInternalException;
+
 /**
  * Simple {@link PersistenceExceptionTranslator} for Mongo. Convert the given runtime exception to an appropriate
  * exception from the {@code org.springframework.dao} hierarchy. Return {@literal null} if no translation is
  * appropriate: any other exception may have resulted from user code, and should not be translated.
  * 
  * @author Oliver Gierke
+ * @author Michal Vich
  */
 public class MongoExceptionTranslator implements PersistenceExceptionTranslator {
 
 	/*
 	 * (non-Javadoc)
-	  *
+	 * @see org.springframework.dao.support.PersistenceExceptionTranslator#translateExceptionIfPossible(java.lang.RuntimeException)
-	  * @see org.springframework.dao.support.PersistenceExceptionTranslator#
-	  * translateExceptionIfPossible(java.lang.RuntimeException)
 	 */
 	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
 
@@ -52,14 +51,23 @@ public class MongoExceptionTranslator implements PersistenceExceptionTranslator
 		if (ex instanceof DuplicateKey) {
 			return new DuplicateKeyException(ex.getMessage(), ex);
 		}
+
 		if (ex instanceof Network) {
 			return new DataAccessResourceFailureException(ex.getMessage(), ex);
 		}
+
 		if (ex instanceof CursorNotFound) {
 			return new DataAccessResourceFailureException(ex.getMessage(), ex);
 		}
+
+		if (ex instanceof MongoInternalException) {
+			return new InvalidDataAccessResourceUsageException(ex.getMessage(), ex);
+		}
+
 		if (ex instanceof MongoException) {
+
 			int code = ((MongoException) ex).getCode();
+
 			if (code == 11000 || code == 11001) {
 				throw new DuplicateKeyException(ex.getMessage(), ex);
 			} else if (code == 12000 || code == 13440) {
@@ -69,9 +77,6 @@ public class MongoExceptionTranslator implements PersistenceExceptionTranslator
 			}
 			return new UncategorizedMongoDbException(ex.getMessage(), ex);
 		}
-		if (ex instanceof MongoInternalException) {
-			return new InvalidDataAccessResourceUsageException(ex.getMessage(), ex);
-		}
 
 		// If we get here, we have an exception that resulted from user code,
 		// rather than the persistence provider, so we return null to indicate

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 the original author or authors.
+ * Copyright 2010-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,9 @@
  */
 package org.springframework.data.mongodb.core;
 
-import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 import org.springframework.beans.factory.DisposableBean;
@@ -24,6 +26,7 @@ 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;
@@ -36,6 +39,7 @@ import com.mongodb.WriteConcern;
  * @author Thomas Risberg
  * @author Graeme Rocher
  * @author Oliver Gierke
+ * @author Thomas Darimont
  * @since 1.0
  */
 public class MongoFactoryBean implements FactoryBean<Mongo>, InitializingBean, DisposableBean,
@@ -57,11 +61,38 @@ public class MongoFactoryBean implements FactoryBean<Mongo>, InitializingBean, D
 	}
 
 	public void setReplicaSetSeeds(ServerAddress[] replicaSetSeeds) {
-		this.replicaSetSeeds = Arrays.asList(replicaSetSeeds);
+		this.replicaSetSeeds = filterNonNullElementsAsList(replicaSetSeeds);
 	}
 
+	/**
+	 * @deprecated use {@link #setReplicaSetSeeds(ServerAddress[])} instead
+	 * 
+	 * @param replicaPair
+	 */
+	@Deprecated
 	public void setReplicaPair(ServerAddress[] replicaPair) {
-		this.replicaPair = Arrays.asList(replicaPair);
+		this.replicaPair = filterNonNullElementsAsList(replicaPair);
+	}
+
+	/**
+	 * @param elements the elements to filter <T>
+	 * @return a new unmodifiable {@link List#} from the given elements without nulls
+	 */
+	private <T> List<T> filterNonNullElementsAsList(T[] elements) {
+
+		if (elements == null) {
+			return Collections.emptyList();
+		}
+
+		List<T> candidateElements = new ArrayList<T>();
+
+		for (T element : elements) {
+			if (element != null) {
+				candidateElements.add(element);
+			}
+		}
+
+		return Collections.unmodifiableList(candidateElements);
 	}
 
 	public void setHost(String host) {
@@ -117,6 +148,7 @@ public class MongoFactoryBean implements FactoryBean<Mongo>, InitializingBean, D
 	 * (non-Javadoc)
 	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
 	 */
+	@SuppressWarnings("deprecation")
 	public void afterPropertiesSet() throws Exception {
 
 		Mongo mongo;
@@ -126,15 +158,15 @@ public class MongoFactoryBean implements FactoryBean<Mongo>, InitializingBean, D
 			mongoOptions = new MongoOptions();
 		}
 
-		if (replicaPair != null) {
+		if (!isNullOrEmpty(replicaPair)) {
 			if (replicaPair.size() < 2) {
 				throw new CannotGetMongoDbConnectionException("A replica pair must have two server entries");
 			}
 			mongo = new Mongo(replicaPair.get(0), replicaPair.get(1), mongoOptions);
-		} else if (replicaSetSeeds != null) {
+		} else if (!isNullOrEmpty(replicaSetSeeds)) {
 			mongo = new Mongo(replicaSetSeeds, mongoOptions);
 		} else {
-			String mongoHost = host != null ? host : defaultOptions.getHost();
+			String mongoHost = StringUtils.hasText(host) ? host : defaultOptions.getHost();
 			mongo = port != null ? new Mongo(new ServerAddress(mongoHost, port), mongoOptions) : new Mongo(mongoHost,
 					mongoOptions);
 		}
@@ -146,6 +178,10 @@ public class MongoFactoryBean implements FactoryBean<Mongo>, InitializingBean, D
 		this.mongo = mongo;
 	}
 
+	private boolean isNullOrEmpty(Collection<?> elements) {
+		return elements == null || elements.isEmpty();
+	}
+
 	/* 
 	 * (non-Javadoc)
 	 * @see org.springframework.beans.factory.DisposableBean#destroy()

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,9 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 
+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;
@@ -45,6 +48,8 @@ import com.mongodb.WriteResult;
  * @author Thomas Risberg
  * @author Mark Pollack
  * @author Oliver Gierke
+ * @author Tobias Trelle
+ * @author Chuong Ngo
  */
 public interface MongoOperations {
 
@@ -247,7 +252,7 @@ public interface MongoOperations {
 	 * 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 SimpleMongoConverter will be used.
+	 * configured otherwise, an instance of MappingMongoConverter will be used.
 	 * <p/>
 	 * If your collection does not contain a homogeneous collection of types, this operation will not be an efficient way
 	 * to map objects since the test for class type is done in the client and not on the server.
@@ -261,7 +266,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 SimpleMongoConverter will be used.
+	 * configured otherwise, an instance of MappingMongoConverter will be used.
 	 * <p/>
 	 * If your collection does not contain a homogeneous collection of types, this operation will not be an efficient way
 	 * to map objects since the test for class type is done in the client and not on the server.
@@ -301,6 +306,57 @@ 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
 	 * 
@@ -382,7 +438,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 SimpleMongoConverter will be used.
+	 * configured otherwise, an instance of MappingMongoConverter will be used.
 	 * <p/>
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
@@ -399,7 +455,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 SimpleMongoConverter will be used.
+	 * configured otherwise, an instance of MappingMongoConverter will be used.
 	 * <p/>
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
@@ -408,16 +464,21 @@ 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);
 
+	boolean exists(Query query, String collectionName);
+
+	boolean exists(Query query, Class<?> entityClass);
+
+	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 SimpleMongoConverter will be used.
+	 * configured otherwise, an instance of MappingMongoConverter will be used.
 	 * <p/>
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
@@ -433,7 +494,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 SimpleMongoConverter will be used.
+	 * configured otherwise, an instance of MappingMongoConverter will be used.
 	 * <p/>
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
@@ -442,7 +503,6 @@ 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);
@@ -464,7 +524,6 @@ 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
 	 */
@@ -501,7 +560,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 SimpleMongoConverter will be used.
+	 * configured otherwise, an instance of MappingMongoConverter will be used.
 	 * <p/>
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
@@ -510,7 +569,6 @@ 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);
@@ -555,7 +613,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 SimpleMongoConverter will be used.
+	 * configured otherwise, an instance of MappingMongoConverter will be used.
 	 * <p/>
 	 * Insert is used to initially store the object into the database. To update an existing object use the save method.
 	 * 
@@ -593,7 +651,7 @@ 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 SimpleMongoConverter will be used.
+	 * configured otherwise, an instance of MappingMongoConverter will be used.
 	 * <p/>
 	 * If you object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
 	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
@@ -610,7 +668,7 @@ 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 SimpleMongoConverter will be used.
+	 * configured otherwise, an instance of MappingMongoConverter will be used.
 	 * <p/>
 	 * If you object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
 	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
@@ -646,6 +704,18 @@ 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.
@@ -670,6 +740,19 @@ 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.
@@ -694,6 +777,19 @@ 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.
 	 * 
@@ -713,11 +809,12 @@ public interface MongoOperations {
 	 * 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
 	 */
-	<T> void remove(Query query, Class<T> entityClass);
+	void remove(Query query, Class<?> entityClass);
+
+	void remove(Query query, Class<?> entityClass, String collectionName);
 
 	/**
 	 * Remove all documents from the specified collection that match the provided query document criteria. There is no

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,129 +15,91 @@
  */
 package org.springframework.data.mongodb.core;
 
-import com.mongodb.MongoOptions;
+import javax.net.ssl.SSLSocketFactory;
 
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
 
+import com.mongodb.MongoOptions;
+
 /**
- * A factory bean for construction of a MongoOptions instance
+ * A factory bean for construction of a {@link MongoOptions} instance.
  * 
  * @author Graeme Rocher
- * @Author Mark Pollack
+ * @author Mark Pollack
+ * @author Mike Saavedra
+ * @author Thomas Darimont
  */
 public class MongoOptionsFactoryBean implements FactoryBean<MongoOptions>, InitializingBean {
 
-	private static final MongoOptions MONGO_OPTIONS = new MongoOptions();
+	@SuppressWarnings("deprecation")//
-	/**
+	private final MongoOptions MONGO_OPTIONS = new MongoOptions();
-	 * number of connections allowed per host will block if run out
+
-	 */
 	private int connectionsPerHost = MONGO_OPTIONS.connectionsPerHost;
 
-	/**
-	 * 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;
-
+	private boolean socketKeepAlive = MONGO_OPTIONS.socketKeepAlive;
-	/**
-	 * This controls whether or not to have socket keep alive turned on (SO_KEEPALIVE).
-	 * 
-	 * 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;
+	@SuppressWarnings("deprecation") private boolean slaveOk = MONGO_OPTIONS.slaveOk;
+	private boolean ssl;
+	private SSLSocketFactory sslSocketFactory;
 
 	/**
-	 * Specifies if the driver is allowed to read from secondaries or slaves.
+	 * Configures the maximum number of connections allowed per host until we will block.
 	 * 
-	 * Defaults to false
+	 * @param connectionsPerHost
-	 */
-	@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;
 	}
 
 	/**
-	 * multiplier for connectionsPerHost for # of threads that can block if connectionsPerHost is 10, and
+	 * 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 more than that and an exception will
+	 * threadsAllowedToBlockForConnectionMultiplier is 5, then 50 threads can block. If more threads try to block an
-	 * be throw
+	 * exception will be thrown.
+	 * 
+	 * @param threadsAllowedToBlockForConnectionMultiplier
 	 */
 	public void setThreadsAllowedToBlockForConnectionMultiplier(int threadsAllowedToBlockForConnectionMultiplier) {
 		this.threadsAllowedToBlockForConnectionMultiplier = threadsAllowedToBlockForConnectionMultiplier;
 	}
 
 	/**
-	 * max wait time of a blocking thread for a connection
+	 * Max wait time of a blocking thread for a connection.
+	 * 
+	 * @param maxWaitTime
 	 */
 	public void setMaxWaitTime(int maxWaitTime) {
 		this.maxWaitTime = maxWaitTime;
 	}
 
 	/**
-	 * connect timeout in milliseconds. 0 is default and infinite
+	 * Configures the connect timeout in milliseconds. Defaults to 0 (infinite time).
+	 * 
+	 * @param connectTimeout
 	 */
 	public void setConnectTimeout(int connectTimeout) {
 		this.connectTimeout = connectTimeout;
 	}
 
 	/**
-	 * socket timeout. 0 is default and infinite
+	 * Configures the socket timeout. Defaults to 0 (infinite time).
+	 * 
+	 * @param socketTimeout
 	 */
 	public void setSocketTimeout(int socketTimeout) {
 		this.socketTimeout = socketTimeout;
 	}
 
 	/**
-	 * This controls whether or not to have socket keep alive
+	 * Configures whether or not to have socket keep alive turned on (SO_KEEPALIVE). Defaults to {@literal false}.
 	 * 
 	 * @param socketKeepAlive
 	 */
@@ -152,7 +114,7 @@ public class MongoOptionsFactoryBean implements FactoryBean<MongoOptions>, Initi
 	 * <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.
@@ -162,33 +124,33 @@ public class MongoOptionsFactoryBean implements FactoryBean<MongoOptions>, Initi
 	}
 
 	/**
-	 * This controls timeout for write operations in milliseconds. The 'wtimeout' option to the getlasterror command.
+	 * Configures the timeout for write operations in milliseconds. This defaults to {@literal 0} (indefinite).
 	 * 
-	 * @param writeTimeout Defaults to 0 (indefinite). Greater than zero is number of milliseconds to wait.
+	 * @param writeTimeout
 	 */
 	public void setWriteTimeout(int writeTimeout) {
 		this.writeTimeout = writeTimeout;
 	}
 
 	/**
-	 * This controls whether or not to fsync. The 'fsync' option to the getlasterror command. Defaults to false.
+	 * Configures whether or not to fsync. The 'fsync' option to the getlasterror command. Defaults to {@literal false}.
 	 * 
-	 * @param writeFsync to fsync on write (true), otherwise false.
+	 * @param writeFsync to fsync on <code>write (true)<code>, otherwise {@literal false}.
 	 */
 	public void setWriteFsync(boolean writeFsync) {
 		this.writeFsync = writeFsync;
 	}
 
 	/**
-	 * this controls whether or not on a connect, the system retries automatically
+	 * Configures whether or not the system retries automatically on a failed connect. This defaults to {@literal false}.
 	 */
 	public void setAutoConnectRetry(boolean autoConnectRetry) {
 		this.autoConnectRetry = autoConnectRetry;
 	}
 
 	/**
-	 * The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0,
+	 * Configures the maximum amount of time in millisecons to spend retrying to open connection to the same server. This
-	 * which means to use the default 15s if autoConnectRetry is on.
+	 * defaults to {@literal 0}, which means to use the default {@literal 15s} if {@link #autoConnectRetry} is on.
 	 * 
 	 * @param maxAutoConnectRetryTime the maxAutoConnectRetryTime to set
 	 */
@@ -197,7 +159,7 @@ public class MongoOptionsFactoryBean implements FactoryBean<MongoOptions>, Initi
 	}
 
 	/**
-	 * Specifies if the driver is allowed to read from secondaries or slaves. Defaults to false.
+	 * Specifies if the driver is allowed to read from secondaries or slaves. Defaults to {@literal false}.
 	 * 
 	 * @param slaveOk true if the driver should read from secondaries or slaves.
 	 */
@@ -205,8 +167,39 @@ public class MongoOptionsFactoryBean implements FactoryBean<MongoOptions>, Initi
 		this.slaveOk = slaveOk;
 	}
 
+	/**
+	 * Specifies if the driver should use an SSL connection to Mongo. This defaults to {@literal false}. By default
+	 * {@link SSLSocketFactory#getDefault()} will be used. See {@link #setSslSocketFactory(SSLSocketFactory)} if you want
+	 * to configure a custom factory.
+	 * 
+	 * @param ssl true if the driver should use an SSL connection.
+	 * @see #setSslSocketFactory(SSLSocketFactory)
+	 */
+	public void setSsl(boolean ssl) {
+		this.ssl = ssl;
+	}
+
+	/**
+	 * Specifies the {@link SSLSocketFactory} to use for creating SSL connections to Mongo. Defaults to
+	 * {@link SSLSocketFactory#getDefault()}. Implicitly activates {@link #setSsl(boolean)} if a non-{@literal null} value
+	 * is given.
+	 * 
+	 * @param sslSocketFactory the sslSocketFactory to use.
+	 * @see #setSsl(boolean)
+	 */
+	public void setSslSocketFactory(SSLSocketFactory sslSocketFactory) {
+
+		setSsl(sslSocketFactory != null);
+		this.sslSocketFactory = sslSocketFactory;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
+	 */
 	@SuppressWarnings("deprecation")
 	public void afterPropertiesSet() {
+
 		MONGO_OPTIONS.connectionsPerHost = connectionsPerHost;
 		MONGO_OPTIONS.threadsAllowedToBlockForConnectionMultiplier = threadsAllowedToBlockForConnectionMultiplier;
 		MONGO_OPTIONS.maxWaitTime = maxWaitTime;
@@ -219,18 +212,32 @@ public class MongoOptionsFactoryBean implements FactoryBean<MongoOptions>, Initi
 		MONGO_OPTIONS.w = writeNumber;
 		MONGO_OPTIONS.wtimeout = writeTimeout;
 		MONGO_OPTIONS.fsync = writeFsync;
+		if (ssl) {
+			MONGO_OPTIONS.setSocketFactory(sslSocketFactory != null ? sslSocketFactory : SSLSocketFactory.getDefault());
+		}
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.FactoryBean#getObject()
+	 */
 	public MongoOptions getObject() {
 		return MONGO_OPTIONS;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.FactoryBean#getObjectType()
+	 */
 	public Class<?> getObjectType() {
 		return MongoOptions.class;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.FactoryBean#isSingleton()
+	 */
 	public boolean isSingleton() {
 		return true;
 	}
-
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,9 +19,11 @@ import java.net.UnknownHostException;
 
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.dao.DataAccessException;
+import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.authentication.UserCredentials;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 import com.mongodb.DB;
 import com.mongodb.Mongo;
@@ -34,6 +36,7 @@ import com.mongodb.WriteConcern;
  * 
  * @author Mark Pollack
  * @author Oliver Gierke
+ * @author Thomas Darimont
  */
 public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 
@@ -41,27 +44,43 @@ 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}.
+	 * @param databaseName database name, not be {@literal null} or empty.
 	 */
 	public SimpleMongoDbFactory(Mongo mongo, String databaseName) {
-		this(mongo, databaseName, UserCredentials.NO_CREDENTIALS, false);
+		this(mongo, databaseName, null);
 	}
 
 	/**
 	 * Create an instance of SimpleMongoDbFactory given the Mongo instance, database name, and username/password
 	 * 
 	 * @param mongo Mongo instance, must not be {@literal null}.
-	 * @param databaseName Database name, must not be {@literal null}.
+	 * @param databaseName Database name, must not be {@literal null} or empty.
 	 * @param credentials username and password.
 	 */
 	public SimpleMongoDbFactory(Mongo mongo, String databaseName, UserCredentials credentials) {
-		this(mongo, databaseName, credentials, false);
+		this(mongo, databaseName, credentials, false, null);
+	}
+
+	/**
+	 * Create an instance of SimpleMongoDbFactory given the Mongo instance, database name, and username/password
+	 * 
+	 * @param mongo Mongo instance, must not be {@literal null}.
+	 * @param databaseName Database name, must not be {@literal null} or empty.
+	 * @param credentials username and password.
+	 * @param authenticationDatabaseName the database name to use for authentication
+	 */
+	public SimpleMongoDbFactory(Mongo mongo, String databaseName, UserCredentials credentials,
+			String authenticationDatabaseName) {
+		this(mongo, databaseName, credentials, false, authenticationDatabaseName);
 	}
 
 	/**
@@ -72,12 +91,14 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	 * @throws UnknownHostException
 	 * @see MongoURI
 	 */
+	@SuppressWarnings("deprecation")
 	public SimpleMongoDbFactory(MongoURI uri) throws MongoException, UnknownHostException {
-		this(new Mongo(uri), uri.getDatabase(), new UserCredentials(uri.getUsername(), parseChars(uri.getPassword())), true);
+		this(new Mongo(uri), uri.getDatabase(), new UserCredentials(uri.getUsername(), parseChars(uri.getPassword())),
+				true, uri.getDatabase());
 	}
 
 	private SimpleMongoDbFactory(Mongo mongo, String databaseName, UserCredentials credentials,
-			boolean mongoInstanceCreated) {
+			boolean mongoInstanceCreated, String authenticationDatabaseName) {
 
 		Assert.notNull(mongo, "Mongo must not be null");
 		Assert.hasText(databaseName, "Database name must not be empty");
@@ -88,6 +109,12 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 		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!");
 	}
 
 	/**
@@ -115,7 +142,7 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 
 		Assert.hasText(dbName, "Database name must not be empty.");
 
-		DB db = MongoDbUtils.getDB(mongo, dbName, credentials);
+		DB db = MongoDbUtils.getDB(mongo, dbName, credentials, authenticationDatabaseName);
 
 		if (writeConcern != null) {
 			db.setWriteConcern(writeConcern);
@@ -138,4 +165,13 @@ 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 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.
@@ -13,27 +13,25 @@
  * 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 WriteConcern to use for a given MongoDbAction.
+ * 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.
- * 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 WriteConcern given the MongoAction
+	 * Resolve the {@link WriteConcern} given the {@link MongoAction}.
 	 * 
-	 * @param action describes the context of the Mongo action. Contains a default WriteConcern to use if one should not
+	 * @param action describes the context of the Mongo action. Contains a default {@link WriteConcern} to use if one
-	 *          be resolved.
+	 *          should not be resolved.
-	 * @return a WriteConcern based on the passed in MongoAction value, maybe null
+	 * @return a {@link WriteConcern} based on the passed in {@link MongoAction} value, maybe {@literal null}.
 	 */
 	WriteConcern resolve(MongoAction action);
 }

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

@@ -1,5 +1,28 @@
+/*
+ * 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/Aggregation.java

@@ -0,0 +1,305 @@
+/*
+ * 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 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.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.query.Criteria;
+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
+ * @since 1.3
+ */
+public class Aggregation {
+
+	public static final AggregationOperationContext DEFAULT_CONTEXT = new NoOpAggregationOperationContext();
+
+	private final List<AggregationOperation> operations;
+
+	/**
+	 * Creates a new {@link Aggregation} from the given {@link AggregationOperation}s.
+	 * 
+	 * @param operations must not be {@literal null} or empty.
+	 */
+	public static Aggregation newAggregation(List<? extends AggregationOperation> operations) {
+		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);
+	}
+
+	/**
+	 * 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) {
+
+		Assert.notNull(aggregationOperations, "AggregationOperations must not be null!");
+		Assert.isTrue(aggregationOperations.length > 0, "At least one AggregationOperation has to be provided");
+
+		this.operations = Arrays.asList(aggregationOperations);
+	}
+
+	/**
+	 * 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} includeing 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 fieldName must not be {@literal null} or empty.
+	 * @return
+	 */
+	public static UnwindOperation unwind(String field) {
+		return new UnwindOperation(field(field));
+	}
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * 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
+	 */
+	public static SkipOperation skip(int 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 Fields} instance for the given field names.
+	 * 
+	 * @see Fields#fields(String...)
+	 * @param fields must not be {@literal null}.
+	 * @return
+	 */
+	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));
+	}
+
+	/**
+	 * 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) {
+
+		AggregationOperationContext context = rootContext;
+		List<DBObject> operationDocuments = new ArrayList<DBObject>(operations.size());
+
+		for (AggregationOperation operation : operations) {
+
+			operationDocuments.add(operation.toDBObject(context));
+
+			if (operation instanceof FieldsExposingAggregationOperation) {
+				FieldsExposingAggregationOperation exposedFieldsOperation = (FieldsExposingAggregationOperation) operation;
+				context = new ExposedFieldsAggregationOperationContext(exposedFieldsOperation.getFields());
+			}
+		}
+
+		DBObject command = new BasicDBObject("aggregate", inputCollectionName);
+		command.put("pipeline", operationDocuments);
+
+		return command;
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return SerializationUtils
+				.serializeToJsonSafely(toDbObject("__collection__", new NoOpAggregationOperationContext()));
+	}
+
+	/**
+	 * 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 FieldReference(new ExposedField(field, true));
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(java.lang.String)
+		 */
+		@Override
+		public FieldReference getReference(String name) {
+			return new FieldReference(new ExposedField(new AggregationField(name), true));
+		}
+	}
+}

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

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

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

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

@@ -0,0 +1,98 @@
+/*
+ * 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 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
+ * @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;
+	}
+
+	private String parseServerUsed() {
+
+		Object object = rawResults.get("serverUsed");
+		return object instanceof String ? (String) object : null;
+	}
+}

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

@@ -0,0 +1,402 @@
+/*
+ * 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 java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
+import org.springframework.util.Assert;
+import org.springframework.util.CompositeIterator;
+
+/**
+ * Value object to capture the fields exposed by an {@link AggregationOperation}.
+ * 
+ * @author Oliver Gierke
+ * @author Thomas Darimont
+ * @since 1.3
+ */
+public class ExposedFields implements Iterable<ExposedField> {
+
+	private static final List<ExposedField> NO_FIELDS = Collections.emptyList();
+	private static final ExposedFields EMPTY = new ExposedFields(NO_FIELDS, NO_FIELDS);
+
+	private final List<ExposedField> originalFields;
+	private final List<ExposedField> syntheticFields;
+
+	/**
+	 * Creates a new {@link ExposedFields} instance from the given {@link ExposedField}s.
+	 * 
+	 * @param fields must not be {@literal null}.
+	 * @return
+	 */
+	public static ExposedFields from(ExposedField... fields) {
+		return from(Arrays.asList(fields));
+	}
+
+	/**
+	 * Creates a new {@link ExposedFields} instance from the given {@link ExposedField}s.
+	 * 
+	 * @param fields must not be {@literal null}.
+	 * @return
+	 */
+	private static ExposedFields from(List<ExposedField> fields) {
+
+		ExposedFields result = EMPTY;
+
+		for (ExposedField field : fields) {
+			result = result.and(field);
+		}
+
+		return result;
+	}
+
+	/**
+	 * Creates synthetic {@link ExposedFields} from the given {@link Fields}.
+	 * 
+	 * @param fields must not be {@literal null}.
+	 * @return
+	 */
+	public static ExposedFields synthetic(Fields fields) {
+		return createFields(fields, true);
+	}
+
+	/**
+	 * Creates non-synthetic {@link ExposedFields} from the given {@link Fields}.
+	 * 
+	 * @param fields must not be {@literal null}.
+	 * @return
+	 */
+	public static ExposedFields nonSynthetic(Fields fields) {
+		return createFields(fields, false);
+	}
+
+	/**
+	 * Creates a new {@link ExposedFields} instance for the given fields in either sythetic or non-synthetic way.
+	 * 
+	 * @param fields must not be {@literal null}.
+	 * @param synthetic
+	 * @return
+	 */
+	private static ExposedFields createFields(Fields fields, boolean synthetic) {
+
+		Assert.notNull(fields, "Fields must not be null!");
+		List<ExposedField> result = new ArrayList<ExposedField>();
+
+		for (Field field : fields) {
+			result.add(new ExposedField(field, synthetic));
+		}
+
+		return ExposedFields.from(result);
+	}
+
+	/**
+	 * Creates a new {@link ExposedFields} with the given orignals and synthetics.
+	 * 
+	 * @param originals must not be {@literal null}.
+	 * @param synthetic must not be {@literal null}.
+	 */
+	private ExposedFields(List<ExposedField> originals, List<ExposedField> synthetic) {
+
+		this.originalFields = originals;
+		this.syntheticFields = synthetic;
+	}
+
+	/**
+	 * Creates a new {@link ExposedFields} adding the given {@link ExposedField}.
+	 * 
+	 * @param field must not be {@literal null}.
+	 * @return
+	 */
+	public ExposedFields and(ExposedField field) {
+
+		Assert.notNull(field, "Exposed field must not be null!");
+
+		ArrayList<ExposedField> result = new ArrayList<ExposedField>();
+		result.addAll(field.synthetic ? syntheticFields : originalFields);
+		result.add(field);
+
+		return new ExposedFields(field.synthetic ? originalFields : result, field.synthetic ? result : syntheticFields);
+	}
+
+	/**
+	 * Returns the field with the given name or {@literal null} if no field with the given name is available.
+	 * 
+	 * @param name
+	 * @return
+	 */
+	public ExposedField getField(String name) {
+
+		for (ExposedField field : this) {
+			if (field.canBeReferredToBy(name)) {
+				return field;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Returns whether the {@link ExposedFields} exposes no non-synthetic fields at all.
+	 * 
+	 * @return
+	 */
+	boolean exposesNoNonSyntheticFields() {
+		return originalFields.isEmpty();
+	}
+
+	/**
+	 * Returns whether the {@link ExposedFields} exposes a single non-synthetic field only.
+	 * 
+	 * @return
+	 */
+	boolean exposesSingleNonSyntheticFieldOnly() {
+		return originalFields.size() == 1;
+	}
+
+	/**
+	 * Returns whether the {@link ExposedFields} exposes no fields at all.
+	 * 
+	 * @return
+	 */
+	boolean exposesNoFields() {
+		return exposedFieldsCount() == 0;
+	}
+
+	/**
+	 * Returns whether the {@link ExposedFields} exposes a single field only.
+	 * 
+	 * @return
+	 */
+	boolean exposesSingleFieldOnly() {
+		return exposedFieldsCount() == 1;
+	}
+
+	/**
+	 * @return
+	 */
+	private int exposedFieldsCount() {
+		return originalFields.size() + syntheticFields.size();
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see java.lang.Iterable#iterator()
+	 */
+	@Override
+	public Iterator<ExposedField> iterator() {
+
+		CompositeIterator<ExposedField> iterator = new CompositeIterator<ExposedField>();
+		iterator.add(syntheticFields.iterator());
+		iterator.add(originalFields.iterator());
+
+		return iterator;
+	}
+
+	/**
+	 * A single exposed field.
+	 * 
+	 * @author Oliver Gierke
+	 */
+	static class ExposedField implements Field {
+
+		private final boolean synthetic;
+		private final Field field;
+
+		/**
+		 * Creates a new {@link ExposedField} with the given key.
+		 * 
+		 * @param key must not be {@literal null} or empty.
+		 * @param synthetic whether the exposed field is synthetic.
+		 */
+		public ExposedField(String key, boolean synthetic) {
+			this(Fields.field(key), synthetic);
+		}
+
+		/**
+		 * Creates a new {@link ExposedField} for the given {@link Field}.
+		 * 
+		 * @param delegate must not be {@literal null}.
+		 * @param synthetic whether the exposed field is synthetic.
+		 */
+		public ExposedField(Field delegate, boolean synthetic) {
+
+			this.field = delegate;
+			this.synthetic = synthetic;
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.Field#getKey()
+		 */
+		@Override
+		public String getName() {
+			return field.getName();
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.Field#getTarget()
+		 */
+		@Override
+		public String getTarget() {
+			return field.getTarget();
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.Field#isAliased()
+		 */
+		@Override
+		public boolean isAliased() {
+			return field.isAliased();
+		}
+
+		/**
+		 * Returns whether the field can be referred to using the given name.
+		 * 
+		 * @param input
+		 * @return
+		 */
+		public boolean canBeReferredToBy(String input) {
+			return getTarget().equals(input);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see java.lang.Object#toString()
+		 */
+		@Override
+		public String toString() {
+			return String.format("AggregationField: %s, synthetic: %s", field, synthetic);
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see java.lang.Object#equals(java.lang.Object)
+		 */
+		@Override
+		public boolean equals(Object obj) {
+
+			if (this == obj) {
+				return true;
+			}
+
+			if (!(obj instanceof ExposedField)) {
+				return false;
+			}
+
+			ExposedField that = (ExposedField) obj;
+
+			return this.field.equals(that.field) && this.synthetic == that.synthetic;
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see java.lang.Object#hashCode()
+		 */
+		@Override
+		public int hashCode() {
+
+			int result = 17;
+
+			result += 31 * field.hashCode();
+			result += 31 * (synthetic ? 0 : 1);
+
+			return result;
+		}
+	}
+
+	/**
+	 * A reference to an {@link ExposedField}.
+	 * 
+	 * @author Oliver Gierke
+	 */
+	static class FieldReference {
+
+		private final ExposedField field;
+
+		/**
+		 * Creates a new {@link FieldReference} for the given {@link ExposedField}.
+		 * 
+		 * @param field must not be {@literal null}.
+		 */
+		public FieldReference(ExposedField field) {
+
+			Assert.notNull(field, "ExposedField must not be null!");
+			this.field = field;
+		}
+
+		/**
+		 * @return
+		 */
+		public boolean isSynthetic() {
+			return field.synthetic;
+		}
+
+		/**
+		 * Returns the raw, unqualified reference, i.e. the field reference without a {@literal $} prefix.
+		 * 
+		 * @return
+		 */
+		public String getRaw() {
+
+			String target = field.getTarget();
+			return field.synthetic ? target : String.format("%s.%s", Fields.UNDERSCORE_ID, target);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see java.lang.Object#toString()
+		 */
+		@Override
+		public String toString() {
+			return String.format("$%s", getRaw());
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see java.lang.Object#equals(java.lang.Object)
+		 */
+		@Override
+		public boolean equals(Object obj) {
+
+			if (this == obj) {
+				return true;
+			}
+
+			if (!(obj instanceof FieldReference)) {
+				return false;
+			}
+
+			FieldReference that = (FieldReference) obj;
+
+			return this.field.equals(that.field);
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see java.lang.Object#hashCode()
+		 */
+		@Override
+		public int hashCode() {
+			return field.hashCode();
+		}
+	}
+}

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

@@ -0,0 +1,80 @@
+/*
+ * 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.ExposedField;
+import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
+import org.springframework.util.Assert;
+
+import com.mongodb.DBObject;
+
+/**
+ * {@link AggregationOperationContext} that combines the available field references from a given
+ * {@code AggregationOperationContext} and an {@link FieldsExposingAggregationOperation}.
+ * 
+ * @author Thomas Darimont
+ * @author Oliver Gierke
+ * @since 1.4
+ */
+class ExposedFieldsAggregationOperationContext implements AggregationOperationContext {
+
+	private final ExposedFields exposedFields;
+
+	/**
+	 * Creates a new {@link ExposedFieldsAggregationOperationContext} from the given {@link ExposedFields}.
+	 * 
+	 * @param exposedFields must not be {@literal null}.
+	 */
+	public ExposedFieldsAggregationOperationContext(ExposedFields exposedFields) {
+
+		Assert.notNull(exposedFields, "ExposedFields must not be null!");
+		this.exposedFields = exposedFields;
+	}
+
+	/* 
+	 * (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 getReference(field.getTarget());
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(java.lang.String)
+	 */
+	@Override
+	public FieldReference getReference(String name) {
+
+		ExposedField field = exposedFields.getField(name);
+
+		if (field != null) {
+			return new FieldReference(field);
+		}
+
+		throw new IllegalArgumentException(String.format("Invalid reference '%s'!", name));
+	}
+}

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

@@ -0,0 +1,46 @@
+/*
+ * 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;
+
+/**
+ * Abstraction for a field.
+ * 
+ * @author Oliver Gierke
+ * @since 1.3
+ */
+public interface Field {
+
+	/**
+	 * Returns the name of the field.
+	 * 
+	 * @return must not be {@literal null}.
+	 */
+	String getName();
+
+	/**
+	 * Returns the target of the field. In case no explicit target is available {@link #getName()} should be returned.
+	 * 
+	 * @return must not be {@literal null}.
+	 */
+	String getTarget();
+
+	/**
+	 * Returns whether the Field is aliased, which means it has a name set different from the target.
+	 * 
+	 * @return
+	 */
+	boolean isAliased();
+}

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

@@ -0,0 +1,293 @@
+/*
+ * 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 java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+/**
+ * Value object to capture a list of {@link Field} instances.
+ * 
+ * @author Oliver Gierke
+ * @since 1.3
+ */
+public class Fields implements Iterable<Field> {
+
+	private static final String AMBIGUOUS_EXCEPTION = "Found two fields both using '%s' as name: %s and %s! Please "
+			+ "customize your field definitions to get to unique field names!";
+
+	public static String UNDERSCORE_ID = "_id";
+	public static String UNDERSCORE_ID_REF = "$_id";
+
+	private final List<Field> fields;
+
+	/**
+	 * Creates a new {@link Fields} instance from the given {@link Fields}.
+	 * 
+	 * @param fields must not be {@literal null} or empty.
+	 * @return
+	 */
+	public static Fields from(Field... fields) {
+
+		Assert.notNull(fields, "Fields must not be null!");
+		return new Fields(Arrays.asList(fields));
+	}
+
+	/**
+	 * Creates a new {@link Fields} instance for {@link Field}s with the given names.
+	 * 
+	 * @param names must not be {@literal null}.
+	 * @return
+	 */
+	public static Fields fields(String... names) {
+
+		Assert.notNull(names, "Field names must not be null!");
+
+		List<Field> fields = new ArrayList<Field>();
+
+		for (String name : names) {
+			fields.add(field(name));
+		}
+
+		return new Fields(fields);
+	}
+
+	/**
+	 * Creates a {@link Field} with the given name.
+	 * 
+	 * @param name must not be {@literal null} or empty.
+	 * @return
+	 */
+	public static Field field(String name) {
+		return new AggregationField(name);
+	}
+
+	public static Field field(String name, String target) {
+		Assert.hasText(target, "Target must not be null or empty!");
+		return new AggregationField(name, target);
+	}
+
+	/**
+	 * Creates a new {@link Fields} instance using the given {@link Field}s.
+	 * 
+	 * @param fields must not be {@literal null}.
+	 */
+	private Fields(List<Field> fields) {
+
+		Assert.notNull(fields, "Fields must not be null!");
+
+		this.fields = verify(fields);
+	}
+
+	private static final List<Field> verify(List<Field> fields) {
+
+		Map<String, Field> reference = new HashMap<String, Field>();
+
+		for (Field field : fields) {
+
+			String name = field.getName();
+			Field found = reference.get(name);
+
+			if (found != null) {
+				throw new IllegalArgumentException(String.format(AMBIGUOUS_EXCEPTION, name, found, field));
+			}
+
+			reference.put(name, field);
+		}
+
+		return fields;
+	}
+
+	private Fields(Fields existing, Field tail) {
+
+		this.fields = new ArrayList<Field>(existing.fields.size() + 1);
+		this.fields.addAll(existing.fields);
+		this.fields.add(tail);
+	}
+
+	/**
+	 * Creates a new {@link Fields} instance with a new {@link Field} of the given name added.
+	 * 
+	 * @param name must not be {@literal null}.
+	 * @return
+	 */
+	public Fields and(String name) {
+		return and(new AggregationField(name));
+	}
+
+	public Fields and(String name, String target) {
+		return and(new AggregationField(name, target));
+	}
+
+	public Fields and(Field field) {
+		return new Fields(this, field);
+	}
+
+	public Fields and(Fields fields) {
+
+		Fields result = this;
+
+		for (Field field : fields) {
+			result = result.and(field);
+		}
+
+		return result;
+	}
+
+	public Field getField(String name) {
+
+		for (Field field : fields) {
+			if (field.getName().equals(name)) {
+				return field;
+			}
+		}
+
+		return null;
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see java.lang.Iterable#iterator()
+	 */
+	@Override
+	public Iterator<Field> iterator() {
+		return fields.iterator();
+	}
+
+	/**
+	 * Value object to encapsulate a field in an aggregation operation.
+	 * 
+	 * @author Oliver Gierke
+	 */
+	static class AggregationField implements Field {
+
+		private final String name;
+		private final String target;
+
+		/**
+		 * Creates an aggregation fieldwith the given name. As no target is set explicitly, the name will be used as target
+		 * as well.
+		 * 
+		 * @param key
+		 */
+		public AggregationField(String key) {
+			this(key, null);
+		}
+
+		public AggregationField(String name, String target) {
+
+			String nameToSet = cleanUp(name);
+			String targetToSet = cleanUp(target);
+
+			Assert.hasText(nameToSet, "AggregationField name must not be null or empty!");
+
+			if (target == null && name.contains(".")) {
+				this.name = nameToSet.substring(nameToSet.indexOf(".") + 1);
+				this.target = nameToSet;
+			} else {
+				this.name = nameToSet;
+				this.target = targetToSet;
+			}
+		}
+
+		private static final String cleanUp(String source) {
+
+			if (source == null) {
+				return source;
+			}
+
+			int dollarIndex = source.lastIndexOf('$');
+			return dollarIndex == -1 ? source : source.substring(dollarIndex + 1);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.Field#getKey()
+		 */
+		public String getName() {
+			return name;
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.Field#getAlias()
+		 */
+		public String getTarget() {
+			return StringUtils.hasText(this.target) ? this.target : this.name;
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.Field#isAliased()
+		 */
+		@Override
+		public boolean isAliased() {
+			return !getName().equals(getTarget());
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see java.lang.Object#toString()
+		 */
+		@Override
+		public String toString() {
+			return String.format("AggregationField - name: %s, target: %s", name, target);
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see java.lang.Object#equals(java.lang.Object)
+		 */
+		@Override
+		public boolean equals(Object obj) {
+
+			if (this == obj) {
+				return true;
+			}
+
+			if (!(obj instanceof AggregationField)) {
+				return false;
+			}
+
+			AggregationField that = (AggregationField) obj;
+
+			return this.name.equals(that.name) && ObjectUtils.nullSafeEquals(this.target, that.target);
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see java.lang.Object#hashCode()
+		 */
+		@Override
+		public int hashCode() {
+
+			int result = 17;
+
+			result += 31 * name.hashCode();
+			result += 31 * ObjectUtils.nullSafeHashCode(target);
+
+			return result;
+		}
+	}
+}

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

@@ -0,0 +1,32 @@
+/*
+ * 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;
+
+/**
+ * {@link AggregationOperation} that exposes new {@link ExposedFields} that can be used for later aggregation pipeline
+ * {@code AggregationOperation}s.
+ * 
+ * @author Thomas Darimont
+ */
+public interface FieldsExposingAggregationOperation extends AggregationOperation {
+
+	/**
+	 * Returns the fields exposed by the {@link AggregationOperation}.
+	 * 
+	 * @return will never be {@literal null}.
+	 */
+	ExposedFields getFields();
+}

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

@@ -0,0 +1,46 @@
+/*
+ * 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.query.NearQuery;
+import org.springframework.util.Assert;
+
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
+/**
+ * @author Thomas Darimont
+ * @since 1.3
+ */
+public class GeoNearOperation implements AggregationOperation {
+
+	private final NearQuery nearQuery;
+
+	public GeoNearOperation(NearQuery nearQuery) {
+
+		Assert.notNull(nearQuery);
+		this.nearQuery = nearQuery;
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 */
+	@Override
+	public DBObject toDBObject(AggregationOperationContext context) {
+		return new BasicDBObject("$geoNear", context.getMappedObject(nearQuery.toDBObject()));
+	}
+}

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

@@ -0,0 +1,375 @@
+/*
+ * 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 java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+
+import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
+import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
+/**
+ * Encapsulates the aggregation framework {@code $group}-operation.
+ * 
+ * @see http://docs.mongodb.org/manual/reference/aggregation/group/#stage._S_group
+ * @author Sebastian Herold
+ * @author Thomas Darimont
+ * @author Oliver Gierke
+ * @since 1.3
+ */
+public class GroupOperation implements FieldsExposingAggregationOperation {
+
+	/**
+	 * Holds the non-synthetic fields which are the fields of the group-id structure.
+	 */
+	private final ExposedFields idFields;
+
+	private final List<Operation> operations;
+
+	/**
+	 * Creates a new {@link GroupOperation} including the given {@link Fields}.
+	 * 
+	 * @param fields must not be {@literal null}.
+	 */
+	public GroupOperation(Fields fields) {
+
+		this.idFields = ExposedFields.nonSynthetic(fields);
+		this.operations = new ArrayList<Operation>();
+	}
+
+	/**
+	 * Creates a new {@link GroupOperation} from the given {@link GroupOperation}.
+	 * 
+	 * @param groupOperation must not be {@literal null}.
+	 */
+	protected GroupOperation(GroupOperation groupOperation) {
+		this(groupOperation, Collections.<Operation> emptyList());
+	}
+
+	/**
+	 * Creates a new {@link GroupOperation} from the given {@link GroupOperation} and the given {@link Operation}s.
+	 * 
+	 * @param groupOperation
+	 * @param nextOperations
+	 */
+	private GroupOperation(GroupOperation groupOperation, List<Operation> nextOperations) {
+
+		Assert.notNull(groupOperation, "GroupOperation must not be null!");
+		Assert.notNull(nextOperations, "NextOperations must not be null!");
+
+		this.idFields = groupOperation.idFields;
+		this.operations = new ArrayList<Operation>(nextOperations.size() + 1);
+		this.operations.addAll(groupOperation.operations);
+		this.operations.addAll(nextOperations);
+	}
+
+	/**
+	 * Creates a new {@link GroupOperation} from the current one adding the given {@link Operation}.
+	 * 
+	 * @param operation must not be {@literal null}.
+	 * @return
+	 */
+	protected GroupOperation and(Operation operation) {
+		return new GroupOperation(this, Arrays.asList(operation));
+	}
+
+	/**
+	 * Builder for {@link GroupOperation}s on a field.
+	 * 
+	 * @author Thomas Darimont
+	 */
+	public class GroupOperationBuilder {
+
+		private final GroupOperation groupOperation;
+		private final Operation operation;
+
+		/**
+		 * Creates a new {@link GroupOperationBuilder} from the given {@link GroupOperation} and {@link Operation}.
+		 * 
+		 * @param groupOperation
+		 * @param operation
+		 */
+		private GroupOperationBuilder(GroupOperation groupOperation, Operation operation) {
+
+			Assert.notNull(groupOperation, "GroupOperation must not be null!");
+			Assert.notNull(operation, "Operation must not be null!");
+
+			this.groupOperation = groupOperation;
+			this.operation = operation;
+		}
+
+		/**
+		 * Allows to specify an alias for the new-operation operation.
+		 * 
+		 * @param alias
+		 * @return
+		 */
+		public GroupOperation as(String alias) {
+			return this.groupOperation.and(operation.withAlias(alias));
+		}
+	}
+
+	/**
+	 * Generates an {@link GroupOperationBuilder} for a {@code $sum}-expression.
+	 * <p>
+	 * Count expressions are emulated via {@code $sum: 1}.
+	 * <p>
+	 * 
+	 * @return
+	 */
+	public GroupOperationBuilder count() {
+		return newBuilder(GroupOps.SUM, null, 1);
+	}
+
+	/**
+	 * Generates an {@link GroupOperationBuilder} for a {@code $sum}-expression for the given field-reference.
+	 * 
+	 * @param reference
+	 * @return
+	 */
+	public GroupOperationBuilder sum(String reference) {
+		return sum(reference, null);
+	}
+
+	private GroupOperationBuilder sum(String reference, Object value) {
+		return newBuilder(GroupOps.SUM, reference, value);
+	}
+
+	/**
+	 * Generates an {@link GroupOperationBuilder} for an {@code $add_to_set}-expression for the given field-reference.
+	 * 
+	 * @param reference
+	 * @return
+	 */
+	public GroupOperationBuilder addToSet(String reference) {
+		return addToSet(reference, null);
+	}
+
+	/**
+	 * Generates an {@link GroupOperationBuilder} for an {@code $add_to_set}-expression for the given value.
+	 * 
+	 * @param value
+	 * @return
+	 */
+	public GroupOperationBuilder addToSet(Object value) {
+		return addToSet(null, value);
+	}
+
+	private GroupOperationBuilder addToSet(String reference, Object value) {
+		return newBuilder(GroupOps.ADD_TO_SET, reference, value);
+	}
+
+	/**
+	 * Generates an {@link GroupOperationBuilder} for an {@code $last}-expression for the given field-reference.
+	 * 
+	 * @param reference
+	 * @return
+	 */
+	public GroupOperationBuilder last(String reference) {
+		return newBuilder(GroupOps.LAST, reference, null);
+	}
+
+	/**
+	 * Generates an {@link GroupOperationBuilder} for a {@code $first}-expression for the given field-reference.
+	 * 
+	 * @param reference
+	 * @return
+	 */
+	public GroupOperationBuilder first(String reference) {
+		return newBuilder(GroupOps.FIRST, reference, null);
+	}
+
+	/**
+	 * Generates an {@link GroupOperationBuilder} for an {@code $avg}-expression for the given field-reference.
+	 * 
+	 * @param reference
+	 * @return
+	 */
+	public GroupOperationBuilder avg(String reference) {
+		return newBuilder(GroupOps.AVG, reference, null);
+	}
+
+	/**
+	 * Generates an {@link GroupOperationBuilder} for an {@code $push}-expression for the given field-reference.
+	 * 
+	 * @param reference
+	 * @return
+	 */
+	public GroupOperationBuilder push(String reference) {
+		return push(reference, null);
+	}
+
+	/**
+	 * Generates an {@link GroupOperationBuilder} for an {@code $push}-expression for the given value.
+	 * 
+	 * @param value
+	 * @return
+	 */
+	public GroupOperationBuilder push(Object value) {
+		return push(null, value);
+	}
+
+	private GroupOperationBuilder push(String reference, Object value) {
+		return newBuilder(GroupOps.PUSH, reference, value);
+	}
+
+	/**
+	 * Generates an {@link GroupOperationBuilder} for an {@code $min}-expression that for the given field-reference.
+	 * 
+	 * @param reference
+	 * @return
+	 */
+	public GroupOperationBuilder min(String reference) {
+		return newBuilder(GroupOps.MIN, reference, null);
+	}
+
+	/**
+	 * Generates an {@link GroupOperationBuilder} for an {@code $max}-expression that for the given field-reference.
+	 * 
+	 * @param reference
+	 * @return
+	 */
+	public GroupOperationBuilder max(String reference) {
+		return newBuilder(GroupOps.MAX, reference, null);
+	}
+
+	private GroupOperationBuilder newBuilder(Keyword keyword, String reference, Object value) {
+		return new GroupOperationBuilder(this, new Operation(keyword, null, reference, value));
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getFields()
+	 */
+	@Override
+	public ExposedFields getFields() {
+
+		ExposedFields fields = this.idFields.and(new ExposedField(Fields.UNDERSCORE_ID, true));
+
+		for (Operation operation : operations) {
+			fields = fields.and(operation.asField());
+		}
+
+		return fields;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 */
+	@Override
+	public com.mongodb.DBObject toDBObject(AggregationOperationContext context) {
+
+		BasicDBObject operationObject = new BasicDBObject();
+
+		if (idFields.exposesNoNonSyntheticFields()) {
+
+			operationObject.put(Fields.UNDERSCORE_ID, null);
+
+		} else if (idFields.exposesSingleNonSyntheticFieldOnly()) {
+
+			FieldReference reference = context.getReference(idFields.iterator().next());
+			operationObject.put(Fields.UNDERSCORE_ID, reference.toString());
+
+		} else {
+
+			BasicDBObject inner = new BasicDBObject();
+
+			for (ExposedField field : idFields) {
+				FieldReference reference = context.getReference(field);
+				inner.put(field.getName(), reference.toString());
+			}
+
+			operationObject.put(Fields.UNDERSCORE_ID, inner);
+		}
+
+		for (Operation operation : operations) {
+			operationObject.putAll(operation.toDBObject(context));
+		}
+
+		return new BasicDBObject("$group", operationObject);
+	}
+
+	interface Keyword {
+
+		String toString();
+	}
+
+	private static enum GroupOps implements Keyword {
+
+		SUM, LAST, FIRST, PUSH, AVG, MIN, MAX, ADD_TO_SET, COUNT;
+
+		@Override
+		public String toString() {
+
+			String[] parts = name().split("_");
+
+			StringBuilder builder = new StringBuilder();
+
+			for (String part : parts) {
+				String lowerCase = part.toLowerCase(Locale.US);
+				builder.append(builder.length() == 0 ? lowerCase : StringUtils.capitalize(lowerCase));
+			}
+
+			return "$" + builder.toString();
+		}
+	}
+
+	static class Operation implements AggregationOperation {
+
+		private final Keyword op;
+		private final String key;
+		private final String reference;
+		private final Object value;
+
+		public Operation(Keyword op, String key, String reference, Object value) {
+
+			this.op = op;
+			this.key = key;
+			this.reference = reference;
+			this.value = value;
+		}
+
+		public Operation withAlias(String key) {
+			return new Operation(op, key, reference, value);
+		}
+
+		public ExposedField asField() {
+			return new ExposedField(key, true);
+		}
+
+		public DBObject toDBObject(AggregationOperationContext context) {
+			return new BasicDBObject(key, new BasicDBObject(op.toString(), getValue(context)));
+		}
+
+		public Object getValue(AggregationOperationContext context) {
+			return reference == null ? value : context.getReference(reference).toString();
+		}
+
+		@Override
+		public String toString() {
+			return "Operation [op=" + op + ", key=" + key + ", reference=" + reference + ", value=" + value + "]";
+		}
+	}
+}

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

@@ -0,0 +1,52 @@
+/*
+ * 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.util.Assert;
+
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
+/**
+ * Encapsulates the {@code $limit}-operation
+ * 
+ * @see http://docs.mongodb.org/manual/reference/aggregation/limit/
+ * @author Thomas Darimont
+ * @author Oliver Gierke
+ * @since 1.3
+ */
+class LimitOperation implements AggregationOperation {
+
+	private final long maxElements;
+
+	/**
+	 * @param maxElements Number of documents to consider.
+	 */
+	public LimitOperation(long maxElements) {
+
+		Assert.isTrue(maxElements >= 0, "Maximum number of elements must be greater or equal to zero!");
+		this.maxElements = maxElements;
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 */
+	@Override
+	public DBObject toDBObject(AggregationOperationContext context) {
+		return new BasicDBObject("$limit", maxElements);
+	}
+}

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

@@ -0,0 +1,56 @@
+/*
+ * 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.query.Criteria;
+import org.springframework.util.Assert;
+
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
+/**
+ * Encapsulates the {@code $match}-operation
+ * 
+ * @see http://docs.mongodb.org/manual/reference/aggregation/match/
+ * @author Sebastian Herold
+ * @author Thomas Darimont
+ * @author Oliver Gierke
+ * @since 1.3
+ */
+public class MatchOperation implements AggregationOperation {
+
+	private final Criteria criteria;
+
+	/**
+	 * Creates a new {@link MatchOperation} for the given {@link Criteria}.
+	 * 
+	 * @param criteria must not be {@literal null}.
+	 */
+	public MatchOperation(Criteria criteria) {
+
+		Assert.notNull(criteria, "Criteria must not be null!");
+		this.criteria = criteria;
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 */
+	@Override
+	public DBObject toDBObject(AggregationOperationContext context) {
+		return new BasicDBObject("$match", context.getMappedObject(criteria.getCriteriaObject()));
+	}
+}

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

@@ -0,0 +1,774 @@
+/*
+ * 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 java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+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.ProjectionOperation.ProjectionOperationBuilder.FieldProjection;
+import org.springframework.util.Assert;
+
+import com.mongodb.BasicDBList;
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
+/**
+ * Encapsulates the aggregation framework {@code $project}-operation. Projection of field to be used in an
+ * {@link Aggregation}. A projection is similar to a {@link Field} inclusion/exclusion but more powerful. It can
+ * generate new fields, change values of given field etc.
+ * <p>
+ * 
+ * @see http://docs.mongodb.org/manual/reference/aggregation/project/
+ * @author Tobias Trelle
+ * @author Thomas Darimont
+ * @author Oliver Gierke
+ * @since 1.3
+ */
+public class ProjectionOperation implements FieldsExposingAggregationOperation {
+
+	private static final List<Projection> NONE = Collections.emptyList();
+	private static final String EXCLUSION_ERROR = "Exclusion of field %s not allowed. Projections by the mongodb "
+			+ "aggregation framework only support the exclusion of the %s field!";
+
+	private final List<Projection> projections;
+
+	/**
+	 * Creates a new empty {@link ProjectionOperation}.
+	 */
+	public ProjectionOperation() {
+		this(NONE, NONE);
+	}
+
+	/**
+	 * Creates a new {@link ProjectionOperation} including the given {@link Fields}.
+	 * 
+	 * @param fields must not be {@literal null}.
+	 */
+	public ProjectionOperation(Fields fields) {
+		this(NONE, ProjectionOperationBuilder.FieldProjection.from(fields));
+	}
+
+	/**
+	 * Copy constructor to allow building up {@link ProjectionOperation} instances from already existing
+	 * {@link Projection}s.
+	 * 
+	 * @param current must not be {@literal null}.
+	 * @param projections must not be {@literal null}.
+	 */
+	private ProjectionOperation(List<? extends Projection> current, List<? extends Projection> projections) {
+
+		Assert.notNull(current, "Current projections must not be null!");
+		Assert.notNull(projections, "Projections must not be null!");
+
+		this.projections = new ArrayList<ProjectionOperation.Projection>(current.size() + projections.size());
+		this.projections.addAll(current);
+		this.projections.addAll(projections);
+	}
+
+	/**
+	 * Creates a new {@link ProjectionOperation} with the current {@link Projection}s and the given one.
+	 * 
+	 * @param projection must not be {@literal null}.
+	 * @return
+	 */
+	private ProjectionOperation and(Projection projection) {
+		return new ProjectionOperation(this.projections, Arrays.asList(projection));
+	}
+
+	/**
+	 * Creates a new {@link ProjectionOperation} with the current {@link Projection}s replacing the last current one with
+	 * the given one.
+	 * 
+	 * @param projection must not be {@literal null}.
+	 * @return
+	 */
+	private ProjectionOperation andReplaceLastOneWith(Projection projection) {
+
+		List<Projection> projections = this.projections.isEmpty() ? Collections.<Projection> emptyList() : this.projections
+				.subList(0, this.projections.size() - 1);
+		return new ProjectionOperation(projections, Arrays.asList(projection));
+	}
+
+	/**
+	 * Creates a new {@link ProjectionOperationBuilder} to define a projection for the field with the given name.
+	 * 
+	 * @param name must not be {@literal null} or empty.
+	 * @return
+	 */
+	public ProjectionOperationBuilder and(String name) {
+		return new ProjectionOperationBuilder(name, this, null);
+	}
+
+	public ExpressionProjectionOperationBuilder andExpression(String expression, Object... params) {
+		return new ExpressionProjectionOperationBuilder(expression, this, params);
+	}
+
+	/**
+	 * Excludes the given fields from the projection.
+	 * 
+	 * @param fieldNames must not be {@literal null}.
+	 * @return
+	 */
+	public ProjectionOperation andExclude(String... fieldNames) {
+
+		for (String fieldName : fieldNames) {
+			Assert.isTrue(Fields.UNDERSCORE_ID.equals(fieldName),
+					String.format(EXCLUSION_ERROR, fieldName, Fields.UNDERSCORE_ID));
+		}
+
+		List<FieldProjection> excludeProjections = FieldProjection.from(Fields.fields(fieldNames), false);
+		return new ProjectionOperation(this.projections, excludeProjections);
+	}
+
+	/**
+	 * Includes the given fields into the projection.
+	 * 
+	 * @param fieldNames must not be {@literal null}.
+	 * @return
+	 */
+	public ProjectionOperation andInclude(String... fieldNames) {
+
+		List<FieldProjection> projections = FieldProjection.from(Fields.fields(fieldNames), true);
+		return new ProjectionOperation(this.projections, projections);
+	}
+
+	/**
+	 * Includes the given fields into the projection.
+	 * 
+	 * @param fields must not be {@literal null}.
+	 * @return
+	 */
+	public ProjectionOperation andInclude(Fields fields) {
+		return new ProjectionOperation(this.projections, FieldProjection.from(fields, true));
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields()
+	 */
+	@Override
+	public ExposedFields getFields() {
+
+		ExposedFields fields = null;
+
+		for (Projection projection : projections) {
+			ExposedField field = projection.getExposedField();
+			fields = fields == null ? ExposedFields.from(field) : fields.and(field);
+		}
+
+		return fields;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 */
+	@Override
+	public DBObject toDBObject(AggregationOperationContext context) {
+
+		BasicDBObject fieldObject = new BasicDBObject();
+
+		for (Projection projection : projections) {
+			fieldObject.putAll(projection.toDBObject(context));
+		}
+
+		return new BasicDBObject("$project", fieldObject);
+	}
+
+	/**
+	 * Base class for {@link ProjectionOperationBuilder}s.
+	 * 
+	 * @author Thomas Darimont
+	 */
+	private static abstract class AbstractProjectionOperationBuilder implements AggregationOperation {
+
+		protected final Object value;
+		protected final ProjectionOperation operation;
+
+		/**
+		 * Creates a new {@link AbstractProjectionOperationBuilder} fot the given value and {@link ProjectionOperation}.
+		 * 
+		 * @param value must not be {@literal null}.
+		 * @param operation must not be {@literal null}.
+		 */
+		public AbstractProjectionOperationBuilder(Object value, ProjectionOperation operation) {
+
+			Assert.notNull(value, "value must not be null or empty!");
+			Assert.notNull(operation, "ProjectionOperation must not be null!");
+
+			this.value = value;
+			this.operation = operation;
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 */
+		@Override
+		public DBObject toDBObject(AggregationOperationContext context) {
+			return this.operation.toDBObject(context);
+		}
+
+		/**
+		 * Returns the finally to be applied {@link ProjectionOperation} with the given alias.
+		 * 
+		 * @param alias will never be {@literal null} or empty.
+		 * @return
+		 */
+		public abstract ProjectionOperation as(String alias);
+	}
+
+	/**
+	 * @author Thomas Darimont
+	 */
+	public static class ExpressionProjectionOperationBuilder extends AbstractProjectionOperationBuilder {
+
+		private final Object[] params;
+
+		/**
+		 * Creates a new {@link ExpressionProjectionOperationBuilder} for the given value, {@link ProjectionOperation} and
+		 * parameters.
+		 * 
+		 * @param value must not be {@literal null}.
+		 * @param operation must not be {@literal null}.
+		 * @param parameters
+		 */
+		public ExpressionProjectionOperationBuilder(Object value, ProjectionOperation operation, Object[] parameters) {
+
+			super(value, operation);
+			this.params = parameters;
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.AbstractProjectionOperationBuilder#as(java.lang.String)
+		 */
+		@Override
+		public ProjectionOperation as(String alias) {
+
+			Field expressionField = Fields.field(alias, "expr");
+			return this.operation.and(new ExpressionProjection(expressionField, this.value.toString(), params));
+		}
+
+		/**
+		 * A {@link Projection} based on a SpEL expression.
+		 * 
+		 * @author Thomas Darimont
+		 * @author Oliver Gierke
+		 */
+		static class ExpressionProjection extends Projection {
+
+			private static final SpelExpressionTransformer TRANSFORMER = new SpelExpressionTransformer();
+
+			private final String expression;
+			private final Object[] params;
+
+			/**
+			 * Creates a new {@link ExpressionProjection} for the given field, SpEL expression and parameters.
+			 * 
+			 * @param field must not be {@literal null}.
+			 * @param expression must not be {@literal null} or empty.
+			 * @param parameters must not be {@literal null}.
+			 */
+			public ExpressionProjection(Field field, String expression, Object[] parameters) {
+
+				super(field);
+
+				Assert.hasText(expression, "Expression must not be null!");
+				Assert.notNull(parameters, "Parameters must not be null!");
+
+				this.expression = expression;
+				this.params = parameters;
+			}
+
+			/* 
+			 * (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+			 */
+			@Override
+			public DBObject toDBObject(AggregationOperationContext context) {
+				return new BasicDBObject(getExposedField().getName(), TRANSFORMER.transform(expression, context, params));
+			}
+		}
+	}
+
+	/**
+	 * Builder for {@link ProjectionOperation}s on a field.
+	 * 
+	 * @author Oliver Gierke
+	 * @author Thomas Darimont
+	 */
+	public static class ProjectionOperationBuilder extends AbstractProjectionOperationBuilder {
+
+		private final String name;
+		private final ProjectionOperation operation;
+		private final OperationProjection previousProjection;
+
+		/**
+		 * Creates a new {@link ProjectionOperationBuilder} for the field with the given name on top of the given
+		 * {@link ProjectionOperation}.
+		 * 
+		 * @param name must not be {@literal null} or empty.
+		 * @param operation must not be {@literal null}.
+		 * @param previousProjection the previous operation projection, may be {@literal null}.
+		 */
+		public ProjectionOperationBuilder(String name, ProjectionOperation operation, OperationProjection previousProjection) {
+			super(name, operation);
+
+			this.name = name;
+			this.operation = operation;
+			this.previousProjection = previousProjection;
+		}
+
+		/**
+		 * Projects the result of the previous operation onto the current field. Will automatically add an exclusion for
+		 * {@code _id} as what would be held in it by default will now go into the field just projected into.
+		 * 
+		 * @return
+		 */
+		public ProjectionOperation previousOperation() {
+
+			return this.operation.andExclude(Fields.UNDERSCORE_ID) //
+					.and(new PreviousOperationProjection(name));
+		}
+
+		/**
+		 * Defines a nested field binding for the current field.
+		 * 
+		 * @param fields must not be {@literal null}.
+		 * @return
+		 */
+		public ProjectionOperation nested(Fields fields) {
+			return this.operation.and(new NestedFieldProjection(name, fields));
+		}
+
+		/**
+		 * Allows to specify an alias for the previous projection operation.
+		 * 
+		 * @param string
+		 * @return
+		 */
+		@Override
+		public ProjectionOperation as(String alias) {
+
+			if (this.previousProjection != null) {
+				return this.operation.andReplaceLastOneWith(this.previousProjection.withAlias(alias));
+			} else {
+				return this.operation.and(new FieldProjection(Fields.field(alias, name), null));
+			}
+		}
+
+		/**
+		 * Generates an {@code $add} expression that adds the given number to the previously mentioned field.
+		 * 
+		 * @param number
+		 * @return
+		 */
+		public ProjectionOperationBuilder plus(Number number) {
+
+			Assert.notNull(number, "Number must not be null!");
+			return project("add", number);
+		}
+
+		/**
+		 * Generates an {@code $add} expression that adds the value of the given field to the previously mentioned field.
+		 * 
+		 * @param fieldReference
+		 * @return
+		 */
+		public ProjectionOperationBuilder plus(String fieldReference) {
+
+			Assert.notNull(fieldReference, "Field reference must not be null!");
+			return project("add", Fields.field(fieldReference));
+		}
+
+		/**
+		 * Generates an {@code $subtract} expression that subtracts the given number to the previously mentioned field.
+		 * 
+		 * @param number
+		 * @return
+		 */
+		public ProjectionOperationBuilder minus(Number number) {
+
+			Assert.notNull(number, "Number must not be null!");
+			return project("subtract", number);
+		}
+
+		/**
+		 * Generates an {@code $subtract} expression that subtracts the value of the given field to the previously mentioned
+		 * field.
+		 * 
+		 * @param fieldReference
+		 * @return
+		 */
+		public ProjectionOperationBuilder minus(String fieldReference) {
+
+			Assert.notNull(fieldReference, "Field reference must not be null!");
+			return project("subtract", Fields.field(fieldReference));
+		}
+
+		/**
+		 * Generates an {@code $multiply} expression that multiplies the given number with the previously mentioned field.
+		 * 
+		 * @param number
+		 * @return
+		 */
+		public ProjectionOperationBuilder multiply(Number number) {
+
+			Assert.notNull(number, "Number must not be null!");
+			return project("multiply", number);
+		}
+
+		/**
+		 * Generates an {@code $multiply} expression that multiplies the value of the given field with the previously
+		 * mentioned field.
+		 * 
+		 * @param fieldReference
+		 * @return
+		 */
+		public ProjectionOperationBuilder multiply(String fieldReference) {
+
+			Assert.notNull(fieldReference, "Field reference must not be null!");
+			return project("multiply", Fields.field(fieldReference));
+		}
+
+		/**
+		 * Generates an {@code $divide} expression that divides the previously mentioned field by the given number.
+		 * 
+		 * @param number
+		 * @return
+		 */
+		public ProjectionOperationBuilder divide(Number number) {
+
+			Assert.notNull(number, "Number must not be null!");
+			Assert.isTrue(Math.abs(number.intValue()) != 0, "Number must not be zero!");
+			return project("divide", number);
+		}
+
+		/**
+		 * Generates an {@code $divide} expression that divides the value of the given field by the previously mentioned
+		 * field.
+		 * 
+		 * @param fieldReference
+		 * @return
+		 */
+		public ProjectionOperationBuilder divide(String fieldReference) {
+
+			Assert.notNull(fieldReference, "Field reference must not be null!");
+			return project("divide", Fields.field(fieldReference));
+		}
+
+		/**
+		 * Generates an {@code $mod} expression that divides the previously mentioned field by the given number and returns
+		 * the remainder.
+		 * 
+		 * @param number
+		 * @return
+		 */
+		public ProjectionOperationBuilder mod(Number number) {
+
+			Assert.notNull(number, "Number must not be null!");
+			Assert.isTrue(Math.abs(number.intValue()) != 0, "Number must not be zero!");
+			return project("mod", number);
+		}
+
+		/**
+		 * Generates an {@code $mod} expression that divides the value of the given field by the previously mentioned field
+		 * and returns the remainder.
+		 * 
+		 * @param fieldReference
+		 * @return
+		 */
+		public ProjectionOperationBuilder mod(String fieldReference) {
+
+			Assert.notNull(fieldReference, "Field reference must not be null!");
+			return project("mod", Fields.field(fieldReference));
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 */
+		@Override
+		public DBObject toDBObject(AggregationOperationContext context) {
+			return this.operation.toDBObject(context);
+		}
+
+		/**
+		 * Adds a generic projection for the current field.
+		 * 
+		 * @param operation the operation key, e.g. {@code $add}.
+		 * @param values the values to be set for the projection operation.
+		 * @return
+		 */
+		public ProjectionOperationBuilder project(String operation, Object... values) {
+			OperationProjection projectionOperation = new OperationProjection(Fields.field(name), operation, values);
+			return new ProjectionOperationBuilder(name, this.operation.and(projectionOperation), projectionOperation);
+		}
+
+		/**
+		 * A {@link Projection} to pull in the result of the previous operation.
+		 * 
+		 * @author Oliver Gierke
+		 */
+		static class PreviousOperationProjection extends Projection {
+
+			private final String name;
+
+			/**
+			 * Creates a new {@link PreviousOperationProjection} for the field with the given name.
+			 * 
+			 * @param name must not be {@literal null} or empty.
+			 */
+			public PreviousOperationProjection(String name) {
+				super(Fields.field(name));
+				this.name = name;
+			}
+
+			/* 
+			 * (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+			 */
+			@Override
+			public DBObject toDBObject(AggregationOperationContext context) {
+				return new BasicDBObject(name, Fields.UNDERSCORE_ID_REF);
+			}
+		}
+
+		/**
+		 * A {@link FieldProjection} to map a result of a previous {@link AggregationOperation} to a new field.
+		 * 
+		 * @author Oliver Gierke
+		 * @author Thomas Darimont
+		 */
+		static class FieldProjection extends Projection {
+
+			private final Field field;
+			private final Object value;
+
+			/**
+			 * Creates a new {@link FieldProjection} for the field of the given name, assigning the given value.
+			 * 
+			 * @param name must not be {@literal null} or empty.
+			 * @param value
+			 */
+			public FieldProjection(String name, Object value) {
+				this(Fields.field(name), value);
+			}
+
+			private FieldProjection(Field field, Object value) {
+
+				super(field);
+
+				this.field = field;
+				this.value = value;
+			}
+
+			/**
+			 * Factory method to easily create {@link FieldProjection}s for the given {@link Fields}. Fields are projected as
+			 * references with their given name. A field {@code foo} will be projected as: {@code foo : 1 } .
+			 * 
+			 * @param fields the {@link Fields} to in- or exclude, must not be {@literal null}.
+			 * @return
+			 */
+			public static List<? extends Projection> from(Fields fields) {
+				return from(fields, null);
+			}
+
+			/**
+			 * Factory method to easily create {@link FieldProjection}s for the given {@link Fields}.
+			 * 
+			 * @param fields the {@link Fields} to in- or exclude, must not be {@literal null}.
+			 * @param value to use for the given field.
+			 * @return
+			 */
+			public static List<FieldProjection> from(Fields fields, Object value) {
+
+				Assert.notNull(fields, "Fields must not be null!");
+				List<FieldProjection> projections = new ArrayList<FieldProjection>();
+
+				for (Field field : fields) {
+					projections.add(new FieldProjection(field, value));
+				}
+
+				return projections;
+			}
+
+			/* 
+			 * (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+			 */
+			@Override
+			public DBObject toDBObject(AggregationOperationContext context) {
+				return new BasicDBObject(field.getName(), renderFieldValue(context));
+			}
+
+			private Object renderFieldValue(AggregationOperationContext context) {
+
+				// implicit reference or explicit include?
+				if (value == null || Boolean.TRUE.equals(value)) {
+
+					// check whether referenced field exists in the context
+					FieldReference reference = context.getReference(field.getTarget());
+					return reference.isSynthetic() && !field.isAliased() ? 1 : reference.toString();
+
+				} else if (Boolean.FALSE.equals(value)) {
+
+					// render field as excluded
+					return 0;
+				}
+
+				return value;
+			}
+		}
+
+		static class OperationProjection extends Projection {
+
+			private final Field field;
+			private final String operation;
+			private final List<Object> values;
+
+			/**
+			 * Creates a new {@link OperationProjection} for the given field.
+			 * 
+			 * @param name the name of the field to add the operation projection for, must not be {@literal null} or empty.
+			 * @param operation the actual operation key, must not be {@literal null} or empty.
+			 * @param values the values to pass into the operation, must not be {@literal null}.
+			 */
+			public OperationProjection(Field field, String operation, Object[] values) {
+
+				super(field);
+
+				Assert.hasText(operation, "Operation must not be null or empty!");
+				Assert.notNull(values, "Values must not be null!");
+
+				this.field = field;
+				this.operation = operation;
+				this.values = Arrays.asList(values);
+			}
+
+			/* 
+			 * (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+			 */
+			@Override
+			public DBObject toDBObject(AggregationOperationContext context) {
+
+				BasicDBList values = new BasicDBList();
+				values.addAll(buildReferences(context));
+
+				DBObject inner = new BasicDBObject("$" + operation, values);
+
+				return new BasicDBObject(this.field.getName(), inner);
+			}
+
+			private List<Object> buildReferences(AggregationOperationContext context) {
+
+				List<Object> result = new ArrayList<Object>(values.size());
+				result.add(context.getReference(field.getTarget()).toString());
+
+				for (Object element : values) {
+					result.add(element instanceof Field ? context.getReference((Field) element).toString() : element);
+				}
+
+				return result;
+			}
+
+			/**
+			 * Creates a new instance of this {@link OperationProjection} with the given alias.
+			 * 
+			 * @param alias the alias to set
+			 * @return
+			 */
+			public OperationProjection withAlias(String alias) {
+				return new OperationProjection(Fields.field(alias, this.field.getName()), operation, values.toArray());
+			}
+		}
+
+		static class NestedFieldProjection extends Projection {
+
+			private final String name;
+			private final Fields fields;
+
+			public NestedFieldProjection(String name, Fields fields) {
+
+				super(Fields.field(name));
+				this.name = name;
+				this.fields = fields;
+			}
+
+			/* 
+			 * (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+			 */
+			@Override
+			public DBObject toDBObject(AggregationOperationContext context) {
+
+				DBObject nestedObject = new BasicDBObject();
+
+				for (Field field : fields) {
+					nestedObject.put(field.getName(), context.getReference(field.getTarget()).toString());
+				}
+
+				return new BasicDBObject(name, nestedObject);
+			}
+		}
+	}
+
+	/**
+	 * Base class for {@link Projection} implementations.
+	 * 
+	 * @author Oliver Gierke
+	 */
+	private static abstract class Projection {
+
+		private final ExposedField field;
+
+		/**
+		 * Creates new {@link Projection} for the given {@link Field}.
+		 * 
+		 * @param field must not be {@literal null}.
+		 */
+		public Projection(Field field) {
+
+			Assert.notNull(field, "Field must not be null!");
+			this.field = new ExposedField(field, true);
+		}
+
+		/**
+		 * Returns the field exposed by the {@link Projection}.
+		 * 
+		 * @return will never be {@literal null}.
+		 */
+		public ExposedField getExposedField() {
+			return field;
+		}
+
+		/**
+		 * Renders the current {@link Projection} into a {@link DBObject} based on the given
+		 * {@link AggregationOperationContext}.
+		 * 
+		 * @param context will never be {@literal null}.
+		 * @return
+		 */
+		public abstract DBObject toDBObject(AggregationOperationContext context);
+	}
+
+}

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

@@ -0,0 +1,54 @@
+/*
+ * 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.util.Assert;
+
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
+/**
+ * Encapsulates the aggregation framework {@code $skip}-operation.
+ * 
+ * @see http://docs.mongodb.org/manual/reference/aggregation/skip/
+ * @author Thomas Darimont
+ * @author Oliver Gierke
+ * @since 1.3
+ */
+public class SkipOperation implements AggregationOperation {
+
+	private final long skipCount;
+
+	/**
+	 * Creates a new {@link SkipOperation} skipping the given number of elements.
+	 * 
+	 * @param skipCount number of documents to skip.
+	 */
+	public SkipOperation(long skipCount) {
+
+		Assert.isTrue(skipCount >= 0, "Skip count must not be negative!");
+		this.skipCount = skipCount;
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 */
+	@Override
+	public DBObject toDBObject(AggregationOperationContext context) {
+		return new BasicDBObject("$skip", skipCount);
+	}
+}

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

@@ -0,0 +1,76 @@
+/*
+ * 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.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.data.domain.Sort.Order;
+import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
+import org.springframework.util.Assert;
+
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
+/**
+ * Encapsulates the aggregation framework {@code $sort}-operation.
+ * 
+ * @see http://docs.mongodb.org/manual/reference/aggregation/sort/#pipe._S_sort
+ * @author Thomas Darimont
+ * @author Oliver Gierke
+ * @since 1.3
+ */
+public class SortOperation implements AggregationOperation {
+
+	private final Sort sort;
+
+	/**
+	 * Creates a new {@link SortOperation} for the given {@link Sort} instance.
+	 * 
+	 * @param sort must not be {@literal null}.
+	 */
+	public SortOperation(Sort sort) {
+
+		Assert.notNull(sort, "Sort must not be null!");
+		this.sort = sort;
+	}
+
+	public SortOperation and(Direction direction, String... fields) {
+		return and(new Sort(direction, fields));
+	}
+
+	public SortOperation and(Sort sort) {
+		return new SortOperation(this.sort.and(sort));
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 */
+	@Override
+	public DBObject toDBObject(AggregationOperationContext context) {
+
+		BasicDBObject object = new BasicDBObject();
+
+		for (Order order : sort) {
+
+			// Check reference
+			FieldReference reference = context.getReference(order.getProperty());
+			object.put(reference.getRaw(), order.isAscending() ? 1 : -1);
+		}
+
+		return new BasicDBObject("$sort", object);
+	}
+}

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

@@ -0,0 +1,513 @@
+/*
+ * 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 static org.springframework.data.mongodb.util.DBObjectUtils.*;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.springframework.core.GenericTypeResolver;
+import org.springframework.data.mongodb.core.spel.ExpressionNode;
+import org.springframework.data.mongodb.core.spel.ExpressionTransformationContextSupport;
+import org.springframework.data.mongodb.core.spel.LiteralNode;
+import org.springframework.data.mongodb.core.spel.MethodReferenceNode;
+import org.springframework.data.mongodb.core.spel.OperatorNode;
+import org.springframework.expression.spel.ExpressionState;
+import org.springframework.expression.spel.SpelNode;
+import org.springframework.expression.spel.SpelParserConfiguration;
+import org.springframework.expression.spel.ast.CompoundExpression;
+import org.springframework.expression.spel.ast.Indexer;
+import org.springframework.expression.spel.ast.InlineList;
+import org.springframework.expression.spel.ast.PropertyOrFieldReference;
+import org.springframework.expression.spel.standard.SpelExpression;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.expression.spel.support.StandardEvaluationContext;
+import org.springframework.util.Assert;
+import org.springframework.util.NumberUtils;
+
+import com.mongodb.BasicDBList;
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
+/**
+ * Renders the AST of a SpEL expression as a MongoDB Aggregation Framework projection expression.
+ * 
+ * @author Thomas Darimont
+ */
+class SpelExpressionTransformer implements AggregationExpressionTransformer {
+
+	// TODO: remove explicit usage of a configuration once SPR-11031 gets fixed
+	private static final SpelParserConfiguration CONFIG = new SpelParserConfiguration(false, false);
+	private static final SpelExpressionParser PARSER = new SpelExpressionParser(CONFIG);
+	private final List<ExpressionNodeConversion<? extends ExpressionNode>> conversions;
+
+	/**
+	 * Creates a new {@link SpelExpressionTransformer}.
+	 */
+	public SpelExpressionTransformer() {
+
+		List<ExpressionNodeConversion<? extends ExpressionNode>> conversions = new ArrayList<ExpressionNodeConversion<? extends ExpressionNode>>();
+		conversions.add(new OperatorNodeConversion(this));
+		conversions.add(new LiteralNodeConversion(this));
+		conversions.add(new IndexerNodeConversion(this));
+		conversions.add(new InlineListNodeConversion(this));
+		conversions.add(new PropertyOrFieldReferenceNodeConversion(this));
+		conversions.add(new CompoundExpressionNodeConversion(this));
+		conversions.add(new MethodReferenceNodeConversion(this));
+
+		this.conversions = Collections.unmodifiableList(conversions);
+	}
+
+	/**
+	 * Transforms the given SpEL expression to a corresponding MongoDB expression against the given
+	 * {@link AggregationOperationContext} {@code context}.
+	 * <p>
+	 * Exposes the given @{code params} as <code>[0] ... [n]</code>.
+	 * 
+	 * @param expression must not be {@literal null}
+	 * @param context must not be {@literal null}
+	 * @param params must not be {@literal null}
+	 * @return
+	 */
+	public Object transform(String expression, AggregationOperationContext context, Object... params) {
+
+		Assert.notNull(expression, "Expression must not be null!");
+		Assert.notNull(context, "AggregationOperationContext must not be null!");
+		Assert.notNull(params, "Parameters must not be null!");
+
+		SpelExpression spelExpression = (SpelExpression) PARSER.parseExpression(expression);
+		ExpressionState state = new ExpressionState(new StandardEvaluationContext(params), CONFIG);
+		ExpressionNode node = ExpressionNode.from(spelExpression.getAST(), state);
+
+		return transform(new AggregationExpressionTransformationContext<ExpressionNode>(node, null, null, context));
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.spel.ExpressionTransformer#transform(org.springframework.data.mongodb.core.spel.ExpressionTransformationContextSupport)
+	 */
+	public Object transform(AggregationExpressionTransformationContext<ExpressionNode> context) {
+		return lookupConversionFor(context.getCurrentNode()).convert(context);
+	}
+
+	/**
+	 * Returns an appropriate {@link ExpressionNodeConversion} for the given {@code node}. Throws an
+	 * {@link IllegalArgumentException} if no conversion could be found.
+	 * 
+	 * @param node
+	 * @return the appropriate {@link ExpressionNodeConversion} for the given {@link ExpressionNode}.
+	 */
+	@SuppressWarnings("unchecked")
+	private ExpressionNodeConversion<ExpressionNode> lookupConversionFor(ExpressionNode node) {
+
+		for (ExpressionNodeConversion<? extends ExpressionNode> candidate : conversions) {
+			if (candidate.supports(node)) {
+				return (ExpressionNodeConversion<ExpressionNode>) candidate;
+			}
+		}
+
+		throw new IllegalArgumentException("Unsupported Element: " + node + " Type: " + node.getClass()
+				+ " You probably have a syntax error in your SpEL expression!");
+	}
+
+	/**
+	 * Abstract base class for {@link SpelNode} to (Db)-object conversions.
+	 * 
+	 * @author Thomas Darimont
+	 * @author Oliver Gierke
+	 */
+	private static abstract class ExpressionNodeConversion<T extends ExpressionNode> implements
+			AggregationExpressionTransformer {
+
+		private final AggregationExpressionTransformer transformer;
+		private final Class<? extends ExpressionNode> nodeType;
+
+		/**
+		 * Creates a new {@link ExpressionNodeConversion}.
+		 * 
+		 * @param transformer must not be {@literal null}.
+		 */
+		@SuppressWarnings("unchecked")
+		public ExpressionNodeConversion(AggregationExpressionTransformer transformer) {
+
+			Assert.notNull(transformer, "Transformer must not be null!");
+
+			this.nodeType = (Class<? extends ExpressionNode>) GenericTypeResolver.resolveTypeArgument(this.getClass(),
+					ExpressionNodeConversion.class);
+			this.transformer = transformer;
+		}
+
+		/**
+		 * Returns whether the current conversion supports the given {@link ExpressionNode}. By default we will match the
+		 * node type against the genric type the subclass types the type parameter to.
+		 * 
+		 * @param node will never be {@literal null}.
+		 * @return true if {@literal this} conversion can be applied to the given {@code node}.
+		 */
+		protected boolean supports(ExpressionNode node) {
+			return nodeType.equals(node.getClass());
+		}
+
+		/**
+		 * Triggers the transformation for the given {@link ExpressionNode} and the given current context.
+		 * 
+		 * @param node must not be {@literal null}.
+		 * @param context must not be {@literal null}.
+		 * @return
+		 */
+		protected Object transform(ExpressionNode node, AggregationExpressionTransformationContext<?> context) {
+
+			Assert.notNull(node, "ExpressionNode must not be null!");
+			Assert.notNull(context, "AggregationExpressionTransformationContext must not be null!");
+
+			return transform(node, context.getParentNode(), null, context);
+		}
+
+		/**
+		 * Triggers the transformation with the given new {@link ExpressionNode}, new parent node, the current operation and
+		 * the previous context.
+		 * 
+		 * @param node must not be {@literal null}.
+		 * @param parent
+		 * @param operation
+		 * @param context must not be {@literal null}.
+		 * @return
+		 */
+		protected Object transform(ExpressionNode node, ExpressionNode parent, DBObject operation,
+				AggregationExpressionTransformationContext<?> context) {
+
+			Assert.notNull(node, "ExpressionNode must not be null!");
+			Assert.notNull(context, "AggregationExpressionTransformationContext must not be null!");
+
+			return transform(new AggregationExpressionTransformationContext<ExpressionNode>(node, parent, operation,
+					context.getAggregationContext()));
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.NodeConversion#transform(org.springframework.data.mongodb.core.aggregation.AggregationExpressionTransformer.AggregationExpressionTransformationContext)
+		 */
+		@Override
+		public Object transform(AggregationExpressionTransformationContext<ExpressionNode> context) {
+			return transformer.transform(context);
+		}
+
+		/**
+		 * Performs the actual conversion from {@link SpelNode} to the corresponding representation for MongoDB.
+		 * 
+		 * @param context
+		 * @return
+		 */
+		protected abstract Object convert(AggregationExpressionTransformationContext<T> context);
+	}
+
+	/**
+	 * A {@link ExpressionNodeConversion} that converts arithmetic operations.
+	 * 
+	 * @author Thomas Darimont
+	 */
+	private static class OperatorNodeConversion extends ExpressionNodeConversion<OperatorNode> {
+
+		public OperatorNodeConversion(AggregationExpressionTransformer transformer) {
+			super(transformer);
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.SpelNodeWrapper#convertSpelNodeToMongoObjectExpression(org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.ExpressionConversionContext)
+		 */
+		@Override
+		protected Object convert(AggregationExpressionTransformationContext<OperatorNode> context) {
+
+			OperatorNode currentNode = context.getCurrentNode();
+
+			DBObject operationObject = createOperationObjectAndAddToPreviousArgumentsIfNecessary(context, currentNode);
+			Object leftResult = transform(currentNode.getLeft(), currentNode, operationObject, context);
+
+			if (currentNode.isUnaryMinus()) {
+				return convertUnaryMinusOp(context, leftResult);
+			}
+
+			// we deliberately ignore the RHS result
+			transform(currentNode.getRight(), currentNode, operationObject, context);
+
+			return operationObject;
+		}
+
+		private DBObject createOperationObjectAndAddToPreviousArgumentsIfNecessary(
+				AggregationExpressionTransformationContext<OperatorNode> context, OperatorNode currentNode) {
+
+			DBObject nextDbObject = new BasicDBObject(currentNode.getMongoOperator(), new BasicDBList());
+
+			if (!context.hasPreviousOperation()) {
+				return nextDbObject;
+			}
+
+			if (context.parentIsSameOperation()) {
+
+				// same operator applied in a row e.g. 1 + 2 + 3 carry on with the operation and render as $add: [1, 2 ,3]
+				nextDbObject = context.getPreviousOperationObject();
+			} else if (!currentNode.isUnaryOperator()) {
+
+				// different operator -> add context object for next level to list if arguments of previous expression
+				context.addToPreviousOperation(nextDbObject);
+			}
+
+			return nextDbObject;
+		}
+
+		private Object convertUnaryMinusOp(ExpressionTransformationContextSupport<OperatorNode> context, Object leftResult) {
+
+			Object result = leftResult instanceof Number ? leftResult
+					: new BasicDBObject("$multiply", dbList(-1, leftResult));
+
+			if (leftResult != null && context.hasPreviousOperation()) {
+				context.addToPreviousOperation(result);
+			}
+
+			return result;
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.SpelNodeWrapper#supports(java.lang.Class)
+		 */
+		@Override
+		protected boolean supports(ExpressionNode node) {
+			return node.isMathematicalOperation();
+		}
+	}
+
+	/**
+	 * A {@link ExpressionNodeConversion} that converts indexed expressions.
+	 * 
+	 * @author Thomas Darimont
+	 * @author Oliver Gierke
+	 */
+	private static class IndexerNodeConversion extends ExpressionNodeConversion<ExpressionNode> {
+
+		public IndexerNodeConversion(AggregationExpressionTransformer transformer) {
+			super(transformer);
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.SpelNodeWrapper#convertSpelNodeToMongoObjectExpression(org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.ExpressionConversionContext)
+		 */
+		@Override
+		protected Object convert(AggregationExpressionTransformationContext<ExpressionNode> context) {
+			return context.addToPreviousOrReturn(context.getCurrentNode().getValue());
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.NodeConversion#supports(org.springframework.data.mongodb.core.spel.ExpressionNode)
+		 */
+		@Override
+		protected boolean supports(ExpressionNode node) {
+			return node.isOfType(Indexer.class);
+		}
+	}
+
+	/**
+	 * A {@link ExpressionNodeConversion} that converts in-line list expressions.
+	 * 
+	 * @author Thomas Darimont
+	 */
+	private static class InlineListNodeConversion extends ExpressionNodeConversion<ExpressionNode> {
+
+		public InlineListNodeConversion(AggregationExpressionTransformer transformer) {
+			super(transformer);
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.SpelNodeWrapper#convertSpelNodeToMongoObjectExpression(org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.ExpressionConversionContext)
+		 */
+		@Override
+		protected Object convert(AggregationExpressionTransformationContext<ExpressionNode> context) {
+
+			ExpressionNode currentNode = context.getCurrentNode();
+
+			if (!currentNode.hasChildren()) {
+				return null;
+			}
+
+			// just take the first item
+			return transform(currentNode.getChild(0), currentNode, null, context);
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.NodeConversion#supports(org.springframework.data.mongodb.core.spel.ExpressionNode)
+		 */
+		@Override
+		protected boolean supports(ExpressionNode node) {
+			return node.isOfType(InlineList.class);
+		}
+	}
+
+	/**
+	 * A {@link ExpressionNodeConversion} that converts property or field reference expressions.
+	 * 
+	 * @author Thomas Darimont
+	 * @author Oliver Gierke
+	 */
+	private static class PropertyOrFieldReferenceNodeConversion extends ExpressionNodeConversion<ExpressionNode> {
+
+		public PropertyOrFieldReferenceNodeConversion(AggregationExpressionTransformer transformer) {
+			super(transformer);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.NodeConversion#convert(org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.ExpressionTransformationContext)
+		 */
+		@Override
+		protected Object convert(AggregationExpressionTransformationContext<ExpressionNode> context) {
+
+			String fieldReference = context.getFieldReference().toString();
+			return context.addToPreviousOrReturn(fieldReference);
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.NodeConversion#supports(org.springframework.data.mongodb.core.spel.ExpressionNode)
+		 */
+		@Override
+		protected boolean supports(ExpressionNode node) {
+			return node.isOfType(PropertyOrFieldReference.class);
+		}
+	}
+
+	/**
+	 * A {@link ExpressionNodeConversion} that converts literal expressions.
+	 * 
+	 * @author Thomas Darimont
+	 * @author Oliver Gierke
+	 */
+	private static class LiteralNodeConversion extends ExpressionNodeConversion<LiteralNode> {
+
+		public LiteralNodeConversion(AggregationExpressionTransformer transformer) {
+			super(transformer);
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.SpelNodeWrapper#convertSpelNodeToMongoObjectExpression(org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.ExpressionConversionContext)
+		 */
+		@Override
+		@SuppressWarnings("unchecked")
+		protected Object convert(AggregationExpressionTransformationContext<LiteralNode> context) {
+
+			LiteralNode node = context.getCurrentNode();
+			Object value = node.getValue();
+
+			if (context.hasPreviousOperation()) {
+
+				if (node.isUnaryMinus(context.getParentNode())) {
+					// unary minus operator
+					return NumberUtils.convertNumberToTargetClass(((Number) value).doubleValue() * -1,
+							(Class<Number>) value.getClass()); // retain type, e.g. int to -int
+				}
+
+				return context.addToPreviousOperation(value);
+			}
+
+			return value;
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.SpelNodeWrapper#supports(org.springframework.expression.spel.SpelNode)
+		 */
+		@Override
+		protected boolean supports(ExpressionNode node) {
+			return node.isLiteral();
+		}
+	}
+
+	/**
+	 * A {@link ExpressionNodeConversion} that converts method reference expressions.
+	 * 
+	 * @author Thomas Darimont
+	 * @author Oliver Gierke
+	 */
+	private static class MethodReferenceNodeConversion extends ExpressionNodeConversion<MethodReferenceNode> {
+
+		public MethodReferenceNodeConversion(AggregationExpressionTransformer transformer) {
+			super(transformer);
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.SpelNodeWrapper#convertSpelNodeToMongoObjectExpression(org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.ExpressionConversionContext)
+		 */
+		@Override
+		protected Object convert(AggregationExpressionTransformationContext<MethodReferenceNode> context) {
+
+			MethodReferenceNode node = context.getCurrentNode();
+			List<Object> args = new ArrayList<Object>();
+
+			for (ExpressionNode childNode : node) {
+				args.add(transform(childNode, context));
+			}
+
+			return context.addToPreviousOrReturn(new BasicDBObject(node.getMethodName(), dbList(args.toArray())));
+		}
+	}
+
+	/**
+	 * A {@link ExpressionNodeConversion} that converts method compound expressions.
+	 * 
+	 * @author Thomas Darimont
+	 * @author Oliver Gierke
+	 */
+	private static class CompoundExpressionNodeConversion extends ExpressionNodeConversion<ExpressionNode> {
+
+		public CompoundExpressionNodeConversion(AggregationExpressionTransformer transformer) {
+			super(transformer);
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.SpelNodeWrapper#convertSpelNodeToMongoObjectExpression(org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.ExpressionConversionContext)
+		 */
+		@Override
+		protected Object convert(AggregationExpressionTransformationContext<ExpressionNode> context) {
+
+			ExpressionNode currentNode = context.getCurrentNode();
+
+			if (currentNode.hasfirstChildNotOfType(Indexer.class)) {
+				// we have a property path expression like: foo.bar -> render as reference
+				return context.getFieldReference().toString();
+			}
+
+			return context.addToPreviousOrReturn(currentNode.getValue());
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.NodeConversion#supports(org.springframework.data.mongodb.core.spel.ExpressionNode)
+		 */
+		@Override
+		protected boolean supports(ExpressionNode node) {
+			return node.isOfType(CompoundExpression.class);
+		}
+	}
+}

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

@@ -0,0 +1,101 @@
+/*
+ * 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 static org.springframework.data.mongodb.core.aggregation.Fields.*;
+
+import org.springframework.data.mapping.PropertyPath;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mapping.context.PersistentPropertyPath;
+import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
+import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.util.Assert;
+
+import com.mongodb.DBObject;
+
+/**
+ * {@link AggregationOperationContext} aware of a particular type and a {@link MappingContext} to potentially translate
+ * property references into document field names.
+ * 
+ * @author Oliver Gierke
+ * @since 1.3
+ */
+public class TypeBasedAggregationOperationContext implements AggregationOperationContext {
+
+	private final Class<?> type;
+	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
+	private final QueryMapper mapper;
+
+	/**
+	 * Creates a new {@link TypeBasedAggregationOperationContext} for the given type, {@link MappingContext} and
+	 * {@link QueryMapper}.
+	 * 
+	 * @param type must not be {@literal null}.
+	 * @param mappingContext must not be {@literal null}.
+	 * @param mapper must not be {@literal null}.
+	 */
+	public TypeBasedAggregationOperationContext(Class<?> type,
+			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext, QueryMapper mapper) {
+
+		Assert.notNull(type, "Type must not be null!");
+		Assert.notNull(mappingContext, "MappingContext must not be null!");
+		Assert.notNull(mapper, "QueryMapper must not be null!");
+
+		this.type = type;
+		this.mappingContext = mappingContext;
+		this.mapper = mapper;
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(com.mongodb.DBObject)
+	 */
+	@Override
+	public DBObject getMappedObject(DBObject dbObject) {
+		return mapper.getMappedObject(dbObject, mappingContext.getPersistentEntity(type));
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(org.springframework.data.mongodb.core.aggregation.Field)
+	 */
+	@Override
+	public FieldReference getReference(Field field) {
+
+		PropertyPath.from(field.getTarget(), type);
+		return getReferenceFor(field);
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(java.lang.String)
+	 */
+	@Override
+	public FieldReference getReference(String name) {
+
+		PersistentPropertyPath<MongoPersistentProperty> propertyPath = mappingContext.getPersistentPropertyPath(name, type);
+
+		return getReferenceFor(field(propertyPath.getLeafProperty().getName(),
+				propertyPath.toDotPath(MongoPersistentProperty.PropertyToFieldNameConverter.INSTANCE)));
+	}
+
+	private FieldReference getReferenceFor(Field field) {
+		return new FieldReference(new ExposedField(field, true));
+	}
+}

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

@@ -0,0 +1,51 @@
+/*
+ * 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.util.Assert;
+
+/**
+ * A {@code TypedAggregation} is a special {@link Aggregation} that holds information of the input aggregation type.
+ * 
+ * @author Thomas Darimont
+ * @author Oliver Gierke
+ */
+public class TypedAggregation<I> extends Aggregation {
+
+	private final Class<I> inputType;
+
+	/**
+	 * Creates a new {@link TypedAggregation} from the given {@link AggregationOperation}s.
+	 * 
+	 * @param operations must not be {@literal null} or empty.
+	 */
+	public TypedAggregation(Class<I> inputType, AggregationOperation... operations) {
+
+		super(operations);
+
+		Assert.notNull(inputType, "Input type must not be null!");
+		this.inputType = inputType;
+	}
+
+	/**
+	 * Returns the input type for the {@link Aggregation}.
+	 * 
+	 * @return the inputType will never be {@literal null}.
+	 */
+	public Class<I> getInputType() {
+		return inputType;
+	}
+}

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

@@ -0,0 +1,55 @@
+/*
+ * 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.ExposedField;
+import org.springframework.util.Assert;
+
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
+/**
+ * Encapsulates the aggregation framework {@code $unwind}-operation.
+ * 
+ * @see http://docs.mongodb.org/manual/reference/aggregation/unwind/#pipe._S_unwind
+ * @author Thomas Darimont
+ * @author Oliver Gierke
+ * @since 1.3
+ */
+public class UnwindOperation implements AggregationOperation {
+
+	private final ExposedField field;
+
+	/**
+	 * Creates a new {@link UnwindOperation} for the given {@link Field}.
+	 * 
+	 * @param field must not be {@literal null}.
+	 */
+	public UnwindOperation(Field field) {
+
+		Assert.notNull(field);
+		this.field = new ExposedField(field, true);
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 */
+	@Override
+	public DBObject toDBObject(AggregationOperationContext context) {
+		return new BasicDBObject("$unwind", context.getReference(field).toString());
+	}
+}

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

@@ -0,0 +1,5 @@
+/**
+ * Support for the MongoDB aggregation framework.
+ * @since 1.3
+ */
+package org.springframework.data.mongodb.core.aggregation;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 by the original author(s).
+ * 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.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.mongodb.core.convert;
 
 import java.math.BigInteger;
@@ -33,8 +32,8 @@ import org.springframework.data.mongodb.core.convert.MongoConverters.StringToObj
  * Base class for {@link MongoConverter} implementations. Sets up a {@link GenericConversionService} and populates basic
  * converters. Allows registering {@link CustomConversions}.
  * 
- * @author Jon Brisbin <jbrisbin@vmware.com>
+ * @author Jon Brisbin
- * @author Oliver Gierke ogierke@vmware.com
+ * @author Oliver Gierke
  */
 public abstract class AbstractMongoConverter implements MongoConverter, InitializingBean {
 
@@ -94,6 +93,14 @@ public abstract class AbstractMongoConverter implements MongoConverter, Initiali
 		conversions.registerConvertersIn(conversionService);
 	}
 
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.convert.MongoWriter#convertToMongoType(java.lang.Object)
+	 */
+	public Object convertToMongoType(Object obj) {
+		return convertToMongoType(obj, null);
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.core.convert.MongoConverter#getConversionService()

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 by the original author(s).
+ * 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.
@@ -17,9 +17,12 @@ package org.springframework.data.mongodb.core.convert;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Set;
 
 import org.slf4j.Logger;
@@ -31,11 +34,13 @@ import org.springframework.core.convert.converter.ConverterFactory;
 import org.springframework.core.convert.converter.GenericConverter;
 import org.springframework.core.convert.converter.GenericConverter.ConvertiblePair;
 import org.springframework.core.convert.support.GenericConversionService;
+import org.springframework.data.convert.JodaTimeConverters;
 import org.springframework.data.convert.ReadingConverter;
 import org.springframework.data.convert.WritingConverter;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
 import org.springframework.data.mongodb.core.convert.MongoConverters.BigDecimalToStringConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverters.BigIntegerToStringConverter;
+import org.springframework.data.mongodb.core.convert.MongoConverters.DBObjectToStringConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverters.StringToBigDecimalConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverters.StringToBigIntegerConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverters.StringToURLConverter;
@@ -62,6 +67,7 @@ public class CustomConversions {
 	private final Set<ConvertiblePair> writingPairs;
 	private final Set<Class<?>> customSimpleTypes;
 	private final SimpleTypeHolder simpleTypeHolder;
+	private final Map<Class<?>, HashMap<Class<?>, CacheValue>> cache;
 
 	private final List<Object> converters;
 
@@ -81,11 +87,13 @@ public class CustomConversions {
 
 		Assert.notNull(converters);
 
-		this.readingPairs = new HashSet<ConvertiblePair>();
+		this.readingPairs = new LinkedHashSet<ConvertiblePair>();
-		this.writingPairs = new HashSet<ConvertiblePair>();
+		this.writingPairs = new LinkedHashSet<ConvertiblePair>();
 		this.customSimpleTypes = new HashSet<Class<?>>();
+		this.cache = new HashMap<Class<?>, HashMap<Class<?>, CacheValue>>();
 
 		this.converters = new ArrayList<Object>();
+		this.converters.addAll(converters);
 		this.converters.add(CustomToStringConverter.INSTANCE);
 		this.converters.add(BigDecimalToStringConverter.INSTANCE);
 		this.converters.add(StringToBigDecimalConverter.INSTANCE);
@@ -93,7 +101,8 @@ public class CustomConversions {
 		this.converters.add(StringToBigIntegerConverter.INSTANCE);
 		this.converters.add(URLToStringConverter.INSTANCE);
 		this.converters.add(StringToURLConverter.INSTANCE);
-		this.converters.addAll(converters);
+		this.converters.add(DBObjectToStringConverter.INSTANCE);
+		this.converters.addAll(JodaTimeConverters.getConvertersToRegister());
 
 		for (Object c : this.converters) {
 			registerConversion(c);
@@ -231,6 +240,7 @@ public class CustomConversions {
 	 * @return
 	 */
 	public Class<?> getCustomWriteTarget(Class<?> source, Class<?> expectedTargetType) {
+
 		Assert.notNull(source);
 		return getCustomTarget(source, expectedTargetType, writingPairs);
 	}
@@ -266,9 +276,11 @@ public class CustomConversions {
 	 * @return
 	 */
 	public boolean hasCustomReadTarget(Class<?> source, Class<?> expectedTargetType) {
+
 		Assert.notNull(source);
 		Assert.notNull(expectedTargetType);
-		return getCustomTarget(source, expectedTargetType, readingPairs) != null;
+
+		return getCustomReadTarget(source, expectedTargetType) != null;
 	}
 
 	/**
@@ -297,8 +309,32 @@ public class CustomConversions {
 		return null;
 	}
 
+	private Class<?> getCustomReadTarget(Class<?> source, Class<?> expectedTargetType) {
+
+		Class<?> type = expectedTargetType == null ? PlaceholderType.class : expectedTargetType;
+
+		Map<Class<?>, CacheValue> map;
+		CacheValue toReturn;
+
+		if ((map = cache.get(source)) == null || (toReturn = map.get(type)) == null) {
+
+			Class<?> target = getCustomTarget(source, type, readingPairs);
+
+			if (cache.get(source) == null) {
+				cache.put(source, new HashMap<Class<?>, CacheValue>());
+			}
+
+			Map<Class<?>, CacheValue> value = cache.get(source);
+			toReturn = target == null ? CacheValue.NULL : new CacheValue(target);
+			value.put(type, toReturn);
+		}
+
+		return toReturn.clazz;
+	}
+
 	@WritingConverter
 	private enum CustomToStringConverter implements GenericConverter {
+
 		INSTANCE;
 
 		public Set<ConvertiblePair> getConvertibleTypes() {
@@ -311,4 +347,30 @@ public class CustomConversions {
 			return source.toString();
 		}
 	}
+
+	/**
+	 * Placeholder type to allow registering not-found values in the converter cache.
+	 * 
+	 * @author Patryk Wasik
+	 * @author Oliver Gierke
+	 */
+	private static class PlaceholderType {
+
+	}
+
+	/**
+	 * Wrapper to safely store {@literal null} values in the type cache.
+	 * 
+	 * @author Patryk Wasik
+	 * @author Oliver Gierke
+	 */
+	private static class CacheValue {
+
+		public static final CacheValue NULL = new CacheValue(null);
+		private final Class<?> clazz;
+
+		public CacheValue(Class<?> clazz) {
+			this.clazz = clazz;
+		}
+	}
 }

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

@@ -0,0 +1,123 @@
+/*
+ * 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.convert;
+
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.util.Assert;
+
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
+/**
+ * Wrapper value object for a {@link BasicDBObject} to be able to access raw values by {@link MongoPersistentProperty}
+ * references. The accessors will transparently resolve nested document values that a {@link MongoPersistentProperty}
+ * might refer to through a path expression in field names.
+ * 
+ * @author Oliver Gierke
+ */
+class DBObjectAccessor {
+
+	private final DBObject dbObject;
+
+	/**
+	 * Creates a new {@link DBObjectAccessor} for the given {@link DBObject}.
+	 * 
+	 * @param dbObject must be a {@link BasicDBObject} effectively, must not be {@literal null}.
+	 */
+	public DBObjectAccessor(DBObject dbObject) {
+
+		Assert.notNull(dbObject, "DBObject must not be null!");
+		Assert.isInstanceOf(BasicDBObject.class, dbObject, "Given DBObject must be a BasicDBObject!");
+
+		this.dbObject = dbObject;
+	}
+
+	/**
+	 * Puts the given value into the backing {@link DBObject} based on the coordinates defined through the given
+	 * {@link MongoPersistentProperty}. By default this will be the plain field name. But field names might also consist
+	 * of path traversals so we might need to create intermediate {@link BasicDBObject}s.
+	 * 
+	 * @param prop must not be {@literal null}.
+	 * @param value
+	 */
+	public void put(MongoPersistentProperty prop, Object value) {
+
+		Assert.notNull(prop, "MongoPersistentProperty must not be null!");
+		String fieldName = prop.getFieldName();
+
+		Iterator<String> parts = Arrays.asList(fieldName.split("\\.")).iterator();
+		DBObject dbObject = this.dbObject;
+
+		while (parts.hasNext()) {
+
+			String part = parts.next();
+
+			if (parts.hasNext()) {
+				BasicDBObject nestedDbObject = new BasicDBObject();
+				dbObject.put(part, nestedDbObject);
+				dbObject = nestedDbObject;
+			} else {
+				dbObject.put(part, value);
+			}
+		}
+	}
+
+	/**
+	 * Returns the value the given {@link MongoPersistentProperty} refers to. By default this will be a direct field but
+	 * the method will also transparently resolve nested values the {@link MongoPersistentProperty} might refer to through
+	 * a path expression in the field name metadata.
+	 * 
+	 * @param property must not be {@literal null}.
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+	public Object get(MongoPersistentProperty property) {
+
+		String fieldName = property.getFieldName();
+		Iterator<String> parts = Arrays.asList(fieldName.split("\\.")).iterator();
+		Map<Object, Object> source = this.dbObject.toMap();
+		Object result = null;
+
+		while (source != null && parts.hasNext()) {
+
+			result = source.get(parts.next());
+
+			if (parts.hasNext()) {
+				source = getAsMap(result);
+			}
+		}
+
+		return result;
+	}
+
+	@SuppressWarnings("unchecked")
+	private Map<Object, Object> getAsMap(Object source) {
+
+		if (source instanceof BasicDBObject) {
+			return ((DBObject) source).toMap();
+		}
+
+		if (source instanceof Map) {
+			return (Map<Object, Object>) source;
+		}
+
+		return null;
+	}
+}

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

@@ -0,0 +1,48 @@
+/*
+ * 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.convert;
+
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+
+import com.mongodb.DBRef;
+
+/**
+ * Used to resolve associations annotated with {@link org.springframework.data.mongodb.core.mapping.DBRef}.
+ * 
+ * @author Thomas Darimont
+ */
+public interface DbRefResolver {
+
+	/**
+	 * @param property will never be {@literal null}.
+	 * @param callback will never be {@literal null}.
+	 * @return
+	 */
+	Object resolveDbRef(MongoPersistentProperty property, DbRefResolverCallback callback);
+
+	/**
+	 * Creates a {@link DBRef} instance for the given {@link org.springframework.data.mongodb.core.mapping.DBRef}
+	 * annotation, {@link MongoPersistentEntity} and id.
+	 * 
+	 * @param annotation will never be {@literal null}.
+	 * @param entity will never be {@literal null}.
+	 * @param id will never be {@literal null}.
+	 * @return
+	 */
+	DBRef createDbRef(org.springframework.data.mongodb.core.mapping.DBRef annotation, MongoPersistentEntity<?> entity,
+			Object id);
+}

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

@@ -0,0 +1,35 @@
+/*
+ * 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.convert;
+
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+
+/**
+ * Callback interface to be used in conjunction with {@link DbRefResolver}.
+ * 
+ * @author Thomas Darimont
+ * @author Oliver Gierke
+ */
+public interface DbRefResolverCallback {
+
+	/**
+	 * Resolve the final object for the given {@link MongoPersistentProperty}.
+	 * 
+	 * @param property will never be {@literal null}.
+	 * @return
+	 */
+	Object resolve(MongoPersistentProperty property);
+}

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

@@ -0,0 +1,282 @@
+/*
+ * 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.convert;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.lang.reflect.Method;
+
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+import org.objenesis.Objenesis;
+import org.objenesis.ObjenesisStd;
+import org.springframework.aop.framework.ProxyFactory;
+import org.springframework.cglib.proxy.Callback;
+import org.springframework.cglib.proxy.Enhancer;
+import org.springframework.cglib.proxy.Factory;
+import org.springframework.cglib.proxy.MethodProxy;
+import org.springframework.core.SpringVersion;
+import org.springframework.dao.DataAccessException;
+import org.springframework.dao.support.PersistenceExceptionTranslator;
+import org.springframework.data.mongodb.LazyLoadingException;
+import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.ReflectionUtils;
+import org.springframework.util.StringUtils;
+
+import com.mongodb.DB;
+import com.mongodb.DBRef;
+
+/**
+ * A {@link DbRefResolver} that resolves {@link org.springframework.data.mongodb.core.mapping.DBRef}s by delegating to a
+ * {@link DbRefResolverCallback} than is able to generate lazy loading proxies.
+ * 
+ * @author Thomas Darimont
+ * @author Oliver Gierke
+ */
+public class DefaultDbRefResolver implements DbRefResolver {
+
+	private static final boolean IS_SPRING_4_OR_BETTER = SpringVersion.getVersion().startsWith("4");
+	private static final boolean OBJENESIS_PRESENT = ClassUtils.isPresent("org.objenesis.Objenesis", null);
+
+	private final MongoDbFactory mongoDbFactory;
+	private final PersistenceExceptionTranslator exceptionTranslator;
+
+	/**
+	 * Creates a new {@link DefaultDbRefResolver} with the given {@link MongoDbFactory}.
+	 * 
+	 * @param mongoDbFactory must not be {@literal null}.
+	 */
+	public DefaultDbRefResolver(MongoDbFactory mongoDbFactory) {
+
+		Assert.notNull(mongoDbFactory, "MongoDbFactory translator must not be null!");
+
+		this.mongoDbFactory = mongoDbFactory;
+		this.exceptionTranslator = mongoDbFactory.getExceptionTranslator();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.convert.DbRefResolver#resolveDbRef(org.springframework.data.mongodb.core.mapping.MongoPersistentProperty, org.springframework.data.mongodb.core.convert.DbRefResolverCallback)
+	 */
+	@Override
+	public Object resolveDbRef(MongoPersistentProperty property, DbRefResolverCallback callback) {
+
+		Assert.notNull(property, "Property must not be null!");
+		Assert.notNull(callback, "Callback must not be null!");
+
+		if (isLazyDbRef(property)) {
+			return createLazyLoadingProxy(property, callback);
+		}
+
+		return callback.resolve(property);
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.convert.DbRefResolver#created(org.springframework.data.mongodb.core.mapping.MongoPersistentProperty, org.springframework.data.mongodb.core.mapping.MongoPersistentEntity, java.lang.Object)
+	 */
+	@Override
+	public DBRef createDbRef(org.springframework.data.mongodb.core.mapping.DBRef annotation,
+			MongoPersistentEntity<?> entity, Object id) {
+
+		DB db = mongoDbFactory.getDb();
+		db = annotation != null && StringUtils.hasText(annotation.db()) ? mongoDbFactory.getDb(annotation.db()) : db;
+
+		return new DBRef(db, entity.getCollection(), id);
+	}
+
+	/**
+	 * Creates a proxy for the given {@link MongoPersistentProperty} using the given {@link DbRefResolverCallback} to
+	 * eventually resolve the value of the property.
+	 * 
+	 * @param property must not be {@literal null}.
+	 * @param callback must not be {@literal null}.
+	 * @return
+	 */
+	private Object createLazyLoadingProxy(MongoPersistentProperty property, DbRefResolverCallback callback) {
+
+		ProxyFactory proxyFactory = new ProxyFactory();
+		Class<?> propertyType = property.getType();
+
+		for (Class<?> type : propertyType.getInterfaces()) {
+			proxyFactory.addInterface(type);
+		}
+
+		LazyLoadingInterceptor interceptor = new LazyLoadingInterceptor(property, exceptionTranslator, callback);
+
+		if (propertyType.isInterface()) {
+			proxyFactory.addInterface(propertyType);
+			proxyFactory.addAdvice(interceptor);
+			return proxyFactory.getProxy();
+		}
+
+		proxyFactory.setProxyTargetClass(true);
+		proxyFactory.setTargetClass(propertyType);
+
+		if (IS_SPRING_4_OR_BETTER || !OBJENESIS_PRESENT) {
+			proxyFactory.addAdvice(interceptor);
+			return proxyFactory.getProxy();
+		}
+
+		return ObjenesisProxyEnhancer.enhanceAndGet(proxyFactory, propertyType, interceptor);
+	}
+
+	/**
+	 * @param property
+	 * @return
+	 */
+	private boolean isLazyDbRef(MongoPersistentProperty property) {
+		return property.getDBRef() != null && property.getDBRef().lazy();
+	}
+
+	/**
+	 * A {@link MethodInterceptor} that is used within a lazy loading proxy. The property resolving is delegated to a
+	 * {@link DbRefResolverCallback}. The resolving process is triggered by a method invocation on the proxy and is
+	 * guaranteed to be performed only once.
+	 * 
+	 * @author Thomas Darimont
+	 */
+	static class LazyLoadingInterceptor implements MethodInterceptor, org.springframework.cglib.proxy.MethodInterceptor,
+			Serializable {
+
+		private final DbRefResolverCallback callback;
+		private final MongoPersistentProperty property;
+		private final PersistenceExceptionTranslator exceptionTranslator;
+
+		private volatile boolean resolved;
+		private Object result;
+
+		/**
+		 * Creates a new {@link LazyLoadingInterceptor} for the given {@link MongoPersistentProperty},
+		 * {@link PersistenceExceptionTranslator} and {@link DbRefResolverCallback}.
+		 * 
+		 * @param property must not be {@literal null}.
+		 * @param callback must not be {@literal null}.
+		 */
+		public LazyLoadingInterceptor(MongoPersistentProperty property, PersistenceExceptionTranslator exceptionTranslator,
+				DbRefResolverCallback callback) {
+
+			Assert.notNull(property, "Property must not be null!");
+			Assert.notNull(exceptionTranslator, "Exception translator must not be null!");
+			Assert.notNull(callback, "Callback must not be null!");
+
+			this.callback = callback;
+			this.exceptionTranslator = exceptionTranslator;
+			this.property = property;
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation)
+		 */
+		@Override
+		public Object invoke(MethodInvocation invocation) throws Throwable {
+			return intercept(invocation.getThis(), invocation.getMethod(), invocation.getArguments(), null);
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.cglib.proxy.MethodInterceptor#intercept(java.lang.Object, java.lang.reflect.Method, java.lang.Object[], org.springframework.cglib.proxy.MethodProxy)
+		 */
+		@Override
+		public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable {
+			return ReflectionUtils.isObjectMethod(method) ? method.invoke(obj, args) : method.invoke(ensureResolved(), args);
+		}
+
+		private Object ensureResolved() {
+
+			if (!resolved) {
+				this.result = resolve();
+				this.resolved = true;
+			}
+
+			return this.result;
+		}
+
+		private void writeObject(ObjectOutputStream out) throws IOException {
+
+			ensureResolved();
+			out.writeObject(this.result);
+		}
+
+		private void readObject(ObjectInputStream in) throws IOException {
+
+			try {
+				this.resolved = true; // Object is guaranteed to be resolved after serializations
+				this.result = in.readObject();
+			} catch (ClassNotFoundException e) {
+				throw new LazyLoadingException("Could not deserialize result", e);
+			}
+		}
+
+		/**
+		 * @return
+		 */
+		private synchronized Object resolve() {
+
+			if (!resolved) {
+
+				try {
+
+					return callback.resolve(property);
+
+				} catch (RuntimeException ex) {
+
+					DataAccessException translatedException = this.exceptionTranslator.translateExceptionIfPossible(ex);
+					throw new LazyLoadingException("Unable to lazily resolve DBRef!", translatedException);
+				}
+			}
+
+			return result;
+		}
+
+		public boolean isResolved() {
+			return resolved;
+		}
+
+		public Object getResult() {
+			return result;
+		}
+	}
+
+	/**
+	 * Static class to accomodate optional dependency on Objenesis.
+	 * 
+	 * @author Oliver Gierke
+	 */
+	private static class ObjenesisProxyEnhancer {
+
+		private static final Objenesis OBJENESIS = new ObjenesisStd(true);
+
+		public static Object enhanceAndGet(ProxyFactory proxyFactory, Class<?> type,
+				org.springframework.cglib.proxy.MethodInterceptor interceptor) {
+
+			Enhancer enhancer = new Enhancer();
+			enhancer.setSuperclass(type);
+			enhancer.setCallbackType(org.springframework.cglib.proxy.MethodInterceptor.class);
+
+			Factory factory = (Factory) OBJENESIS.newInstance(enhancer.createClass());
+			factory.setCallbacks(new Callback[] { interceptor });
+			return factory;
+		}
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,16 +18,19 @@ package org.springframework.data.mongodb.core.convert;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
-import org.springframework.data.convert.SimpleTypeInformationMapper;
 import org.springframework.data.convert.DefaultTypeMapper;
+import org.springframework.data.convert.SimpleTypeInformationMapper;
 import org.springframework.data.convert.TypeAliasAccessor;
 import org.springframework.data.convert.TypeInformationMapper;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.TypeInformation;
+
 import com.mongodb.BasicDBList;
+import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
 
 /**
@@ -37,33 +40,43 @@ import com.mongodb.DBObject;
  * respectively.
  * 
  * @author Oliver Gierke
+ * @author Thomas Darimont
  */
 public class DefaultMongoTypeMapper extends DefaultTypeMapper<DBObject> implements MongoTypeMapper {
 
 	public static final String DEFAULT_TYPE_KEY = "_class";
-	@SuppressWarnings("rawtypes")
+	@SuppressWarnings("rawtypes")//
 	private static final TypeInformation<List> LIST_TYPE_INFO = ClassTypeInformation.from(List.class);
-	@SuppressWarnings("rawtypes")
+	@SuppressWarnings("rawtypes")//
 	private static final TypeInformation<Map> MAP_TYPE_INFO = ClassTypeInformation.from(Map.class);
-	private String typeKey = DEFAULT_TYPE_KEY;
+
+	private final TypeAliasAccessor<DBObject> accessor;
+	private final String typeKey;
 
 	public DefaultMongoTypeMapper() {
-		this(DEFAULT_TYPE_KEY, Arrays.asList(SimpleTypeInformationMapper.INSTANCE));
+		this(DEFAULT_TYPE_KEY);
 	}
 
 	public DefaultMongoTypeMapper(String typeKey) {
-		super(new DBObjectTypeAliasAccessor(typeKey));
+		this(typeKey, Arrays.asList(SimpleTypeInformationMapper.INSTANCE));
-		this.typeKey = typeKey;
 	}
 
 	public DefaultMongoTypeMapper(String typeKey, MappingContext<? extends PersistentEntity<?, ?>, ?> mappingContext) {
-		super(new DBObjectTypeAliasAccessor(typeKey), mappingContext, Arrays.asList(SimpleTypeInformationMapper.INSTANCE));
+		this(typeKey, new DBObjectTypeAliasAccessor(typeKey), mappingContext, Arrays
-		this.typeKey = typeKey;
+				.asList(SimpleTypeInformationMapper.INSTANCE));
 	}
 
 	public DefaultMongoTypeMapper(String typeKey, List<? extends TypeInformationMapper> mappers) {
-		super(new DBObjectTypeAliasAccessor(typeKey), mappers);
+		this(typeKey, new DBObjectTypeAliasAccessor(typeKey), null, mappers);
+	}
+
+	private DefaultMongoTypeMapper(String typeKey, TypeAliasAccessor<DBObject> accessor,
+			MappingContext<? extends PersistentEntity<?, ?>, ?> mappingContext, List<? extends TypeInformationMapper> mappers) {
+
+		super(accessor, mappingContext, mappers);
+
 		this.typeKey = typeKey;
+		this.accessor = accessor;
 	}
 
 	/*
@@ -74,6 +87,31 @@ public class DefaultMongoTypeMapper extends DefaultTypeMapper<DBObject> implemen
 		return typeKey == null ? false : typeKey.equals(key);
 	}
 
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.convert.MongoTypeMapper#writeTypeRestrictions(java.util.Set)
+	 */
+	@Override
+	public void writeTypeRestrictions(DBObject result, Set<Class<?>> restrictedTypes) {
+
+		if (restrictedTypes == null || restrictedTypes.isEmpty()) {
+			return;
+		}
+
+		BasicDBList restrictedMappedTypes = new BasicDBList();
+
+		for (Class<?> restrictedType : restrictedTypes) {
+
+			Object typeAlias = getAliasFor(ClassTypeInformation.from(restrictedType));
+
+			if (typeAlias != null) {
+				restrictedMappedTypes.add(typeAlias);
+			}
+		}
+
+		accessor.writeTypeTo(result, new BasicDBObject("$in", restrictedMappedTypes));
+	}
+
 	/* (non-Javadoc)
 	 * @see org.springframework.data.convert.DefaultTypeMapper#getFallbackTypeFor(java.lang.Object)
 	 */
@@ -83,6 +121,7 @@ public class DefaultMongoTypeMapper extends DefaultTypeMapper<DBObject> implemen
 	}
 
 	/**
+	 * {@link TypeAliasAccessor} to store aliases in a {@link DBObject}.
 	 * 
 	 * @author Oliver Gierke
 	 */

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 by the original author(s).
+ * Copyright 2011-2013 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,7 +15,6 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -32,11 +31,13 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.CollectionFactory;
 import org.springframework.core.convert.ConversionException;
+import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.ConversionServiceFactory;
 import org.springframework.data.convert.EntityInstantiator;
 import org.springframework.data.convert.TypeMapper;
 import org.springframework.data.mapping.Association;
 import org.springframework.data.mapping.AssociationHandler;
+import org.springframework.data.mapping.PreferredConstructor.Parameter;
 import org.springframework.data.mapping.PropertyHandler;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.model.BeanWrapper;
@@ -47,6 +48,7 @@ import org.springframework.data.mapping.model.PersistentEntityParameterValueProv
 import org.springframework.data.mapping.model.PropertyValueProvider;
 import org.springframework.data.mapping.model.SpELContext;
 import org.springframework.data.mapping.model.SpELExpressionEvaluator;
+import org.springframework.data.mapping.model.SpELExpressionParameterValueProvider;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
@@ -55,11 +57,9 @@ import org.springframework.data.util.TypeInformation;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
 
 import com.mongodb.BasicDBList;
 import com.mongodb.BasicDBObject;
-import com.mongodb.DB;
 import com.mongodb.DBObject;
 import com.mongodb.DBRef;
 
@@ -69,6 +69,8 @@ import com.mongodb.DBRef;
  * 
  * @author Oliver Gierke
  * @author Jon Brisbin
+ * @author Patrik Wasik
+ * @author Thomas Darimont
  */
 public class MappingMongoConverter extends AbstractMongoConverter implements ApplicationContextAware {
 
@@ -76,8 +78,8 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 
 	protected final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
 	protected final SpelExpressionParser spelExpressionParser = new SpelExpressionParser();
-	protected final MongoDbFactory mongoDbFactory;
 	protected final QueryMapper idMapper;
+	protected final DbRefResolver dbRefResolver;
 	protected ApplicationContext applicationContext;
 	protected boolean useFieldAccessOnly = true;
 	protected MongoTypeMapper typeMapper;
@@ -86,21 +88,21 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	private SpELContext spELContext;
 
 	/**
-	 * Creates a new {@link MappingMongoConverter} given the new {@link MongoDbFactory} and {@link MappingContext}.
+	 * Creates a new {@link MappingMongoConverter} given the new {@link DbRefResolver} and {@link MappingContext}.
 	 * 
 	 * @param mongoDbFactory must not be {@literal null}.
 	 * @param mappingContext must not be {@literal null}.
 	 */
 	@SuppressWarnings("deprecation")
-	public MappingMongoConverter(MongoDbFactory mongoDbFactory,
+	public MappingMongoConverter(DbRefResolver dbRefResolver,
 			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
 
 		super(ConversionServiceFactory.createDefaultConversionService());
 
-		Assert.notNull(mongoDbFactory);
+		Assert.notNull(dbRefResolver, "DbRefResolver must not be null!");
-		Assert.notNull(mappingContext);
+		Assert.notNull(mappingContext, "MappingContext must not be null!");
 
-		this.mongoDbFactory = mongoDbFactory;
+		this.dbRefResolver = dbRefResolver;
 		this.mappingContext = mappingContext;
 		this.typeMapper = new DefaultMongoTypeMapper(DefaultMongoTypeMapper.DEFAULT_TYPE_KEY, mappingContext);
 		this.idMapper = new QueryMapper(this);
@@ -108,6 +110,19 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		this.spELContext = new SpELContext(DBObjectPropertyAccessor.INSTANCE);
 	}
 
+	/**
+	 * Creates a new {@link MappingMongoConverter} given the new {@link MongoDbFactory} and {@link MappingContext}.
+	 * 
+	 * @deprecated use the constructor taking a {@link DbRefResolver} instead.
+	 * @param mongoDbFactory must not be {@literal null}.
+	 * @param mappingContext must not be {@literal null}.
+	 */
+	@Deprecated
+	public MappingMongoConverter(MongoDbFactory mongoDbFactory,
+			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
+		this(new DefaultDbRefResolver(mongoDbFactory), mappingContext);
+	}
+
 	/**
 	 * Configures the {@link MongoTypeMapper} to be used to add type information to {@link DBObject}s created by the
 	 * converter and how to lookup type information from {@link DBObject}s when reading them. Uses a
@@ -121,6 +136,15 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 				mappingContext) : typeMapper;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.convert.MongoConverter#getTypeMapper()
+	 */
+	@Override
+	public MongoTypeMapper getTypeMapper() {
+		return this.typeMapper;
+	}
+
 	/**
 	 * Configure the characters dots potentially contained in a {@link Map} shall be replaced with. By default we don't do
 	 * any translation but rather reject a {@link Map} with keys containing dots causing the conversion for the entire
@@ -216,12 +240,12 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		MongoDbPropertyValueProvider provider = new MongoDbPropertyValueProvider(source, evaluator, parent);
 		PersistentEntityParameterValueProvider<MongoPersistentProperty> parameterProvider = new PersistentEntityParameterValueProvider<MongoPersistentProperty>(
 				entity, provider, parent);
-		parameterProvider.setSpELEvaluator(evaluator);
 
-		return parameterProvider;
+		return new ConverterAwareSpELExpressionParameterValueProvider(evaluator, conversionService, parameterProvider,
+				parent);
 	}
 
-	private <S extends Object> S read(final MongoPersistentEntity<S> entity, final DBObject dbo, Object parent) {
+	private <S extends Object> S read(final MongoPersistentEntity<S> entity, final DBObject dbo, final Object parent) {
 
 		final DefaultSpELExpressionEvaluator evaluator = new DefaultSpELExpressionEvaluator(dbo, spELContext);
 
@@ -236,10 +260,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		entity.doWithProperties(new PropertyHandler<MongoPersistentProperty>() {
 			public void doWithPersistentProperty(MongoPersistentProperty prop) {
 
-				boolean isConstructorProperty = entity.isConstructorArgument(prop);
+				if (!dbo.containsField(prop.getFieldName()) || entity.isConstructorArgument(prop)) {
-				boolean hasValueForProperty = dbo.containsField(prop.getFieldName());
-
-				if (!hasValueForProperty || isConstructorProperty) {
 					return;
 				}
 
@@ -251,15 +272,18 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		// Handle associations
 		entity.doWithAssociations(new AssociationHandler<MongoPersistentProperty>() {
 			public void doWithAssociation(Association<MongoPersistentProperty> association) {
+
 				MongoPersistentProperty inverseProp = association.getInverse();
-				Object obj = getValueInternal(inverseProp, dbo, evaluator, result);
+
-				try {
+				Object obj = dbRefResolver.resolveDbRef(inverseProp, new DbRefResolverCallback() {
-					wrapper.setProperty(inverseProp, obj);
+
-				} catch (IllegalAccessException e) {
+					@Override
-					throw new MappingException(e.getMessage(), e);
+					public Object resolve(MongoPersistentProperty property) {
-				} catch (InvocationTargetException e) {
+						return getValueInternal(property, dbo, evaluator, parent);
-					throw new MappingException(e.getMessage(), e);
 					}
+				});
+
+				wrapper.setProperty(inverseProp, obj);
 			}
 		});
 
@@ -351,16 +375,16 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		}
 
 		final BeanWrapper<MongoPersistentEntity<Object>, Object> wrapper = BeanWrapper.create(obj, conversionService);
-
-		// Write the ID
 		final MongoPersistentProperty idProperty = entity.getIdProperty();
+
 		if (!dbo.containsField("_id") && null != idProperty) {
 
+			boolean fieldAccessOnly = idProperty.usePropertyAccess() ? false : useFieldAccessOnly;
+
 			try {
-				Object id = wrapper.getProperty(idProperty, Object.class, useFieldAccessOnly);
+				Object id = wrapper.getProperty(idProperty, Object.class, fieldAccessOnly);
 				dbo.put("_id", idMapper.convertId(id));
-			} catch (ConversionException ignored) {
+			} catch (ConversionException ignored) {}
-			}
 		}
 
 		// Write the properties
@@ -371,13 +395,15 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 					return;
 				}
 
-				Object propertyObj = wrapper.getProperty(prop, prop.getType(), useFieldAccessOnly);
+				boolean fieldAccessOnly = prop.usePropertyAccess() ? false : useFieldAccessOnly;
+
+				Object propertyObj = wrapper.getProperty(prop, prop.getType(), fieldAccessOnly);
 
 				if (null != propertyObj) {
 					if (!conversions.isSimpleType(propertyObj.getClass())) {
 						writePropertyInternal(propertyObj, dbo, prop);
 					} else {
-						writeSimpleInternal(propertyObj, dbo, prop.getFieldName());
+						writeSimpleInternal(propertyObj, dbo, prop);
 					}
 				}
 			}
@@ -402,27 +428,27 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			return;
 		}
 
-		String name = prop.getFieldName();
+		DBObjectAccessor accessor = new DBObjectAccessor(dbo);
+
 		TypeInformation<?> valueType = ClassTypeInformation.from(obj.getClass());
 		TypeInformation<?> type = prop.getTypeInformation();
 
 		if (valueType.isCollectionLike()) {
 			DBObject collectionInternal = createCollection(asCollection(obj), prop);
-			dbo.put(name, collectionInternal);
+			accessor.put(prop, collectionInternal);
 			return;
 		}
 
 		if (valueType.isMap()) {
-			BasicDBObject mapDbObj = new BasicDBObject();
+			DBObject mapDbObj = createMap((Map<Object, Object>) obj, prop);
-			writeMapInternal((Map<Object, Object>) obj, mapDbObj, type);
+			accessor.put(prop, mapDbObj);
-			dbo.put(name, mapDbObj);
 			return;
 		}
 
 		if (prop.isDbReference()) {
 			DBRef dbRefObj = createDBRef(obj, prop.getDBRef());
 			if (null != dbRefObj) {
-				dbo.put(name, dbRefObj);
+				accessor.put(prop, dbRefObj);
 				return;
 			}
 		}
@@ -431,18 +457,20 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		Class<?> basicTargetType = conversions.getCustomWriteTarget(obj.getClass(), null);
 
 		if (basicTargetType != null) {
-			dbo.put(name, conversionService.convert(obj, basicTargetType));
+			accessor.put(prop, conversionService.convert(obj, basicTargetType));
 			return;
 		}
 
-		BasicDBObject propDbObj = new BasicDBObject();
+		Object existingValue = accessor.get(prop);
+		BasicDBObject propDbObj = existingValue instanceof BasicDBObject ? (BasicDBObject) existingValue
+				: new BasicDBObject();
 		addCustomTypeKeyIfNecessary(type, obj, propDbObj);
 
 		MongoPersistentEntity<?> entity = isSubtype(prop.getType(), obj.getClass()) ? mappingContext
 				.getPersistentEntity(obj.getClass()) : mappingContext.getPersistentEntity(type);
 
 		writeInternal(obj, propDbObj, entity);
-		dbo.put(name, propDbObj);
+		accessor.put(prop, propDbObj);
 	}
 
 	private boolean isSubtype(Class<?> left, Class<?> right) {
@@ -494,6 +522,42 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		return dbList;
 	}
 
+	/**
+	 * Writes the given {@link Map} using the given {@link MongoPersistentProperty} information.
+	 * 
+	 * @param map must not {@literal null}.
+	 * @param property must not be {@literal null}.
+	 * @return
+	 */
+	protected DBObject createMap(Map<Object, Object> map, MongoPersistentProperty property) {
+
+		Assert.notNull(map, "Given map must not be null!");
+		Assert.notNull(property, "PersistentProperty must not be null!");
+
+		if (!property.isDbReference()) {
+			return writeMapInternal(map, new BasicDBObject(), property.getTypeInformation());
+		}
+
+		BasicDBObject dbObject = new BasicDBObject();
+
+		for (Map.Entry<Object, Object> entry : map.entrySet()) {
+
+			Object key = entry.getKey();
+			Object value = entry.getValue();
+
+			if (conversions.isSimpleType(key.getClass())) {
+
+				String simpleKey = potentiallyEscapeMapKey(key.toString());
+				dbObject.put(simpleKey, value != null ? createDBRef(value, property.getDBRef()) : null);
+
+			} else {
+				throw new MappingException("Cannot use a complex object as a key value.");
+			}
+		}
+
+		return dbObject;
+	}
+
 	/**
 	 * Populates the given {@link BasicDBList} with values from the given {@link Collection}.
 	 * 
@@ -624,6 +688,11 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		dbObject.put(key, getPotentiallyConvertedSimpleWrite(value));
 	}
 
+	private void writeSimpleInternal(Object value, DBObject dbObject, MongoPersistentProperty property) {
+		DBObjectAccessor accessor = new DBObjectAccessor(dbObject);
+		accessor.put(property, getPotentiallyConvertedSimpleWrite(value));
+	}
+
 	/**
 	 * Checks whether we have a custom conversion registered for the given value into an arbitrary simple Mongo type.
 	 * Returns the converted value if so. If not, we perform special enum handling or simply return the value as is.
@@ -676,6 +745,10 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 
 		Assert.notNull(target);
 
+		if (target instanceof DBRef) {
+			return (DBRef) target;
+		}
+
 		MongoPersistentEntity<?> targetEntity = mappingContext.getPersistentEntity(target.getClass());
 
 		if (null == targetEntity) {
@@ -695,10 +768,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			throw new MappingException("Cannot create a reference to an object with a NULL id.");
 		}
 
-		DB db = mongoDbFactory.getDb();
+		return dbRefResolver.createDbRef(dbref, targetEntity, idMapper.convertId(id));
-		db = dbref != null && StringUtils.hasText(dbref.db()) ? mongoDbFactory.getDb(dbref.db()) : db;
-
-		return new DBRef(db, targetEntity.getCollection(), idMapper.convertId(id));
 	}
 
 	protected Object getValueInternal(MongoPersistentProperty prop, DBObject dbo, SpELExpressionEvaluator eval,
@@ -720,11 +790,12 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 
 		Assert.notNull(targetType);
 
+		Class<?> collectionType = targetType.getType();
+
 		if (sourceValue.isEmpty()) {
-			return new HashSet<Object>();
+			return getPotentiallyConvertedSimpleRead(new HashSet<Object>(), collectionType);
 		}
 
-		Class<?> collectionType = targetType.getType();
 		collectionType = Collection.class.isAssignableFrom(collectionType) ? collectionType : List.class;
 
 		Collection<Object> items = targetType.getType().isArray() ? new ArrayList<Object>() : CollectionFactory
@@ -737,7 +808,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			Object dbObjItem = sourceValue.get(i);
 
 			if (dbObjItem instanceof DBRef) {
-				items.add(DBRef.class.equals(rawComponentType) ? dbObjItem : read(componentType, ((DBRef) dbObjItem).fetch(),
+				items.add(DBRef.class.equals(rawComponentType) ? dbObjItem : read(componentType, readRef((DBRef) dbObjItem),
 						parent));
 			} else if (dbObjItem instanceof DBObject) {
 				items.add(read(componentType, (DBObject) dbObjItem, parent));
@@ -785,7 +856,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			if (value instanceof DBObject) {
 				map.put(key, read(valueType, (DBObject) value, parent));
 			} else if (value instanceof DBRef) {
-				map.put(key, DBRef.class.equals(rawValueType) ? value : read(valueType, ((DBRef) value).fetch()));
+				map.put(key, DBRef.class.equals(rawValueType) ? value : read(valueType, readRef((DBRef) value)));
 			} else {
 				Class<?> valueClass = valueType == null ? null : valueType.getType();
 				map.put(key, getPotentiallyConvertedSimpleRead(value, valueClass));
@@ -810,8 +881,12 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		return rootList;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.convert.MongoWriter#convertToMongoType(java.lang.Object, org.springframework.data.util.TypeInformation)
+	 */
 	@SuppressWarnings("unchecked")
-	public Object convertToMongoType(Object obj) {
+	public Object convertToMongoType(Object obj, TypeInformation<?> typeInformation) {
 
 		if (obj == null) {
 			return null;
@@ -822,7 +897,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			return conversionService.convert(obj, target);
 		}
 
-		if (null != obj && conversions.isSimpleType(obj.getClass())) {
+		if (conversions.isSimpleType(obj.getClass())) {
 			// Doesn't need conversion
 			return getPotentiallyConvertedSimpleWrite(obj);
 		}
@@ -858,9 +933,14 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 
 		DBObject newDbo = new BasicDBObject();
 		this.write(obj, newDbo);
+
+		if (typeInformation == null) {
 			return removeTypeInfoRecursively(newDbo);
 		}
 
+		return !obj.getClass().equals(typeInformation.getType()) ? newDbo : removeTypeInfoRecursively(newDbo);
+	}
+
 	public BasicDBList maybeConvertList(Iterable<?> source) {
 		BasicDBList newDbl = new BasicDBList();
 		for (Object element : source) {
@@ -908,7 +988,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 
 	private class MongoDbPropertyValueProvider implements PropertyValueProvider<MongoPersistentProperty> {
 
-		private final DBObject source;
+		private final DBObjectAccessor source;
 		private final SpELExpressionEvaluator evaluator;
 		private final Object parent;
 
@@ -921,7 +1001,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			Assert.notNull(source);
 			Assert.notNull(evaluator);
 
-			this.source = source;
+			this.source = new DBObjectAccessor(source);
 			this.evaluator = evaluator;
 			this.parent = parent;
 		}
@@ -930,23 +1010,63 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		 * (non-Javadoc)
 		 * @see org.springframework.data.convert.PropertyValueProvider#getPropertyValue(org.springframework.data.mapping.PersistentProperty)
 		 */
-		@SuppressWarnings("unchecked")
 		public <T> T getPropertyValue(MongoPersistentProperty property) {
 
 			String expression = property.getSpelExpression();
-			Object value = expression != null ? evaluator.evaluate(expression) : source.get(property.getFieldName());
+			Object value = expression != null ? evaluator.evaluate(expression) : source.get(property);
 
 			if (value == null) {
 				return null;
 			}
 
-			TypeInformation<?> type = property.getTypeInformation();
+			return readValue(value, property.getTypeInformation(), parent);
+		}
+	}
+
+	/**
+	 * Extension of {@link SpELExpressionParameterValueProvider} to recursively trigger value conversion on the raw
+	 * resolved SpEL value.
+	 * 
+	 * @author Oliver Gierke
+	 */
+	private class ConverterAwareSpELExpressionParameterValueProvider extends
+			SpELExpressionParameterValueProvider<MongoPersistentProperty> {
+
+		private final Object parent;
+
+		/**
+		 * Creates a new {@link ConverterAwareSpELExpressionParameterValueProvider}.
+		 * 
+		 * @param evaluator must not be {@literal null}.
+		 * @param conversionService must not be {@literal null}.
+		 * @param delegate must not be {@literal null}.
+		 */
+		public ConverterAwareSpELExpressionParameterValueProvider(SpELExpressionEvaluator evaluator,
+				ConversionService conversionService, ParameterValueProvider<MongoPersistentProperty> delegate, Object parent) {
+
+			super(evaluator, conversionService, delegate);
+			this.parent = parent;
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mapping.model.SpELExpressionParameterValueProvider#potentiallyConvertSpelValue(java.lang.Object, org.springframework.data.mapping.PreferredConstructor.Parameter)
+		 */
+		@Override
+		protected <T> T potentiallyConvertSpelValue(Object object, Parameter<T, MongoPersistentProperty> parameter) {
+			return readValue(object, parameter.getType(), parent);
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	private <T> T readValue(Object value, TypeInformation<?> type, Object parent) {
+
 		Class<?> rawType = type.getType();
 
 		if (conversions.hasCustomReadTarget(value.getClass(), rawType)) {
 			return (T) conversionService.convert(value, rawType);
 		} else if (value instanceof DBRef) {
-				return (T) (rawType.equals(DBRef.class) ? value : read(type, ((DBRef) value).fetch(), parent));
+			return (T) (rawType.equals(DBRef.class) ? value : read(type, readRef((DBRef) value), parent));
 		} else if (value instanceof BasicDBList) {
 			return (T) readCollectionOrArray(type, (BasicDBList) value, parent);
 		} else if (value instanceof DBObject) {
@@ -955,5 +1075,14 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			return (T) getPotentiallyConvertedSimpleRead(value, rawType);
 		}
 	}
+
+	/**
+	 * Performs the fetch operation for the given {@link DBRef}.
+	 * 
+	 * @param ref
+	 * @return
+	 */
+	DBObject readRef(DBRef ref) {
+		return ref.fetch();
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@ package org.springframework.data.mongodb.core.convert;
 
 import org.springframework.data.convert.EntityConverter;
 import org.springframework.data.convert.EntityReader;
+import org.springframework.data.convert.TypeMapper;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 
@@ -26,9 +27,17 @@ import com.mongodb.DBObject;
  * Central Mongo specific converter interface which combines {@link MongoWriter} and {@link MongoReader}.
  * 
  * @author Oliver Gierke
+ * @author Thomas Darimont
  */
 public interface MongoConverter extends
 		EntityConverter<MongoPersistentEntity<?>, MongoPersistentProperty, Object, DBObject>, MongoWriter<Object>,
 		EntityReader<Object, DBObject> {
 
+	/**
+	 * Returns thw {@link TypeMapper} being used to write type information into {@link DBObject}s created with that
+	 * converter.
+	 * 
+	 * @return will never be {@literal null}.
+	 */
+	MongoTypeMapper getTypeMapper();
 }

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

@@ -24,8 +24,11 @@ import org.bson.types.ObjectId;
 import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.converter.Converter;
+import org.springframework.data.convert.ReadingConverter;
 import org.springframework.util.StringUtils;
 
+import com.mongodb.DBObject;
+
 /**
  * Wrapper class to contain useful converters for the usage with Mongo.
  * 
@@ -147,4 +150,15 @@ abstract class MongoConverters {
 			}
 		}
 	}
+
+	@ReadingConverter
+	public static enum DBObjectToStringConverter implements Converter<DBObject, String> {
+
+		INSTANCE;
+
+		@Override
+		public String convert(DBObject source) {
+			return source == null ? null : source.toString();
+		}
+	}
 }

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

@@ -15,6 +15,8 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
+import java.util.Set;
+
 import org.springframework.data.convert.TypeMapper;
 
 import com.mongodb.DBObject;
@@ -32,4 +34,14 @@ public interface MongoTypeMapper extends TypeMapper<DBObject> {
 	 * @return
 	 */
 	boolean isTypeKey(String key);
+
+	/**
+	 * Writes type restrictions to the given {@link DBObject}. This usually results in an {@code $in}-clause to be
+	 * generated that restricts the type-key (e.g. {@code _class}) to be in the set of type aliases for the given
+	 * {@code restrictedTypes}.
+	 * 
+	 * @param result must not be {@literal null}
+	 * @param restrictedTypes must not be {@literal null}
+	 */
+	void writeTypeRestrictions(DBObject result, Set<Class<?>> restrictedTypes);
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 the original author or authors.
+ * Copyright 2010-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@ package org.springframework.data.mongodb.core.convert;
 
 import org.springframework.data.convert.EntityWriter;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.util.TypeInformation;
 
 import com.mongodb.DBObject;
 import com.mongodb.DBRef;
@@ -35,11 +36,21 @@ public interface MongoWriter<T> extends EntityWriter<T, DBObject> {
 	 * Converts the given object into one Mongo will be able to store natively. If the given object can already be stored
 	 * as is, no conversion will happen.
 	 * 
-	 * @param obj
+	 * @param obj can be {@literal null}.
 	 * @return
 	 */
 	Object convertToMongoType(Object obj);
 
+	/**
+	 * Converts the given object into one Mongo will be able to store natively but retains the type information in case
+	 * the given {@link TypeInformation} differs from the given object type.
+	 * 
+	 * @param obj can be {@literal null}.
+	 * @param typeInformation can be {@literal null}.
+	 * @return
+	 */
+	Object convertToMongoType(Object obj, TypeInformation<?> typeInformation);
+
 	/**
 	 * Creates a {@link DBRef} to refer to the given object.
 	 * 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 by the original author(s).
+ * 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.
@@ -17,35 +17,41 @@ package org.springframework.data.mongodb.core.convert;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 
-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.mapping.PropertyPath;
+import org.springframework.data.mapping.PropertyReferenceException;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mapping.context.PersistentPropertyPath;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.util.Assert;
 
 import com.mongodb.BasicDBList;
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
+import com.mongodb.DBRef;
 
 /**
  * A helper class to encapsulate any modifications of a Query object before it gets submitted to the database.
  * 
- * @author Jon Brisbin <jbrisbin@vmware.com>
+ * @author Jon Brisbin
  * @author Oliver Gierke
+ * @author Patryk Wasik
  */
 public class QueryMapper {
 
 	private static final List<String> DEFAULT_ID_NAMES = Arrays.asList("id", "_id");
-	private static final String N_OR_PATTERN = "\\$.*or";
 
 	private final ConversionService conversionService;
 	private final MongoConverter converter;
+	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
 
 	/**
 	 * Creates a new {@link QueryMapper} with the given {@link MongoConverter}.
@@ -53,9 +59,12 @@ public class QueryMapper {
 	 * @param converter must not be {@literal null}.
 	 */
 	public QueryMapper(MongoConverter converter) {
+
 		Assert.notNull(converter);
+
 		this.conversionService = converter.getConversionService();
 		this.converter = converter;
+		this.mappingContext = converter.getMappingContext();
 	}
 
 	/**
@@ -66,16 +75,105 @@ public class QueryMapper {
 	 * @param entity can be {@literal null}.
 	 * @return
 	 */
+	@SuppressWarnings("deprecation")
 	public DBObject getMappedObject(DBObject query, MongoPersistentEntity<?> entity) {
 
-		DBObject newDbo = new BasicDBObject();
+		if (isNestedKeyword(query)) {
+			return getMappedKeyword(new Keyword(query), entity);
+		}
+
+		DBObject result = new BasicDBObject();
 
 		for (String key : query.keySet()) {
 
-			String newKey = key;
+			// TODO: remove one once QueryMapper can work with Query instances directly
-			Object value = query.get(key);
+			if (Query.isRestrictedTypeKey(key)) {
+
+				@SuppressWarnings("unchecked")
+				Set<Class<?>> restrictedTypes = (Set<Class<?>>) query.get(key);
+				this.converter.getTypeMapper().writeTypeRestrictions(result, restrictedTypes);
+
+				continue;
+			}
+
+			if (isKeyword(key)) {
+				result.putAll(getMappedKeyword(new Keyword(query, key), entity));
+				continue;
+			}
+
+			Field field = entity == null ? new Field(key) : new MetadataBackedField(key, entity, mappingContext);
+
+			Object rawValue = query.get(key);
+			String newKey = field.getMappedKey();
+
+			if (isNestedKeyword(rawValue) && !field.isIdField()) {
+				Keyword keyword = new Keyword((DBObject) rawValue);
+				result.put(newKey, getMappedKeyword(field, keyword));
+			} else {
+				result.put(newKey, getMappedValue(field, rawValue));
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * Returns the given {@link DBObject} representing a keyword by mapping the keyword's value.
+	 * 
+	 * @param keyword the {@link DBObject} representing a keyword (e.g. {@code $ne : … } )
+	 * @param entity
+	 * @return
+	 */
+	private DBObject getMappedKeyword(Keyword keyword, MongoPersistentEntity<?> entity) {
+
+		// $or/$nor
+		if (keyword.isOrOrNor() || keyword.hasIterableValue()) {
+
+			Iterable<?> conditions = keyword.getValue();
+			BasicDBList newConditions = new BasicDBList();
+
+			for (Object condition : conditions) {
+				newConditions.add(condition instanceof DBObject ? getMappedObject((DBObject) condition, entity)
+						: convertSimpleOrDBObject(condition, entity));
+			}
+
+			return new BasicDBObject(keyword.getKey(), newConditions);
+		}
+
+		return new BasicDBObject(keyword.getKey(), convertSimpleOrDBObject(keyword.getValue(), entity));
+	}
+
+	/**
+	 * Returns the mapped keyword considered defining a criteria for the given property.
+	 * 
+	 * @param property
+	 * @param keyword
+	 * @return
+	 */
+	private DBObject getMappedKeyword(Field property, Keyword keyword) {
+
+		boolean needsAssociationConversion = property.isAssociation() && !keyword.isExists();
+		Object value = keyword.getValue();
+
+		Object convertedValue = needsAssociationConversion ? convertAssociation(value, property.getProperty())
+				: getMappedValue(property.with(keyword.getKey()), value);
+
+		return new BasicDBObject(keyword.key, convertedValue);
+	}
+
+	/**
+	 * Returns the mapped value for the given source object assuming it's a value for the given
+	 * {@link MongoPersistentProperty}.
+	 * 
+	 * @param value the source object to be mapped
+	 * @param property the property the value is a value for
+	 * @param newKey the key the value will be bound to eventually
+	 * @return
+	 */
+	private Object getMappedValue(Field documentField, Object value) {
+
+		if (documentField.isIdField()) {
 
-			if (isIdKey(key, entity)) {
 			if (value instanceof DBObject) {
 				DBObject valueDbo = (DBObject) value;
 				if (valueDbo.containsField("$in") || valueDbo.containsField("$nin")) {
@@ -85,30 +183,28 @@ public class QueryMapper {
 						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);
+					return 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(), null));
-				}
-				value = newConditions;
-			} else if (key.equals("$ne")) {
-				value = convertId(value);
 				}
 
-			newDbo.put(newKey, convertSimpleOrDBObject(value, null));
+				return valueDbo;
+
+			} else {
+				return convertId(value);
+			}
 		}
 
-		return newDbo;
+		if (isNestedKeyword(value)) {
+			return getMappedKeyword(new Keyword((DBObject) value), null);
+		}
+
+		if (documentField.isAssociation()) {
+			return convertAssociation(value, documentField.getProperty());
+		}
+
+		return convertSimpleOrDBObject(value, documentField.getPropertyEntity());
 	}
 
 	/**
@@ -121,36 +217,60 @@ public class QueryMapper {
 	private Object convertSimpleOrDBObject(Object source, MongoPersistentEntity<?> entity) {
 
 		if (source instanceof BasicDBList) {
-			return converter.convertToMongoType(source);
+			return delegateConvertToMongoType(source, entity);
 		}
 
 		if (source instanceof DBObject) {
 			return getMappedObject((DBObject) source, entity);
 		}
 
+		return delegateConvertToMongoType(source, entity);
+	}
+
+	/**
+	 * Converts the given source Object to a mongo type with the type information of the original source type omitted.
+	 * Subclasses may overwrite this method to retain the type information of the source type on the resulting mongo type.
+	 * 
+	 * @param source
+	 * @param entity
+	 * @return the converted mongo type or null if source is null
+	 */
+	protected Object delegateConvertToMongoType(Object source, MongoPersistentEntity<?> entity) {
 		return converter.convertToMongoType(source);
 	}
 
 	/**
-	 * Returns whether the given key will be considered an id key.
+	 * Converts the given source assuming it's actually an association to another object.
 	 * 
-	 * @param key
+	 * @param source
-	 * @param entity
+	 * @param property
 	 * @return
 	 */
-	private boolean isIdKey(String key, MongoPersistentEntity<?> entity) {
+	private Object convertAssociation(Object source, MongoPersistentProperty property) {
 
-		if (entity == null) {
+		if (property == null || !property.isAssociation()) {
-			return false;
+			return source;
 		}
 
-		MongoPersistentProperty idProperty = entity.getIdProperty();
+		if (source instanceof Iterable) {
-
+			BasicDBList result = new BasicDBList();
-		if (idProperty != null) {
+			for (Object element : (Iterable<?>) source) {
-			return idProperty.getName().equals(key) || idProperty.getFieldName().equals(key);
+				result.add(element instanceof DBRef ? element : converter.toDBRef(element, property));
+			}
+			return result;
 		}
 
-		return DEFAULT_ID_NAMES.contains(key);
+		if (property.isMap()) {
+			BasicDBObject result = new BasicDBObject();
+			DBObject dbObject = (DBObject) source;
+			for (String key : dbObject.keySet()) {
+				Object o = dbObject.get(key);
+				result.put(key, o instanceof DBRef ? o : converter.toDBRef(o, property));
+			}
+			return result;
+		}
+
+		return source == null || source instanceof DBRef ? source : converter.toDBRef(source, property);
 	}
 
 	/**
@@ -167,6 +287,280 @@ public class QueryMapper {
 			// Ignore
 		}
 
-		return converter.convertToMongoType(id);
+		return delegateConvertToMongoType(id, null);
+	}
+
+	/**
+	 * Returns whether the given {@link Object} is a keyword, i.e. if it's a {@link DBObject} with a keyword key.
+	 * 
+	 * @param candidate
+	 * @return
+	 */
+	protected boolean isNestedKeyword(Object candidate) {
+
+		if (!(candidate instanceof BasicDBObject)) {
+			return false;
+		}
+
+		BasicDBObject dbObject = (BasicDBObject) candidate;
+		Set<String> keys = dbObject.keySet();
+
+		if (keys.size() != 1) {
+			return false;
+		}
+
+		return isKeyword(keys.iterator().next().toString());
+	}
+
+	/**
+	 * Returns whether the given {@link String} is a MongoDB keyword. The default implementation will check against the
+	 * set of registered keywords returned by {@link #getKeywords()}.
+	 * 
+	 * @param candidate
+	 * @return
+	 */
+	protected boolean isKeyword(String candidate) {
+		return candidate.startsWith("$");
+	}
+
+	/**
+	 * Value object to capture a query keyword representation.
+	 * 
+	 * @author Oliver Gierke
+	 */
+	private static class Keyword {
+
+		private static final String N_OR_PATTERN = "\\$.*or";
+
+		private final String key;
+		private final Object value;
+
+		public Keyword(DBObject source, String key) {
+			this.key = key;
+			this.value = source.get(key);
+		}
+
+		public Keyword(DBObject dbObject) {
+
+			Set<String> keys = dbObject.keySet();
+			Assert.isTrue(keys.size() == 1, "Can only use a single value DBObject!");
+
+			this.key = keys.iterator().next();
+			this.value = dbObject.get(key);
+		}
+
+		/**
+		 * Returns whether the current keyword is the {@code $exists} keyword.
+		 * 
+		 * @return
+		 */
+		public boolean isExists() {
+			return "$exists".equalsIgnoreCase(key);
+		}
+
+		public boolean isOrOrNor() {
+			return key.matches(N_OR_PATTERN);
+		}
+
+		public boolean hasIterableValue() {
+			return value instanceof Iterable;
+		}
+
+		public String getKey() {
+			return key;
+		}
+
+		@SuppressWarnings("unchecked")
+		public <T> T getValue() {
+			return (T) value;
+		}
+	}
+
+	/**
+	 * Value object to represent a field and its meta-information.
+	 * 
+	 * @author Oliver Gierke
+	 */
+	private static class Field {
+
+		private static final String ID_KEY = "_id";
+
+		protected final String name;
+
+		/**
+		 * Creates a new {@link DocumentField} without meta-information but the given name.
+		 * 
+		 * @param name must not be {@literal null} or empty.
+		 */
+		public Field(String name) {
+
+			Assert.hasText(name, "Name must not be null!");
+			this.name = name;
+		}
+
+		/**
+		 * Returns a new {@link DocumentField} with the given name.
+		 * 
+		 * @param name must not be {@literal null} or empty.
+		 * @return
+		 */
+		public Field with(String name) {
+			return new Field(name);
+		}
+
+		/**
+		 * Returns whether the current field is the id field.
+		 * 
+		 * @return
+		 */
+		public boolean isIdField() {
+			return ID_KEY.equals(name);
+		}
+
+		/**
+		 * Returns the underlying {@link MongoPersistentProperty} backing the field.
+		 * 
+		 * @return
+		 */
+		public MongoPersistentProperty getProperty() {
+			return null;
+		}
+
+		/**
+		 * Returns the {@link MongoPersistentEntity} that field is conatined in.
+		 * 
+		 * @return
+		 */
+		public MongoPersistentEntity<?> getPropertyEntity() {
+			return null;
+		}
+
+		/**
+		 * Returns whether the field represents an association.
+		 * 
+		 * @return
+		 */
+		public boolean isAssociation() {
+			return false;
+		}
+
+		/**
+		 * Returns the key to be used in the mapped document eventually.
+		 * 
+		 * @return
+		 */
+		public String getMappedKey() {
+			return isIdField() ? ID_KEY : name;
+		}
+	}
+
+	/**
+	 * Extension of {@link DocumentField} to be backed with mapping metadata.
+	 * 
+	 * @author Oliver Gierke
+	 */
+	private static class MetadataBackedField extends Field {
+
+		private final MongoPersistentEntity<?> entity;
+		private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
+		private final MongoPersistentProperty property;
+
+		/**
+		 * Creates a new {@link MetadataBackedField} with the given name, {@link MongoPersistentEntity} and
+		 * {@link MappingContext}.
+		 * 
+		 * @param name must not be {@literal null} or empty.
+		 * @param entity must not be {@literal null}.
+		 * @param context must not be {@literal null}.
+		 */
+		public MetadataBackedField(String name, MongoPersistentEntity<?> entity,
+				MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> context) {
+
+			super(name);
+
+			Assert.notNull(entity, "MongoPersistentEntity must not be null!");
+
+			this.entity = entity;
+			this.mappingContext = context;
+
+			PersistentPropertyPath<MongoPersistentProperty> path = getPath(name);
+			this.property = path == null ? null : path.getLeafProperty();
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#with(java.lang.String)
+		 */
+		@Override
+		public MetadataBackedField with(String name) {
+			return new MetadataBackedField(name, entity, mappingContext);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#isIdKey()
+		 */
+		@Override
+		public boolean isIdField() {
+
+			MongoPersistentProperty idProperty = entity.getIdProperty();
+
+			if (idProperty != null) {
+				return idProperty.getName().equals(name) || idProperty.getFieldName().equals(name);
+			}
+
+			return DEFAULT_ID_NAMES.contains(name);
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#getProperty()
+		 */
+		@Override
+		public MongoPersistentProperty getProperty() {
+			return property;
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#getEntity()
+		 */
+		@Override
+		public MongoPersistentEntity<?> getPropertyEntity() {
+			MongoPersistentProperty property = getProperty();
+			return property == null ? null : mappingContext.getPersistentEntity(property);
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#isAssociation()
+		 */
+		@Override
+		public boolean isAssociation() {
+
+			MongoPersistentProperty property = getProperty();
+			return property == null ? false : property.isAssociation();
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#getTargetKey()
+		 */
+		@Override
+		public String getMappedKey() {
+
+			PersistentPropertyPath<MongoPersistentProperty> path = getPath(name);
+			return path == null ? name : path.toDotPath(MongoPersistentProperty.PropertyToFieldNameConverter.INSTANCE);
+		}
+
+		private PersistentPropertyPath<MongoPersistentProperty> getPath(String name) {
+
+			try {
+				PropertyPath path = PropertyPath.from(name, entity.getTypeInformation());
+				return mappingContext.getPersistentPropertyPath(path);
+			} catch (PropertyReferenceException e) {
+				return null;
+			}
+		}
 	}
 }

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

@@ -0,0 +1,52 @@
+/*
+ * 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.convert;
+
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+
+/**
+ * A subclass of {@link QueryMapper} that retains type information on the mongo types.
+ * 
+ * @author Thomas Darimont
+ */
+public class UpdateMapper extends QueryMapper {
+
+	private final MongoWriter<?> converter;
+
+	/**
+	 * Creates a new {@link UpdateMapper} using the given {@link MongoConverter}.
+	 * 
+	 * @param converter must not be {@literal null}.
+	 */
+	public UpdateMapper(MongoConverter converter) {
+
+		super(converter);
+		this.converter = converter;
+	}
+
+	/**
+	 * Converts the given source object to a mongo type retaining the original type information of the source type on the
+	 * mongo type.
+	 * 
+	 * @see org.springframework.data.mongodb.core.convert.QueryMapper#delegateConvertToMongoType(java.lang.Object,
+	 *      org.springframework.data.mongodb.core.mapping.MongoPersistentEntity)
+	 */
+	@Override
+	protected Object delegateConvertToMongoType(Object source, MongoPersistentEntity<?> entity) {
+		return entity == null ? super.delegateConvertToMongoType(source, null) : converter.convertToMongoType(source,
+				entity.getTypeInformation());
+	}
+}

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

@@ -0,0 +1,5 @@
+/**
+ * Spring Data MongoDB specific converter infrastructure.
+ */
+package org.springframework.data.mongodb.core.convert;
+

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

@@ -0,0 +1,43 @@
+/*
+ * 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.geo;
+
+/**
+ * Value object to create custom {@link Metric}s on the fly.
+ * 
+ * @author Oliver Gierke
+ */
+public class CustomMetric implements Metric {
+
+	private final double multiplier;
+
+	/**
+	 * Creates a custom {@link Metric} using the given multiplier.
+	 * 
+	 * @param multiplier
+	 */
+	public CustomMetric(double multiplier) {
+		this.multiplier = multiplier;
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.geo.Metric#getMultiplier()
+	 */
+	public double getMultiplier() {
+		return multiplier;
+	}
+}

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

@@ -131,7 +131,7 @@ public class GeoResults<T> implements Iterable<GeoResult<T>> {
 	private static Distance calculateAverageDistance(List<? extends GeoResult<?>> results, Metric metric) {
 
 		if (results.isEmpty()) {
-			return new Distance(0, null);
+			return new Distance(0, metric);
 		}
 
 		double averageDistance = 0;

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

@@ -0,0 +1,5 @@
+/**
+ * Support for MongoDB geo-spatial queries.
+ */
+package org.springframework.data.mongodb.core.geo;
+

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,8 @@ import java.lang.annotation.Target;
  * 
  * @author Jon Brisbin
  * @author Oliver Gierke
+ * @author Philipp Schneider
+ * @author Johno Crawford
  */
 @Target({ ElementType.TYPE })
 @Documented
@@ -69,4 +71,20 @@ public @interface CompoundIndex {
 	 * @return
 	 */
 	String collection() default "";
+
+	/**
+	 * If {@literal true} the index will be created in the background.
+	 * 
+	 * @see http://docs.mongodb.org/manual/core/indexes/#background-construction
+	 * @return
+	 */
+	boolean background() default false;
+
+	/**
+	 * Configures the number of seconds after which the collection should expire. Defaults to -1 for no expiry.
+	 * 
+	 * @see http://docs.mongodb.org/manual/tutorial/expire-data/
+	 * @return
+	 */
+	int expireAfterSeconds() default -1;
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,18 +18,20 @@ package org.springframework.data.mongodb.core.index;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.mongodb.core.query.Order;
 
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
 
+@SuppressWarnings("deprecation")
 public class Index implements IndexDefinition {
 
 	public enum Duplicates {
 		RETAIN, DROP
 	}
 
-	private final Map<String, Order> fieldSpec = new LinkedHashMap<String, Order>();
+	private final Map<String, Direction> fieldSpec = new LinkedHashMap<String, Direction>();
 
 	private String name;
 
@@ -42,12 +44,37 @@ public class Index implements IndexDefinition {
 	public Index() {
 	}
 
-	public Index(String key, Order order) {
+	public Index(String key, Direction direction) {
-		fieldSpec.put(key, order);
+		fieldSpec.put(key, direction);
 	}
 
+	/**
+	 * Creates a new {@link Indexed} on the given key and {@link Order}.
+	 * 
+	 * @deprecated use {@link #Index(String, Direction)} instead.
+	 * @param key must not be {@literal null} or empty.
+	 * @param order must not be {@literal null}.
+	 */
+	@Deprecated
+	public Index(String key, Order order) {
+		this(key, order.toDirection());
+	}
+
+	/**
+	 * Adds the given field to the index.
+	 * 
+	 * @deprecated use {@link #on(String, Direction)} instead.
+	 * @param key must not be {@literal null} or empty.
+	 * @param order must not be {@literal null}.
+	 * @return
+	 */
+	@Deprecated
 	public Index on(String key, Order order) {
-		fieldSpec.put(key, order);
+		return on(key, order.toDirection());
+	}
+
+	public Index on(String key, Direction direction) {
+		fieldSpec.put(key, direction);
 		return this;
 	}
 
@@ -76,7 +103,7 @@ public class Index implements IndexDefinition {
 	public DBObject getIndexKeys() {
 		DBObject dbo = new BasicDBObject();
 		for (String k : fieldSpec.keySet()) {
-			dbo.put(k, (fieldSpec.get(k).equals(Order.ASCENDING) ? 1 : -1));
+			dbo.put(k, fieldSpec.get(k).equals(Direction.ASC) ? 1 : -1);
 		}
 		return dbo;
 	}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 the original author or authors.
+ * Copyright 2012-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package org.springframework.data.mongodb.core.index;
 
+import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.mongodb.core.query.Order;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
@@ -24,30 +25,38 @@ import org.springframework.util.ObjectUtils;
  * 
  * @author Oliver Gierke
  */
+@SuppressWarnings("deprecation")
 public final class IndexField {
 
 	private final String key;
-	private final Order order;
+	private final Direction direction;
 	private final boolean isGeo;
 
-	private IndexField(String key, Order order, boolean isGeo) {
+	private IndexField(String key, Direction direction, boolean isGeo) {
 
 		Assert.hasText(key);
-		Assert.isTrue(order != null ^ isGeo);
+		Assert.isTrue(direction != null ^ isGeo);
 
 		this.key = key;
-		this.order = order;
+		this.direction = direction;
 		this.isGeo = isGeo;
 	}
 
 	/**
 	 * Creates a default {@link IndexField} with the given key and {@link Order}.
 	 * 
+	 * @deprecated use {@link #create(String, Direction)}.
 	 * @param key must not be {@literal null} or emtpy.
-	 * @param order must not be {@literal null}.
+	 * @param direction must not be {@literal null}.
 	 * @return
 	 */
+	@Deprecated
 	public static IndexField create(String key, Order order) {
+		Assert.notNull(order);
+		return new IndexField(key, order.toDirection(), false);
+	}
+
+	public static IndexField create(String key, Direction order) {
 		Assert.notNull(order);
 		return new IndexField(key, order, false);
 	}
@@ -70,12 +79,23 @@ public final class IndexField {
 	}
 
 	/**
-	 * Returns the order of the {@link IndexField} or {@literal null} in case we have a geo index field.
+	 * Returns the direction of the {@link IndexField} or {@literal null} in case we have a geo index field.
 	 * 
-	 * @return the order
+	 * @deprecated use {@link #getDirection()} instead.
+	 * @return the direction
 	 */
+	@Deprecated
 	public Order getOrder() {
-		return order;
+		return Direction.ASC.equals(direction) ? Order.ASCENDING : Order.DESCENDING;
+	}
+
+	/**
+	 * Returns the direction of the {@link IndexField} or {@literal null} in case we have a geo index field.
+	 * 
+	 * @return the direction
+	 */
+	public Direction getDirection() {
+		return direction;
 	}
 
 	/**
@@ -104,7 +124,8 @@ public final class IndexField {
 
 		IndexField that = (IndexField) obj;
 
-		return this.key.equals(that.key) && ObjectUtils.nullSafeEquals(this.order, that.order) && this.isGeo == that.isGeo;
+		return this.key.equals(that.key) && ObjectUtils.nullSafeEquals(this.direction, that.direction)
+				&& this.isGeo == that.isGeo;
 	}
 
 	/* 
@@ -116,7 +137,7 @@ public final class IndexField {
 
 		int result = 17;
 		result += 31 * ObjectUtils.nullSafeHashCode(key);
-		result += 31 * ObjectUtils.nullSafeHashCode(order);
+		result += 31 * ObjectUtils.nullSafeHashCode(direction);
 		result += 31 * ObjectUtils.nullSafeHashCode(isGeo);
 		return result;
 	}
@@ -127,6 +148,6 @@ public final class IndexField {
 	 */
 	@Override
 	public String toString() {
-		return String.format("IndexField [ key: %s, order: %s, isGeo: %s]", key, order, isGeo);
+		return String.format("IndexField [ key: %s, direction: %s, isGeo: %s]", key, direction, isGeo);
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 by the original author(s).
+ * 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.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.mongodb.core.index;
 
 import java.lang.annotation.ElementType;
@@ -24,7 +23,10 @@ import java.lang.annotation.Target;
 /**
  * Mark a field to be indexed using MongoDB's indexing feature.
  * 
- * @author Jon Brisbin <jbrisbin@vmware.com>
+ * @author Jon Brisbin
+ * @author Oliver Gierke
+ * @author Philipp Schneider
+ * @author Johno Crawford
  */
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
@@ -41,4 +43,20 @@ public @interface Indexed {
 	String name() default "";
 
 	String collection() default "";
+
+	/**
+	 * If {@literal true} the index will be created in the background.
+	 * 
+	 * @see http://docs.mongodb.org/manual/core/indexes/#background-construction
+	 * @return
+	 */
+	boolean background() default false;
+
+	/**
+	 * Configures the number of seconds after which the collection should expire. Defaults to -1 for no expiry.
+	 * 
+	 * @see http://docs.mongodb.org/manual/tutorial/expire-data/
+	 * @return
+	 */
+	int expireAfterSeconds() default -1;
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 by the original author(s).
+ * 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.
@@ -13,37 +13,51 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.mongodb.core.index;
 
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.data.mapping.event.MappingContextEvent;
+import org.springframework.data.mapping.context.MappingContextEvent;
+import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.mongodb.core.mapping.event.AfterLoadEvent;
+import org.springframework.data.mongodb.core.mapping.event.AfterSaveEvent;
+import org.springframework.util.Assert;
 
 /**
- * An implementation of ApplicationEventPublisher that will only fire MappingContextEvents for use by the index creator
+ * An implementation of ApplicationEventPublisher that will only fire {@link MappingContextEvent}s for use by the index
- * when MongoTemplate is used 'stand-alone', that is not declared inside a Spring ApplicationContext.
+ * creator when MongoTemplate is used 'stand-alone', that is not declared inside a Spring {@link ApplicationContext}.
+ * Declare {@link MongoTemplate} inside an {@link ApplicationContext} to enable the publishing of all persistence events
+ * such as {@link AfterLoadEvent}, {@link AfterSaveEvent}, etc.
  * 
- * Declare MongoTemplate inside an ApplicationContext to enable the publishing of all persistence events such as
+ * @author Jon Brisbin
- * {@link AfterLoadEvent}, {@link AfterSaveEvent}, etc.
+ * @author Oliver Gierke
- * 
- * @author Jon Brisbin <jbrisbin@vmware.com>
  */
 public class MongoMappingEventPublisher implements ApplicationEventPublisher {
 
-	private MongoPersistentEntityIndexCreator indexCreator;
+	private final MongoPersistentEntityIndexCreator indexCreator;
 
+	/**
+	 * Creates a new {@link MongoMappingEventPublisher} for the given {@link MongoPersistentEntityIndexCreator}.
+	 * 
+	 * @param indexCreator must not be {@literal null}.
+	 */
 	public MongoMappingEventPublisher(MongoPersistentEntityIndexCreator indexCreator) {
+
+		Assert.notNull(indexCreator);
 		this.indexCreator = indexCreator;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.context.ApplicationEventPublisher#publishEvent(org.springframework.context.ApplicationEvent)
+	 */
 	@SuppressWarnings("unchecked")
 	public void publishEvent(ApplicationEvent event) {
 		if (event instanceof MappingContextEvent) {
-			indexCreator
+			indexCreator.onApplicationEvent((MappingContextEvent<MongoPersistentEntity<?>, MongoPersistentProperty>) event);
-					.onApplicationEvent((MappingContextEvent<MongoPersistentEntity<MongoPersistentProperty>, MongoPersistentProperty>) event);
 		}
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationListener;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.PropertyHandler;
-import org.springframework.data.mapping.event.MappingContextEvent;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mapping.context.MappingContextEvent;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
@@ -42,27 +43,32 @@ import com.mongodb.util.JSON;
  * 
  * @author Jon Brisbin
  * @author Oliver Gierke
+ * @author Philipp Schneider
+ * @author Johno Crawford
  */
 public class MongoPersistentEntityIndexCreator implements
-		ApplicationListener<MappingContextEvent<MongoPersistentEntity<MongoPersistentProperty>, MongoPersistentProperty>> {
+		ApplicationListener<MappingContextEvent<MongoPersistentEntity<?>, MongoPersistentProperty>> {
 
 	private static final Logger log = LoggerFactory.getLogger(MongoPersistentEntityIndexCreator.class);
 
 	private final Map<Class<?>, Boolean> classesSeen = new ConcurrentHashMap<Class<?>, Boolean>();
 	private final MongoDbFactory mongoDbFactory;
+	private final MongoMappingContext mappingContext;
 
 	/**
 	 * Creats a new {@link MongoPersistentEntityIndexCreator} for the given {@link MongoMappingContext} and
 	 * {@link MongoDbFactory}.
 	 * 
-	 * @param mappingContext must not be {@@iteral null}
+	 * @param mappingContext must not be {@literal null}
-	 * @param mongoDbFactory must not be {@@iteral null}
+	 * @param mongoDbFactory must not be {@literal null}
 	 */
 	public MongoPersistentEntityIndexCreator(MongoMappingContext mappingContext, MongoDbFactory mongoDbFactory) {
 
 		Assert.notNull(mongoDbFactory);
 		Assert.notNull(mappingContext);
+
 		this.mongoDbFactory = mongoDbFactory;
+		this.mappingContext = mappingContext;
 
 		for (MongoPersistentEntity<?> entity : mappingContext.getPersistentEntities()) {
 			checkForIndexes(entity);
@@ -73,8 +79,11 @@ public class MongoPersistentEntityIndexCreator implements
 	 * (non-Javadoc)
 	 * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.springframework.context.ApplicationEvent)
 	 */
-	public void onApplicationEvent(
+	public void onApplicationEvent(MappingContextEvent<MongoPersistentEntity<?>, MongoPersistentProperty> event) {
-			MappingContextEvent<MongoPersistentEntity<MongoPersistentProperty>, MongoPersistentProperty> event) {
+
+		if (!event.wasEmittedBy(mappingContext)) {
+			return;
+		}
 
 		PersistentEntity<?, ?> entity = event.getPersistentEntity();
 
@@ -99,7 +108,8 @@ public class MongoPersistentEntityIndexCreator implements
 					String indexColl = StringUtils.hasText(index.collection()) ? index.collection() : entity.getCollection();
 					DBObject definition = (DBObject) JSON.parse(index.def());
 
-					ensureIndex(indexColl, index.name(), definition, index.unique(), index.dropDups(), index.sparse());
+					ensureIndex(indexColl, index.name(), definition, index.unique(), index.dropDups(), index.sparse(),
+							index.background(), index.expireAfterSeconds());
 
 					if (log.isDebugEnabled()) {
 						log.debug("Created compound index " + index);
@@ -133,7 +143,8 @@ public class MongoPersistentEntityIndexCreator implements
 						int direction = index.direction() == IndexDirection.ASCENDING ? 1 : -1;
 						DBObject definition = new BasicDBObject(persistentProperty.getFieldName(), direction);
 
-						ensureIndex(collection, name, definition, index.unique(), index.dropDups(), index.sparse());
+						ensureIndex(collection, name, definition, index.unique(), index.dropDups(), index.sparse(),
+								index.background(), index.expireAfterSeconds());
 
 						if (log.isDebugEnabled()) {
 							log.debug("Created property index " + index);
@@ -163,14 +174,41 @@ public class MongoPersistentEntityIndexCreator implements
 		}
 	}
 
+	/**
+	 * Returns whether the current index creator was registered for the given {@link MappingContext}.
+	 * 
+	 * @param context
+	 * @return
+	 */
+	public boolean isIndexCreatorFor(MappingContext<?, ?> context) {
+		return this.mappingContext.equals(context);
+	}
+
+	/**
+	 * Triggers the actual index creation.
+	 * 
+	 * @param collection the collection to create the index in
+	 * @param name the name of the index about to be created
+	 * @param indexDefinition the index definition
+	 * @param unique whether it shall be a unique index
+	 * @param dropDups whether to drop duplicates
+	 * @param sparse sparse or not
+	 * @param background whether the index will be created in the background
+	 * @param expireAfterSeconds the time to live for documents in the collection
+	 */
 	protected void ensureIndex(String collection, String name, DBObject indexDefinition, boolean unique,
-			boolean dropDups, boolean sparse) {
+			boolean dropDups, boolean sparse, boolean background, int expireAfterSeconds) {
 
 		DBObject opts = new BasicDBObject();
 		opts.put("name", name);
 		opts.put("dropDups", dropDups);
 		opts.put("sparse", sparse);
 		opts.put("unique", unique);
+		opts.put("background", background);
+
+		if (expireAfterSeconds != -1) {
+			opts.put("expireAfterSeconds", expireAfterSeconds);
+		}
 
 		mongoDbFactory.getDb().getCollection(collection).ensureIndex(indexDefinition, opts);
 	}

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

@@ -0,0 +1,5 @@
+/**
+ * Support for MongoDB document indexing.
+ */
+package org.springframework.data.mongodb.core.index;
+

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 by the original author(s).
+ * 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.
@@ -13,36 +13,45 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.mongodb.core.mapping;
 
+import java.lang.reflect.Field;
 import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.expression.BeanFactoryAccessor;
 import org.springframework.context.expression.BeanFactoryResolver;
-import org.springframework.data.mapping.PersistentEntity;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mapping.Association;
+import org.springframework.data.mapping.AssociationHandler;
+import org.springframework.data.mapping.PropertyHandler;
 import org.springframework.data.mapping.model.BasicPersistentEntity;
+import org.springframework.data.mapping.model.MappingException;
 import org.springframework.data.mongodb.MongoCollectionUtils;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.expression.Expression;
 import org.springframework.expression.ParserContext;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
+import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
- * Mongo specific {@link PersistentEntity} implementation that adds Mongo specific meta-data such as the collection name
+ * MongoDB specific {@link MongoPersistentEntity} implementation that adds Mongo specific meta-data such as the
- * and the like.
+ * collection name and the like.
  * 
- * @author Jon Brisbin <jbrisbin@vmware.com>
+ * @author Jon Brisbin
  * @author Oliver Gierke
+ * @author Thomas Darimont
  */
 public class BasicMongoPersistentEntity<T> extends BasicPersistentEntity<T, MongoPersistentProperty> implements
 		MongoPersistentEntity<T>, ApplicationContextAware {
 
+	private static final String AMBIGUOUS_FIELD_MAPPING = "Ambiguous field mapping detected! Both %s and %s map to the same field name %s! Disambiguate using @DocumentField annotation!";
 	private final String collection;
 	private final SpelExpressionParser parser;
 	private final StandardEvaluationContext context;
@@ -76,22 +85,34 @@ public class BasicMongoPersistentEntity<T> extends BasicPersistentEntity<T, Mong
 	 * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
 	 */
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+
 		context.addPropertyAccessor(new BeanFactoryAccessor());
 		context.setBeanResolver(new BeanFactoryResolver(applicationContext));
 		context.setRootObject(applicationContext);
 	}
 
-	/**
+	/*
-	 * Returns the collection the entity should be stored in.
+	 * (non-Javadoc)
-	 * 
+	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentEntity#getCollection()
-	 * @return
 	 */
 	public String getCollection() {
-
 		Expression expression = parser.parseExpression(collection, ParserContext.TEMPLATE_EXPRESSION);
 		return expression.getValue(context, String.class);
 	}
 
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mapping.model.BasicPersistentEntity#verify()
+	 */
+	@Override
+	public void verify() {
+
+		AssertFieldNameUniquenessHandler handler = new AssertFieldNameUniquenessHandler();
+
+		doWithProperties(handler);
+		doWithAssociations(handler);
+	}
+
 	/**
 	 * {@link Comparator} implementation inspecting the {@link MongoPersistentProperty}'s order.
 	 * 
@@ -118,4 +139,91 @@ public class BasicMongoPersistentEntity<T> extends BasicPersistentEntity<T, Mong
 			return o1.getFieldOrder() - o2.getFieldOrder();
 		}
 	}
+
+	/**
+	 * As a general note: An implicit id property has a name that matches "id" or "_id". An explicit id property is one
+	 * that is annotated with @see {@link Id}. The property id is updated according to the following rules: 1) An id
+	 * property which is defined explicitly takes precedence over an implicitly defined id property. 2) In case of any
+	 * ambiguity a @see {@link MappingException} is thrown.
+	 * 
+	 * @param property - the new id property candidate
+	 * @return
+	 */
+	@Override
+	protected MongoPersistentProperty returnPropertyIfBetterIdPropertyCandidateOrNull(MongoPersistentProperty property) {
+
+		Assert.notNull(property);
+
+		if (!property.isIdProperty()) {
+			return null;
+		}
+
+		MongoPersistentProperty currentIdProperty = getIdProperty();
+
+		boolean currentIdPropertyIsSet = currentIdProperty != null;
+		@SuppressWarnings("null")
+		boolean currentIdPropertyIsExplicit = currentIdPropertyIsSet ? currentIdProperty.isExplicitIdProperty() : false;
+		boolean newIdPropertyIsExplicit = property.isExplicitIdProperty();
+
+		if (!currentIdPropertyIsSet) {
+			return property;
+
+		}
+
+		@SuppressWarnings("null")
+		Field currentIdPropertyField = currentIdProperty.getField();
+
+		if (newIdPropertyIsExplicit && currentIdPropertyIsExplicit) {
+			throw new MappingException(String.format(
+					"Attempt to add explicit id property %s but already have an property %s registered "
+							+ "as explicit id. Check your mapping configuration!", property.getField(), currentIdPropertyField));
+
+		} else if (newIdPropertyIsExplicit && !currentIdPropertyIsExplicit) {
+			// explicit id property takes precedence over implicit id property
+			return property;
+
+		} else if (!newIdPropertyIsExplicit && currentIdPropertyIsExplicit) {
+			// no id property override - current property is explicitly defined
+
+		} else {
+			throw new MappingException(String.format(
+					"Attempt to add id property %s but already have an property %s registered "
+							+ "as id. Check your mapping configuration!", property.getField(), currentIdPropertyField));
+		}
+
+		return null;
+	}
+
+	/**
+	 * Handler to collect {@link MongoPersistentProperty} instances and check that each of them is mapped to a distinct
+	 * field name.
+	 * 
+	 * @author Oliver Gierke
+	 */
+	private static class AssertFieldNameUniquenessHandler implements PropertyHandler<MongoPersistentProperty>,
+			AssociationHandler<MongoPersistentProperty> {
+
+		private final Map<String, MongoPersistentProperty> properties = new HashMap<String, MongoPersistentProperty>();
+
+		public void doWithPersistentProperty(MongoPersistentProperty persistentProperty) {
+			assertUniqueness(persistentProperty);
+		}
+
+		public void doWithAssociation(Association<MongoPersistentProperty> association) {
+			assertUniqueness(association.getInverse());
+		}
+
+		private void assertUniqueness(MongoPersistentProperty property) {
+
+			String fieldName = property.getFieldName();
+			MongoPersistentProperty existingProperty = properties.get(fieldName);
+
+			if (existingProperty != null) {
+				throw new MappingException(String.format(AMBIGUOUS_FIELD_MAPPING, property.toString(),
+						existingProperty.toString(), fieldName));
+			}
+
+			properties.put(fieldName, property);
+		}
+	}
 }