DATAMONGO-799 - Release version 1.4.0.M1.

Updated project metadata and bumped versions.

README.md

@@ -26,7 +26,7 @@ Add the Maven dependency:
 <dependency>
   <groupId>org.springframework.data</groupId>
   <artifactId>spring-data-mongodb</artifactId>
-  <version>1.2.3.RELEASE</version>
+  <version>1.3.2.RELEASE</version>
 </dependency>
 ```
 
@@ -36,7 +36,7 @@ If you'd rather like the latest snapshots of the upcoming major version, use our
 <dependency>
   <groupId>org.springframework.data</groupId>
   <artifactId>spring-data-mongodb</artifactId>
-  <version>1.3.0.BUILD-SNAPSHOT</version>
+  <version>1.4.0.BUILD-SNAPSHOT</version>
 </dependency>
 
 <repository>

pom.xml

@@ -5,7 +5,7 @@
 	
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-mongodb-parent</artifactId>
-	<version>1.3.0.RELEASE</version>
+	<version>1.4.0.M1</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data MongoDB</name>
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>1.2.0.RELEASE</version>
+		<version>1.3.0.M1</version>
 		<relativePath>../spring-data-build/parent/pom.xml</relativePath>
 	</parent>
 	
@@ -29,19 +29,19 @@
 	<properties>
 		<project.type>multi</project.type>
 		<dist.id>spring-data-mongodb</dist.id>
-		<springdata.commons>1.6.0.RELEASE</springdata.commons>
-		<mongo>2.10.1</mongo>
+		<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 vmware.com</email>
-			<organization>SpringSource</organization>
-			<organizationUrl>http://www.springsource.com</organizationUrl>
+			<email>ogierke at gopivotal.com</email>
+			<organization>Pivotal</organization>
+			<organizationUrl>http://www.gopivotal.com</organizationUrl>
 			<roles>
-				<role>Project Lean</role>
+				<role>Project Lead</role>
 			</roles>
 			<timezone>+1</timezone>
 		</developer>
@@ -49,8 +49,8 @@
 			<id>trisberg</id>
 			<name>Thomas Risberg</name>
 			<email>trisberg at vmware.com</email>
-			<organization>SpringSource</organization>
-			<organizationUrl>http://www.springsource.com</organizationUrl>
+			<organization>Pivotal</organization>
+			<organizationUrl>http://www.gopivotal.com</organizationUrl>
 			<roles>
 				<role>Developer</role>
 			</roles>
@@ -59,9 +59,9 @@
 		<developer>
 			<id>mpollack</id>
 			<name>Mark Pollack</name>
-			<email>mpollack at vmware.com</email>
-			<organization>SpringSource</organization>
-			<organizationUrl>http://www.springsource.com</organizationUrl>
+			<email>mpollack at gopivotal.com</email>
+			<organization>Pivotal</organization>
+			<organizationUrl>http://www.gopivotal.com</organizationUrl>
 			<roles>
 				<role>Developer</role>
 			</roles>
@@ -70,14 +70,25 @@
 		<developer>
 			<id>jbrisbin</id>
 			<name>Jon Brisbin</name>
-			<email>jbrisbin at vmware.com</email>
-			<organization>SpringSource</organization>
-			<organizationUrl>http://www.springsource.com</organizationUrl>
+			<email>jbrisbin at gopivotal.com</email>
+			<organization>Pivotal</organization>
+			<organizationUrl>http://www.gopivotal.com</organizationUrl>
 			<roles>
 				<role>Developer</role>
 			</roles>
 			<timezone>-6</timezone>
 		</developer>
+		<developer>
+			<id>tdarimont</id>
+			<name>Thomas Darimont</name>
+			<email>tdarimont at gopivotal.com</email>
+			<organization>Pivotal</organization>
+			<organizationUrl>http://www.gopivotal.com</organizationUrl>
+			<roles>
+				<role>Developer</role>
+			</roles>
+			<timezone>+1</timezone>
+		</developer>
 	</developers>
 
 	<dependencies>
@@ -91,8 +102,8 @@
 	
 	<repositories>
 		<repository>
-			<id>spring-lib-release</id>
-			<url>http://repo.springsource.org/libs-release-local</url>
+			<id>spring-libs-milestone</id>
+			<url>http://repo.springsource.org/libs-milestone-local</url>
 		</repository>
 	</repositories>
 

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

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.3.0.RELEASE</version>
+		<version>1.4.0.M1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
@@ -52,7 +52,7 @@
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-mongodb</artifactId>
-			<version>1.3.0.RELEASE</version>
+			<version>1.4.0.M1</version>
 		</dependency>
 
 		<dependency>

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

@@ -12,7 +12,7 @@ Import-Template:
  org.aspectj.*;version="${aspectj:[1.0.0, 2.0.0)}",
  org.bson.*;version="0",
  org.slf4j.*;version="${slf4j:[=.=.=,+1.0.0)}",
- org.springframework.*;version="${spring30:[=.=.=.=,+1.0.0)}",
+ org.springframework.*;version="${spring:[=.=.=.=,+1.0.0)}",
  org.springframework.data.*;version="${springdata.commons:[=.=.=.=,+1.0.0)}",
  org.springframework.data.mongodb.*;version="${project.version:[=.=.=.=,+1.0.0)}",
  org.w3c.dom.*;version="0"

spring-data-mongodb-distribution/pom.xml

@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.3.0.RELEASE</version>
+		<version>1.4.0.M1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	

spring-data-mongodb-log4j/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.3.0.RELEASE</version>
+		<version>1.4.0.M1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-mongodb/Spring Data MongoDB.sonargraph

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

spring-data-mongodb/pom.xml

@@ -11,12 +11,13 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.3.0.RELEASE</version>
+		<version>1.4.0.M1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<properties>
 		<validation>1.0.0.GA</validation>
+		<objenesis>1.3</objenesis>
 	</properties>
 
 	<dependencies>
@@ -55,7 +56,7 @@
 		</dependency>
 
 		<!--  Spring Data -->
-			<dependency>
+		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>spring-data-commons</artifactId>
 			<version>${springdata.commons}</version>
@@ -119,6 +120,13 @@
 			<version>${validation}</version>
 			<optional>true</optional>
 		</dependency>
+		
+		<dependency>
+			<groupId>org.objenesis</groupId>
+			<artifactId>objenesis</artifactId>
+			<version>${objenesis}</version>
+			<optional>true</optional>
+		</dependency>
 
 		<dependency>
 			<groupId>org.hibernate</groupId>

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

@@ -31,6 +31,8 @@ import org.springframework.data.mapping.context.MappingContextIsNewStrategyFacto
 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;
@@ -47,6 +49,7 @@ import com.mongodb.Mongo;
  * 
  * @author Mark Pollack
  * @author Oliver Gierke
+ * @author Thomas Darimont
  */
 @Configuration
 public abstract class AbstractMongoConfiguration {
@@ -58,6 +61,16 @@ public abstract class AbstractMongoConfiguration {
 	 */
 	protected abstract String getDatabaseName();
 
+	/**
+	 * Return the name of the authentication database to use. Defaults to {@literal null} and will turn into the value
+	 * returned by {@link #getDatabaseName()} later on effectively.
+	 * 
+	 * @return
+	 */
+	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}.
@@ -89,14 +102,7 @@ public abstract class AbstractMongoConfiguration {
 	 */
 	@Bean
 	public SimpleMongoDbFactory mongoDbFactory() throws Exception {
-
-		UserCredentials credentials = getUserCredentials();
-
-		if (credentials == null) {
-			return new SimpleMongoDbFactory(mongo(), getDatabaseName());
-		} else {
-			return new SimpleMongoDbFactory(mongo(), getDatabaseName(), credentials);
-		}
+		return new SimpleMongoDbFactory(mongo(), getDatabaseName(), getUserCredentials(), getAuthenticationDatabaseName());
 	}
 
 	/**
@@ -178,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;
 	}
 

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/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(dbname);
-
-		if (userCredentials != null) {
-			dbFactoryBuilder.addConstructorArgValue(userCredentials);
-		}
+		dbFactoryBuilder.addConstructorArgValue(StringUtils.hasText(dbname) ? dbname : "db");
+		dbFactoryBuilder.addConstructorArgValue(userCredentials);
+		dbFactoryBuilder.addConstructorArgValue(element.getAttribute("authentication-dbname"));
 
 		BeanDefinitionBuilder writeConcernPropertyEditorBuilder = getWriteConcernPropertyEditorBuilder();
 

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/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)) {
-							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)) {
+						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/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/MongoDbUtils.java

@@ -33,6 +33,7 @@ import com.mongodb.Mongo;
  * @author Graeme Rocher
  * @author Oliver Gierke
  * @author Randy Watler
+ * @author Thomas Darimont
  * @since 1.0
  */
 public abstract class MongoDbUtils {
@@ -54,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);
 	}
 
 	/**
@@ -66,15 +67,22 @@ 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);
 
@@ -103,14 +111,16 @@ public abstract class MongoDbUtils {
 		DB db = mongo.getDB(databaseName);
 		boolean credentialsGiven = credentials.hasUsername() && credentials.hasPassword();
 
-		synchronized (db) {
+		DB authDb = databaseName.equals(authenticationDatabaseName) ? db : mongo.getDB(authenticationDatabaseName);
 
-			if (credentialsGiven && !db.isAuthenticated()) {
+		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 + "], "
 							+ credentials.toString(), databaseName, credentials);
 				}

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();
-	/**
-	 * number of connections allowed per host will block if run out
-	 */
+	@SuppressWarnings("deprecation")//
+	private final MongoOptions MONGO_OPTIONS = new MongoOptions();
+
 	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;
-
-	/**
-	 * 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 socketKeepAlive = MONGO_OPTIONS.socketKeepAlive;
 	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
-	 */
-	@SuppressWarnings("deprecation")
-	private boolean slaveOk = MONGO_OPTIONS.slaveOk;
-
-	/**
-	 * number of connections allowed per host will block if run out
+	 * @param connectionsPerHost
 	 */
 	public void setConnectionsPerHost(int connectionsPerHost) {
 		this.connectionsPerHost = 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
+	 * A multiplier for connectionsPerHost for # of threads that can block a connection. If connectionsPerHost is 10, and
+	 * threadsAllowedToBlockForConnectionMultiplier is 5, then 50 threads can block. If more threads try to block an
+	 * exception will be thrown.
+	 * 
+	 * @param threadsAllowedToBlockForConnectionMultiplier
 	 */
 	public void setThreadsAllowedToBlockForConnectionMultiplier(int threadsAllowedToBlockForConnectionMultiplier) {
 		this.threadsAllowedToBlockForConnectionMultiplier = threadsAllowedToBlockForConnectionMultiplier;
 	}
 
 	/**
-	 * max wait time of a blocking thread for a connection
+	 * 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,
-	 * which means to use the default 15s if autoConnectRetry is on.
+	 * Configures the maximum amount of time in millisecons to spend retrying to open connection to the same server. This
+	 * defaults to {@literal 0}, which means to use the default {@literal 15s} if {@link #autoConnectRetry} is on.
 	 * 
 	 * @param maxAutoConnectRetryTime the maxAutoConnectRetryTime to set
 	 */
@@ -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/MongoTemplate.java

@@ -46,6 +46,7 @@ import org.springframework.core.io.ResourceLoader;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.dao.OptimisticLockingFailureException;
+import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.authentication.UserCredentials;
 import org.springframework.data.convert.EntityReader;
 import org.springframework.data.mapping.PersistentEntity;
@@ -59,6 +60,8 @@ import org.springframework.data.mongodb.core.aggregation.AggregationResults;
 import org.springframework.data.mongodb.core.aggregation.Fields;
 import org.springframework.data.mongodb.core.aggregation.TypeBasedAggregationOperationContext;
 import org.springframework.data.mongodb.core.aggregation.TypedAggregation;
+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.convert.MongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoWriter;
@@ -145,7 +148,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	private final MongoConverter mongoConverter;
 	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
 	private final MongoDbFactory mongoDbFactory;
-	private final MongoExceptionTranslator exceptionTranslator = new MongoExceptionTranslator();
+	private final PersistenceExceptionTranslator exceptionTranslator;
 	private final QueryMapper queryMapper;
 	private final UpdateMapper updateMapper;
 
@@ -199,6 +202,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		Assert.notNull(mongoDbFactory);
 
 		this.mongoDbFactory = mongoDbFactory;
+		this.exceptionTranslator = mongoDbFactory.getExceptionTranslator();
 		this.mongoConverter = mongoConverter == null ? getDefaultMongoConverter(mongoDbFactory) : mongoConverter;
 		this.queryMapper = new QueryMapper(this.mongoConverter);
 		this.updateMapper = new UpdateMapper(this.mongoConverter);
@@ -700,10 +704,9 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 
 		initializeVersionProperty(objectToSave);
 
-		BasicDBObject dbDoc = new BasicDBObject();
-
 		maybeEmitEvent(new BeforeConvertEvent<T>(objectToSave));
-		writer.write(objectToSave, dbDoc);
+
+		DBObject dbDoc = toDbObject(objectToSave, writer);
 
 		maybeEmitEvent(new BeforeSaveEvent<T>(objectToSave, dbDoc));
 		Object id = insertDBObject(collectionName, dbDoc, objectToSave.getClass());
@@ -712,6 +715,26 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		maybeEmitEvent(new AfterSaveEvent<T>(objectToSave, dbDoc));
 	}
 
+	/**
+	 * @param objectToSave
+	 * @param writer
+	 * @return
+	 */
+	private <T> DBObject toDbObject(T objectToSave, MongoWriter<T> writer) {
+
+		if (!(objectToSave instanceof String)) {
+			DBObject dbDoc = new BasicDBObject();
+			writer.write(objectToSave, dbDoc);
+			return dbDoc;
+		} else {
+			try {
+				return (DBObject) JSON.parse((String) objectToSave);
+			} catch (JSONParseException e) {
+				throw new MappingException("Could not parse given String to save into a JSON document!", e);
+			}
+		}
+	}
+
 	private void initializeVersionProperty(Object entity) {
 
 		MongoPersistentEntity<?> mongoPersistentEntity = getPersistentEntity(entity.getClass());
@@ -851,19 +874,9 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 
 		assertUpdateableIdIfNotSet(objectToSave);
 
-		DBObject dbDoc = new BasicDBObject();
-
 		maybeEmitEvent(new BeforeConvertEvent<T>(objectToSave));
 
-		if (!(objectToSave instanceof String)) {
-			writer.write(objectToSave, dbDoc);
-		} else {
-			try {
-				dbDoc = (DBObject) JSON.parse((String) objectToSave);
-			} catch (JSONParseException e) {
-				throw new MappingException("Could not parse given String to save into a JSON document!", e);
-			}
-		}
+		DBObject dbDoc = toDbObject(objectToSave, writer);
 
 		maybeEmitEvent(new BeforeSaveEvent<T>(objectToSave, dbDoc));
 		Object id = saveDBObject(collectionName, dbDoc, objectToSave.getClass());
@@ -1814,7 +1827,9 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	}
 
 	private static final MongoConverter getDefaultMongoConverter(MongoDbFactory factory) {
-		MappingMongoConverter converter = new MappingMongoConverter(factory, new MongoMappingContext());
+
+		DbRefResolver dbRefResolver = new DefaultDbRefResolver(factory);
+		MappingMongoConverter converter = new MappingMongoConverter(dbRefResolver, new MongoMappingContext());
 		converter.afterPropertiesSet();
 		return converter;
 	}

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,6 +44,9 @@ 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;
 
 	/**
@@ -50,7 +56,7 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	 * @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);
 	}
 
 	/**
@@ -61,7 +67,20 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	 * @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/aggregation/Aggregation.java

@@ -48,6 +48,15 @@ public class Aggregation {
 
 	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.
 	 * 
@@ -57,6 +66,16 @@ public class Aggregation {
 		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.
 	 * 
@@ -227,8 +246,9 @@ public class Aggregation {
 
 			operationDocuments.add(operation.toDBObject(context));
 
-			if (operation instanceof AggregationOperationContext) {
-				context = (AggregationOperationContext) operation;
+			if (operation instanceof FieldsExposingAggregationOperation) {
+				FieldsExposingAggregationOperation exposedFieldsOperation = (FieldsExposingAggregationOperation) operation;
+				context = new ExposedFieldsAggregationOperationContext(exposedFieldsOperation.getFields());
 			}
 		}
 

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

@@ -29,6 +29,7 @@ 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> {
@@ -151,13 +152,47 @@ public class ExposedFields implements Iterable<ExposedField> {
 		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
 	 */
-	public boolean exposesSingleFieldOnly() {
-		return originalFields.size() + syntheticFields.size() == 1;
+	boolean exposesSingleFieldOnly() {
+		return exposedFieldsCount() == 1;
+	}
+
+	/**
+	 * @return
+	 */
+	private int exposedFieldsCount() {
+		return originalFields.size() + syntheticFields.size();
 	}
 
 	/* 
@@ -224,6 +259,15 @@ public class ExposedFields implements Iterable<ExposedField> {
 			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.
 		 * 
@@ -299,12 +343,20 @@ public class ExposedFields implements Iterable<ExposedField> {
 			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);
 		}

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

@@ -17,17 +17,32 @@ 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;
 
 /**
- * Support class to implement {@link AggregationOperation}s that will become an {@link AggregationOperationContext} as
- * well defining {@link ExposedFields}.
+ * {@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.3
+ * @since 1.4
  */
-public abstract class ExposedFieldsAggregationOperationContext implements AggregationOperationContext {
+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)
@@ -54,7 +69,7 @@ public abstract class ExposedFieldsAggregationOperationContext implements Aggreg
 	@Override
 	public FieldReference getReference(String name) {
 
-		ExposedField field = getFields().getField(name);
+		ExposedField field = exposedFields.getField(name);
 
 		if (field != null) {
 			return new FieldReference(field);
@@ -62,6 +77,4 @@ public abstract class ExposedFieldsAggregationOperationContext implements Aggreg
 
 		throw new IllegalArgumentException(String.format("Invalid reference '%s'!", name));
 	}
-
-	protected abstract ExposedFields getFields();
 }

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

@@ -36,4 +36,11 @@ public interface Field {
 	 * @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

@@ -197,17 +197,30 @@ public class Fields implements Iterable<Field> {
 
 		public AggregationField(String name, String target) {
 
-			Assert.hasText(name, "AggregationField name must not be null or empty!");
+			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 = name.substring(name.indexOf(".") + 1);
-				this.target = name;
+				this.name = nameToSet.substring(nameToSet.indexOf(".") + 1);
+				this.target = nameToSet;
 			} else {
-				this.name = name;
-				this.target = target;
+				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()
@@ -224,6 +237,15 @@ public class Fields implements Iterable<Field> {
 			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()

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

@@ -38,9 +38,13 @@ import com.mongodb.DBObject;
  * @author Oliver Gierke
  * @since 1.3
  */
-public class GroupOperation extends ExposedFieldsAggregationOperationContext implements AggregationOperation {
+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 ExposedFields nonSynthecticFields;
 	private final List<Operation> operations;
 
 	/**
@@ -50,7 +54,7 @@ public class GroupOperation extends ExposedFieldsAggregationOperationContext imp
 	 */
 	public GroupOperation(Fields fields) {
 
-		this.nonSynthecticFields = ExposedFields.nonSynthetic(fields);
+		this.idFields = ExposedFields.nonSynthetic(fields);
 		this.operations = new ArrayList<Operation>();
 	}
 
@@ -74,7 +78,7 @@ public class GroupOperation extends ExposedFieldsAggregationOperationContext imp
 		Assert.notNull(groupOperation, "GroupOperation must not be null!");
 		Assert.notNull(nextOperations, "NextOperations must not be null!");
 
-		this.nonSynthecticFields = groupOperation.nonSynthecticFields;
+		this.idFields = groupOperation.idFields;
 		this.operations = new ArrayList<Operation>(nextOperations.size() + 1);
 		this.operations.addAll(groupOperation.operations);
 		this.operations.addAll(nextOperations);
@@ -261,7 +265,7 @@ public class GroupOperation extends ExposedFieldsAggregationOperationContext imp
 	@Override
 	public ExposedFields getFields() {
 
-		ExposedFields fields = this.nonSynthecticFields.and(new ExposedField(Fields.UNDERSCORE_ID, true));
+		ExposedFields fields = this.idFields.and(new ExposedField(Fields.UNDERSCORE_ID, true));
 
 		for (Operation operation : operations) {
 			fields = fields.and(operation.asField());
@@ -279,16 +283,20 @@ public class GroupOperation extends ExposedFieldsAggregationOperationContext imp
 
 		BasicDBObject operationObject = new BasicDBObject();
 
-		if (nonSynthecticFields.exposesSingleFieldOnly()) {
+		if (idFields.exposesNoNonSyntheticFields()) {
 
-			FieldReference reference = context.getReference(nonSynthecticFields.iterator().next());
+			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 : nonSynthecticFields) {
+			for (ExposedField field : idFields) {
 				FieldReference reference = context.getReference(field);
 				inner.put(field.getName(), reference.toString());
 			}

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

@@ -41,9 +41,11 @@ import com.mongodb.DBObject;
  * @author Oliver Gierke
  * @since 1.3
  */
-public class ProjectionOperation extends ExposedFieldsAggregationOperationContext implements AggregationOperation {
+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;
 
@@ -60,7 +62,7 @@ public class ProjectionOperation extends ExposedFieldsAggregationOperationContex
 	 * @param fields must not be {@literal null}.
 	 */
 	public ProjectionOperation(Fields fields) {
-		this(NONE, ProjectionOperationBuilder.FieldProjection.from(fields, true));
+		this(NONE, ProjectionOperationBuilder.FieldProjection.from(fields));
 	}
 
 	/**
@@ -114,26 +116,36 @@ public class ProjectionOperation extends ExposedFieldsAggregationOperationContex
 		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 fields must not be {@literal null}.
+	 * @param fieldNames must not be {@literal null}.
 	 * @return
 	 */
-	public ProjectionOperation andExclude(String... fields) {
-		List<FieldProjection> excludeProjections = FieldProjection.from(Fields.fields(fields), false);
+	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 fields must not be {@literal null}.
+	 * @param fieldNames must not be {@literal null}.
 	 * @return
 	 */
-	public ProjectionOperation andInclude(String... fields) {
+	public ProjectionOperation andInclude(String... fieldNames) {
 
-		List<FieldProjection> projections = FieldProjection.from(Fields.fields(fields), true);
+		List<FieldProjection> projections = FieldProjection.from(Fields.fields(fieldNames), true);
 		return new ProjectionOperation(this.projections, projections);
 	}
 
@@ -147,12 +159,12 @@ public class ProjectionOperation extends ExposedFieldsAggregationOperationContex
 		return new ProjectionOperation(this.projections, FieldProjection.from(fields, true));
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.ExposedFieldsAggregationOperationContext#getFields()
+	 * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields()
 	 */
 	@Override
-	protected ExposedFields getFields() {
+	public ExposedFields getFields() {
 
 		ExposedFields fields = null;
 
@@ -180,12 +192,130 @@ public class ProjectionOperation extends ExposedFieldsAggregationOperationContex
 		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 implements AggregationOperation {
+	public static class ProjectionOperationBuilder extends AbstractProjectionOperationBuilder {
 
 		private final String name;
 		private final ProjectionOperation operation;
@@ -200,9 +330,7 @@ public class ProjectionOperation extends ExposedFieldsAggregationOperationContex
 		 * @param previousProjection the previous operation projection, may be {@literal null}.
 		 */
 		public ProjectionOperationBuilder(String name, ProjectionOperation operation, OperationProjection previousProjection) {
-
-			Assert.hasText(name, "Field name must not be null or empty!");
-			Assert.notNull(operation, "ProjectionOperation must not be null!");
+			super(name, operation);
 
 			this.name = name;
 			this.operation = operation;
@@ -237,10 +365,11 @@ public class ProjectionOperation extends ExposedFieldsAggregationOperationContex
 		 * @param string
 		 * @return
 		 */
+		@Override
 		public ProjectionOperation as(String alias) {
 
-			if (previousProjection != null) {
-				return this.operation.andReplaceLastOneWith(previousProjection.withAlias(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));
 			}
@@ -258,6 +387,18 @@ public class ProjectionOperation extends ExposedFieldsAggregationOperationContex
 			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.
 		 * 
@@ -270,6 +411,19 @@ public class ProjectionOperation extends ExposedFieldsAggregationOperationContex
 			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.
 		 * 
@@ -282,6 +436,19 @@ public class ProjectionOperation extends ExposedFieldsAggregationOperationContex
 			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.
 		 * 
@@ -295,6 +462,19 @@ public class ProjectionOperation extends ExposedFieldsAggregationOperationContex
 			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.
@@ -309,7 +489,21 @@ public class ProjectionOperation extends ExposedFieldsAggregationOperationContex
 			return project("mod", number);
 		}
 
-		/* (non-Javadoc)
+		/**
+		 * 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
@@ -362,6 +556,7 @@ public class ProjectionOperation extends ExposedFieldsAggregationOperationContex
 		 * 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 {
 
@@ -386,20 +581,31 @@ public class ProjectionOperation extends ExposedFieldsAggregationOperationContex
 				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 include whether to include or exclude the fields.
+			 * @param value to use for the given field.
 			 * @return
 			 */
-			public static List<FieldProjection> from(Fields fields, boolean include) {
+			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, include ? null : 0));
+					projections.add(new FieldProjection(field, value));
 				}
 
 				return projections;
@@ -411,13 +617,25 @@ public class ProjectionOperation extends ExposedFieldsAggregationOperationContex
 			 */
 			@Override
 			public DBObject toDBObject(AggregationOperationContext context) {
+				return new BasicDBObject(field.getName(), renderFieldValue(context));
+			}
 
-				if (value != null) {
-					return new BasicDBObject(field.getName(), value);
+			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;
 				}
 
-				FieldReference reference = context.getReference(field.getTarget());
-				return new BasicDBObject(field.getName(), reference.toString());
+				return value;
 			}
 		}
 

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

@@ -71,9 +71,9 @@ public class TypeBasedAggregationOperationContext implements AggregationOperatio
 		return mapper.getMappedObject(dbObject, mappingContext.getPersistentEntity(type));
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(org.springframework.data.mongodb.core.aggregation.ExposedFields.AvailableField)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(org.springframework.data.mongodb.core.aggregation.Field)
 	 */
 	@Override
 	public FieldReference getReference(Field field) {
@@ -88,11 +88,10 @@ public class TypeBasedAggregationOperationContext implements AggregationOperatio
 	 */
 	@Override
 	public FieldReference getReference(String name) {
-		PropertyPath path = PropertyPath.from(name, type);
 
-		PersistentPropertyPath<MongoPersistentProperty> propertyPath = mappingContext.getPersistentPropertyPath(path);
+		PersistentPropertyPath<MongoPersistentProperty> propertyPath = mappingContext.getPersistentPropertyPath(name, type);
 
-		return getReferenceFor(field(path.getLeafProperty().getSegment(),
+		return getReferenceFor(field(propertyPath.getLeafProperty().getName(),
 				propertyPath.toDotPath(MongoPersistentProperty.PropertyToFieldNameConverter.INSTANCE)));
 	}
 

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

@@ -29,7 +29,7 @@ import com.mongodb.DBObject;
  * @author Oliver Gierke
  * @since 1.3
  */
-public class UnwindOperation extends ExposedFieldsAggregationOperationContext implements AggregationOperation {
+public class UnwindOperation implements AggregationOperation {
 
 	private final ExposedField field;
 
@@ -44,15 +44,6 @@ public class UnwindOperation extends ExposedFieldsAggregationOperationContext im
 		this.field = new ExposedField(field, true);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.ExposedFieldsAggregationOperationContext#getFields()
-	 */
-	@Override
-	protected ExposedFields getFields() {
-		return ExposedFields.from(field);
-	}
-
 	/* 
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)

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

@@ -19,6 +19,7 @@ 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;
@@ -86,12 +87,13 @@ public class CustomConversions {
 
 		Assert.notNull(converters);
 
-		this.readingPairs = new HashSet<ConvertiblePair>();
-		this.writingPairs = new HashSet<ConvertiblePair>();
+		this.readingPairs = new LinkedHashSet<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);
@@ -101,7 +103,6 @@ public class CustomConversions {
 		this.converters.add(StringToURLConverter.INSTANCE);
 		this.converters.add(DBObjectToStringConverter.INSTANCE);
 		this.converters.addAll(JodaTimeConverters.getConvertersToRegister());
-		this.converters.addAll(converters);
 
 		for (Object c : this.converters) {
 			registerConversion(c);
@@ -239,6 +240,7 @@ public class CustomConversions {
 	 * @return
 	 */
 	public Class<?> getCustomWriteTarget(Class<?> source, Class<?> expectedTargetType) {
+
 		Assert.notNull(source);
 		return getCustomTarget(source, expectedTargetType, writingPairs);
 	}

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

@@ -57,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;
 
@@ -80,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;
@@ -90,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(mappingContext);
+		Assert.notNull(dbRefResolver, "DbRefResolver must not be null!");
+		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);
@@ -112,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
@@ -234,7 +245,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 				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);
 
@@ -261,11 +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);
+
+				Object obj = dbRefResolver.resolveDbRef(inverseProp, new DbRefResolverCallback() {
+
+					@Override
+					public Object resolve(MongoPersistentProperty property) {
+						return getValueInternal(property, dbo, evaluator, parent);
+					}
+				});
 
 				wrapper.setProperty(inverseProp, obj);
-
 			}
 		});
 
@@ -385,7 +403,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 					if (!conversions.isSimpleType(propertyObj.getClass())) {
 						writePropertyInternal(propertyObj, dbo, prop);
 					} else {
-						writeSimpleInternal(propertyObj, dbo, prop.getFieldName());
+						writeSimpleInternal(propertyObj, dbo, prop);
 					}
 				}
 			}
@@ -410,26 +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()) {
 			DBObject mapDbObj = createMap((Map<Object, Object>) obj, prop);
-			dbo.put(name, mapDbObj);
+			accessor.put(prop, mapDbObj);
 			return;
 		}
 
 		if (prop.isDbReference()) {
 			DBRef dbRefObj = createDBRef(obj, prop.getDBRef());
 			if (null != dbRefObj) {
-				dbo.put(name, dbRefObj);
+				accessor.put(prop, dbRefObj);
 				return;
 			}
 		}
@@ -438,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) {
@@ -667,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.
@@ -742,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();
-		db = dbref != null && StringUtils.hasText(dbref.db()) ? mongoDbFactory.getDb(dbref.db()) : db;
-
-		return new DBRef(db, targetEntity.getCollection(), idMapper.convertId(id));
+		return dbRefResolver.createDbRef(dbref, targetEntity, idMapper.convertId(id));
 	}
 
 	protected Object getValueInternal(MongoPersistentProperty prop, DBObject dbo, SpELExpressionEvaluator eval,
@@ -785,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));
@@ -833,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));
@@ -965,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;
 
@@ -978,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;
 		}
@@ -990,7 +1013,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		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;
@@ -1043,7 +1066,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		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) {
@@ -1052,4 +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/QueryMapper.java

@@ -48,7 +48,6 @@ import com.mongodb.DBRef;
 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;
@@ -79,7 +78,7 @@ public class QueryMapper {
 	@SuppressWarnings("deprecation")
 	public DBObject getMappedObject(DBObject query, MongoPersistentEntity<?> entity) {
 
-		if (Keyword.isKeyword(query)) {
+		if (isNestedKeyword(query)) {
 			return getMappedKeyword(new Keyword(query), entity);
 		}
 
@@ -97,7 +96,7 @@ public class QueryMapper {
 				continue;
 			}
 
-			if (Keyword.isKeyword(key)) {
+			if (isKeyword(key)) {
 				result.putAll(getMappedKeyword(new Keyword(query, key), entity));
 				continue;
 			}
@@ -107,7 +106,7 @@ public class QueryMapper {
 			Object rawValue = query.get(key);
 			String newKey = field.getMappedKey();
 
-			if (Keyword.isKeyword(rawValue) && !field.isIdField()) {
+			if (isNestedKeyword(rawValue) && !field.isIdField()) {
 				Keyword keyword = new Keyword((DBObject) rawValue);
 				result.put(newKey, getMappedKeyword(field, keyword));
 			} else {
@@ -121,16 +120,16 @@ public class QueryMapper {
 	/**
 	 * Returns the given {@link DBObject} representing a keyword by mapping the keyword's value.
 	 * 
-	 * @param query the {@link DBObject} representing a keyword (e.g. {@code $ne : … } )
+	 * @param keyword the {@link DBObject} representing a keyword (e.g. {@code $ne : … } )
 	 * @param entity
 	 * @return
 	 */
-	private DBObject getMappedKeyword(Keyword query, MongoPersistentEntity<?> entity) {
+	private DBObject getMappedKeyword(Keyword keyword, MongoPersistentEntity<?> entity) {
 
 		// $or/$nor
-		if (query.key.matches(N_OR_PATTERN) || query.value instanceof Iterable) {
+		if (keyword.isOrOrNor() || keyword.hasIterableValue()) {
 
-			Iterable<?> conditions = (Iterable<?>) query.value;
+			Iterable<?> conditions = keyword.getValue();
 			BasicDBList newConditions = new BasicDBList();
 
 			for (Object condition : conditions) {
@@ -138,10 +137,10 @@ public class QueryMapper {
 						: convertSimpleOrDBObject(condition, entity));
 			}
 
-			return new BasicDBObject(query.key, newConditions);
+			return new BasicDBObject(keyword.getKey(), newConditions);
 		}
 
-		return new BasicDBObject(query.key, convertSimpleOrDBObject(query.value, entity));
+		return new BasicDBObject(keyword.getKey(), convertSimpleOrDBObject(keyword.getValue(), entity));
 	}
 
 	/**
@@ -154,10 +153,12 @@ public class QueryMapper {
 	private DBObject getMappedKeyword(Field property, Keyword keyword) {
 
 		boolean needsAssociationConversion = property.isAssociation() && !keyword.isExists();
-		Object value = needsAssociationConversion ? convertAssociation(keyword.value, property.getProperty())
-				: getMappedValue(property.with(keyword.key), keyword.value);
+		Object value = keyword.getValue();
 
-		return new BasicDBObject(keyword.key, value);
+		Object convertedValue = needsAssociationConversion ? convertAssociation(value, property.getProperty())
+				: getMappedValue(property.with(keyword.getKey()), value);
+
+		return new BasicDBObject(keyword.key, convertedValue);
 	}
 
 	/**
@@ -195,7 +196,7 @@ public class QueryMapper {
 			}
 		}
 
-		if (Keyword.isKeyword(value)) {
+		if (isNestedKeyword(value)) {
 			return getMappedKeyword(new Keyword((DBObject) value), null);
 		}
 
@@ -289,6 +290,39 @@ public class QueryMapper {
 		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.
 	 * 
@@ -296,8 +330,10 @@ public class QueryMapper {
 	 */
 	private static class Keyword {
 
-		String key;
-		Object value;
+		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;
@@ -322,25 +358,21 @@ public class QueryMapper {
 			return "$exists".equalsIgnoreCase(key);
 		}
 
-		/**
-		 * Returns whether the given value actually represents a keyword. If this returns {@literal true} it's safe to call
-		 * the constructor.
-		 * 
-		 * @param value
-		 * @return
-		 */
-		public static boolean isKeyword(Object value) {
+		public boolean isOrOrNor() {
+			return key.matches(N_OR_PATTERN);
+		}
 
-			if (value instanceof String) {
-				return ((String) value).startsWith("$");
-			}
+		public boolean hasIterableValue() {
+			return value instanceof Iterable;
+		}
 
-			if (!(value instanceof DBObject)) {
-				return false;
-			}
+		public String getKey() {
+			return key;
+		}
 
-			DBObject dbObject = (DBObject) value;
-			return dbObject.keySet().size() == 1 && dbObject.keySet().iterator().next().startsWith("$");
+		@SuppressWarnings("unchecked")
+		public <T> T getValue() {
+			return (T) value;
 		}
 	}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 by the original author(s).
+ * Copyright 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.
@@ -27,7 +27,8 @@ import org.springframework.data.annotation.Reference;
  * An annotation that indicates the annotated field is to be stored using a {@link com.mongodb.DBRef}.
  * 
  * @author Jon Brisbin
- * @authot Oliver Gierke
+ * @author Oliver Gierke
+ * @author Thomas Darimont
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
@@ -41,4 +42,11 @@ public @interface DBRef {
 	 * @return
 	 */
 	String db() default "";
+
+	/**
+	 * Controls whether the referenced entity should be loaded lazily. This defaults to {@literal false}.
+	 * 
+	 * @return
+	 */
+	boolean lazy() default false;
 }

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

@@ -31,6 +31,7 @@ import com.mongodb.DBObject;
  * @author Thomas Risberg
  * @author Mark Pollack
  * @author Oliver Gierke
+ * @author Becca Gaspard
  */
 public class Update {
 
@@ -90,6 +91,18 @@ public class Update {
 		return this;
 	}
 
+	/**
+	 * Update using the $setOnInsert update modifier
+	 * 
+	 * @param key
+	 * @param value
+	 * @return
+	 */
+	public Update setOnInsert(String key, Object value) {
+		addMultiFieldOperation("$setOnInsert", key, value);
+		return this;
+	}
+
 	/**
 	 * Update using the $unset update modifier
 	 * 

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

@@ -0,0 +1,217 @@
+/*
+ * 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.spel;
+
+import java.util.Collections;
+import java.util.Iterator;
+
+import org.springframework.expression.spel.ExpressionState;
+import org.springframework.expression.spel.SpelNode;
+import org.springframework.expression.spel.ast.Literal;
+import org.springframework.expression.spel.ast.MethodReference;
+import org.springframework.expression.spel.ast.Operator;
+import org.springframework.util.Assert;
+
+/**
+ * A value object for nodes in an expression. Allows iterating ove potentially available child {@link ExpressionNode}s.
+ * 
+ * @author Oliver Gierke
+ */
+public class ExpressionNode implements Iterable<ExpressionNode> {
+
+	private static final Iterator<ExpressionNode> EMPTY_ITERATOR = Collections.<ExpressionNode> emptySet().iterator();
+
+	private final SpelNode node;
+	private final ExpressionState state;
+
+	/**
+	 * Creates a new {@link ExpressionNode} from the given {@link SpelNode} and {@link ExpressionState}.
+	 * 
+	 * @param node must not be {@literal null}.
+	 * @param state must not be {@literal null}.
+	 */
+	protected ExpressionNode(SpelNode node, ExpressionState state) {
+
+		Assert.notNull(node, "SpelNode must not be null!");
+		Assert.notNull(state, "ExpressionState must not be null!");
+
+		this.node = node;
+		this.state = state;
+	}
+
+	/**
+	 * Factory method to create {@link ExpressionNode}'s according to the given {@link SpelNode} and
+	 * {@link ExpressionState}.
+	 * 
+	 * @param node
+	 * @param state must not be {@literal null}.
+	 * @return an {@link ExpressionNode} for the given {@link SpelNode} or {@literal null} if {@literal null} was given
+	 *         for the {@link SpelNode}.
+	 */
+	public static ExpressionNode from(SpelNode node, ExpressionState state) {
+
+		if (node == null) {
+			return null;
+		}
+
+		if (node instanceof Operator) {
+			return new OperatorNode((Operator) node, state);
+		}
+
+		if (node instanceof MethodReference) {
+			return new MethodReferenceNode((MethodReference) node, state);
+		}
+
+		if (node instanceof Literal) {
+			return new LiteralNode((Literal) node, state);
+		}
+
+		return new ExpressionNode(node, state);
+	}
+
+	/**
+	 * Returns the name of the {@link ExpressionNode}.
+	 * 
+	 * @return
+	 */
+	public String getName() {
+		return node.toStringAST();
+	}
+
+	/**
+	 * Returns whether the current {@link ExpressionNode} is backed by the given type.
+	 * 
+	 * @param type must not be {@literal null}.
+	 * @return
+	 */
+	public boolean isOfType(Class<?> type) {
+
+		Assert.notNull(type, "Type must not be empty!");
+		return type.isAssignableFrom(node.getClass());
+	}
+
+	/**
+	 * Returns whether the given {@link ExpressionNode} is representing the same backing node type as the current one.
+	 * 
+	 * @param node
+	 * @return
+	 */
+	boolean isOfSameTypeAs(ExpressionNode node) {
+		return node == null ? false : this.node.getClass().equals(node.node.getClass());
+	}
+
+	/**
+	 * Returns whether the {@link ExpressionNode} is a mathematical operation.
+	 * 
+	 * @return
+	 */
+	public boolean isMathematicalOperation() {
+		return false;
+	}
+
+	/**
+	 * Returns whether the {@link ExpressionNode} is a literal.
+	 * 
+	 * @return
+	 */
+	public boolean isLiteral() {
+		return false;
+	}
+
+	/**
+	 * Returns the value of the current node.
+	 * 
+	 * @return
+	 */
+	public Object getValue() {
+		return node.getValue(state);
+	}
+
+	/**
+	 * Returns whether the current node has child nodes.
+	 * 
+	 * @return
+	 */
+	public boolean hasChildren() {
+		return node.getChildCount() != 0;
+	}
+
+	/**
+	 * Returns the child {@link ExpressionNode} with the given index.
+	 * 
+	 * @param index must not be negative.
+	 * @return
+	 */
+	public ExpressionNode getChild(int index) {
+
+		Assert.isTrue(index >= 0);
+		return from(node.getChild(index), state);
+	}
+
+	/**
+	 * Returns whether the {@link ExpressionNode} has a first child node that is not of the given type.
+	 * 
+	 * @param type must not be {@literal null}.
+	 * @return
+	 */
+	public boolean hasfirstChildNotOfType(Class<?> type) {
+
+		Assert.notNull(type, "Type must not be null!");
+		return hasChildren() && !node.getChild(0).getClass().equals(type);
+	}
+
+	/**
+	 * Creates a new {@link ExpressionNode} from the given {@link SpelNode}.
+	 * 
+	 * @param node
+	 * @return
+	 */
+	protected ExpressionNode from(SpelNode node) {
+		return from(node, state);
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see java.lang.Iterable#iterator()
+	 */
+	@Override
+	public Iterator<ExpressionNode> iterator() {
+
+		if (!hasChildren()) {
+			return EMPTY_ITERATOR;
+		}
+
+		return new Iterator<ExpressionNode>() {
+
+			int index = 0;
+
+			@Override
+			public boolean hasNext() {
+				return index < node.getChildCount();
+			}
+
+			@Override
+			public ExpressionNode next() {
+				return from(node.getChild(index++));
+			}
+
+			@Override
+			public void remove() {
+				throw new UnsupportedOperationException();
+			}
+		};
+	}
+}

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

@@ -0,0 +1,126 @@
+/*
+ * 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.spel;
+
+import org.springframework.util.Assert;
+
+import com.mongodb.BasicDBList;
+import com.mongodb.DBObject;
+
+/**
+ * The context for an {@link ExpressionNode} transformation.
+ * 
+ * @author Thomas Darimont
+ * @author Oliver Gierke
+ */
+public class ExpressionTransformationContextSupport<T extends ExpressionNode> {
+
+	private final T currentNode;
+	private final ExpressionNode parentNode;
+	private final DBObject previousOperationObject;
+
+	/**
+	 * Creates a new {@link ExpressionTransformationContextSupport} for the given {@link ExpressionNode}s and an optional
+	 * previous operation.
+	 * 
+	 * @param currentNode must not be {@literal null}.
+	 * @param parentNode
+	 * @param previousOperationObject
+	 */
+	public ExpressionTransformationContextSupport(T currentNode, ExpressionNode parentNode,
+			DBObject previousOperationObject) {
+
+		Assert.notNull(currentNode, "currentNode must not be null!");
+
+		this.currentNode = currentNode;
+		this.parentNode = parentNode;
+		this.previousOperationObject = previousOperationObject;
+	}
+
+	/**
+	 * Returns the current {@link ExpressionNode}.
+	 * 
+	 * @return
+	 */
+	public T getCurrentNode() {
+		return currentNode;
+	}
+
+	/**
+	 * Returns the parent {@link ExpressionNode} or {@literal null} if none available.
+	 * 
+	 * @return
+	 */
+	public ExpressionNode getParentNode() {
+		return parentNode;
+	}
+
+	/**
+	 * Returns the previously accumulated operaton object or {@literal null} if none available. Rather than manually
+	 * adding stuff to the object prefer using {@link #addToPreviousOrReturn(Object)} to transparently do if one is
+	 * present.
+	 * 
+	 * @see #hasPreviousOperation()
+	 * @see #addToPreviousOrReturn(Object)
+	 * @return
+	 */
+	public DBObject getPreviousOperationObject() {
+		return previousOperationObject;
+	}
+
+	/**
+	 * Returns whether a previous operation is present.
+	 * 
+	 * @return
+	 */
+	public boolean hasPreviousOperation() {
+		return getPreviousOperationObject() != null;
+	}
+
+	/**
+	 * Returns whether the parent node is of the same operation as the current node.
+	 * 
+	 * @return
+	 */
+	public boolean parentIsSameOperation() {
+		return parentNode == null ? false : currentNode.isOfSameTypeAs(parentNode);
+	}
+
+	/**
+	 * Adds the given value to the previous operation and returns it.
+	 * 
+	 * @param value
+	 * @return
+	 */
+	public DBObject addToPreviousOperation(Object value) {
+		extractArgumentListFrom(previousOperationObject).add(value);
+		return previousOperationObject;
+	}
+
+	/**
+	 * Adds the given value to the previous operation if one is present or returns the value to add as is.
+	 * 
+	 * @param value
+	 * @return
+	 */
+	public Object addToPreviousOrReturn(Object value) {
+		return hasPreviousOperation() ? addToPreviousOperation(value) : value;
+	}
+
+	private BasicDBList extractArgumentListFrom(DBObject context) {
+		return (BasicDBList) context.get(context.keySet().iterator().next());
+	}
+}

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

@@ -0,0 +1,33 @@
+/*
+ * 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.spel;
+
+/**
+ * SPI interface to implement components that can transfrom an {@link ExpressionTransformationContextSupport} into an
+ * object.
+ * 
+ * @author Oliver Gierke
+ */
+public interface ExpressionTransformer<T extends ExpressionTransformationContextSupport<?>> {
+
+	/**
+	 * Transforms the given {@link ExpressionTransformationContextSupport} into an Object.
+	 * 
+	 * @param context will never be {@literal null}.
+	 * @return
+	 */
+	Object transform(T context);
+}

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

@@ -0,0 +1,72 @@
+/*
+ * 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.spel;
+
+import org.springframework.expression.spel.ExpressionState;
+import org.springframework.expression.spel.ast.FloatLiteral;
+import org.springframework.expression.spel.ast.IntLiteral;
+import org.springframework.expression.spel.ast.Literal;
+import org.springframework.expression.spel.ast.LongLiteral;
+import org.springframework.expression.spel.ast.NullLiteral;
+import org.springframework.expression.spel.ast.RealLiteral;
+import org.springframework.expression.spel.ast.StringLiteral;
+
+/**
+ * A node representing a literal in an expression.
+ * 
+ * @author Oliver Gierke
+ */
+public class LiteralNode extends ExpressionNode {
+
+	private final Literal literal;
+
+	/**
+	 * Creates a new {@link LiteralNode} from the given {@link Literal} and {@link ExpressionState}.
+	 * 
+	 * @param node must not be {@literal null}.
+	 * @param state must not be {@literal null}.
+	 */
+	LiteralNode(Literal node, ExpressionState state) {
+		super(node, state);
+		this.literal = node;
+	}
+
+	/**
+	 * Returns whether the given {@link ExpressionNode} is a unary minus.
+	 * 
+	 * @param parent
+	 * @return
+	 */
+	public boolean isUnaryMinus(ExpressionNode parent) {
+
+		if (!(parent instanceof OperatorNode)) {
+			return false;
+		}
+
+		OperatorNode operator = (OperatorNode) parent;
+		return operator.isUnaryMinus() && operator.getRight() == null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.spel.ExpressionNode#isLiteral()
+	 */
+	@Override
+	public boolean isLiteral() {
+		return literal instanceof FloatLiteral || literal instanceof RealLiteral || literal instanceof IntLiteral
+				|| literal instanceof LongLiteral || literal instanceof StringLiteral || literal instanceof NullLiteral;
+	}
+}

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

@@ -0,0 +1,75 @@
+/*
+ * 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.spel;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.expression.spel.ExpressionState;
+import org.springframework.expression.spel.ast.MethodReference;
+
+/**
+ * An {@link ExpressionNode} representing a method reference.
+ * 
+ * @author Oliver Gierke
+ * @author Thomas Darimont
+ */
+public class MethodReferenceNode extends ExpressionNode {
+
+	private static final Map<String, String> FUNCTIONS;
+
+	static {
+
+		Map<String, String> map = new HashMap<String, String>();
+
+		map.put("concat", "$concat"); // Concatenates two strings.
+		map.put("strcasecmp", "$strcasecmp"); // Compares two strings and returns an integer that reflects the comparison.
+		map.put("substr", "$substr"); // Takes a string and returns portion of that string.
+		map.put("toLower", "$toLower"); // Converts a string to lowercase.
+		map.put("toUpper", "$toUpper"); // Converts a string to uppercase.
+
+		map.put("dayOfYear", "$dayOfYear"); // Converts a date to a number between 1 and 366.
+		map.put("dayOfMonth", "$dayOfMonth"); // Converts a date to a number between 1 and 31.
+		map.put("dayOfWeek", "$dayOfWeek"); // Converts a date to a number between 1 and 7.
+		map.put("year", "$year"); // Converts a date to the full year.
+		map.put("month", "$month"); // Converts a date into a number between 1 and 12.
+		map.put("week", "$week"); // Converts a date into a number between 0 and 53
+		map.put("hour", "$hour"); // Converts a date into a number between 0 and 23.
+		map.put("minute", "$minute"); // Converts a date into a number between 0 and 59.
+		map.put("second", "$second"); // Converts a date into a number between 0 and 59. May be 60 to account for leap
+		// seconds.
+		map.put("millisecond", "$millisecond"); // Returns the millisecond portion of a date as an integer between 0 and
+
+		FUNCTIONS = Collections.unmodifiableMap(map);
+	}
+
+	MethodReferenceNode(MethodReference reference, ExpressionState state) {
+		super(reference, state);
+	}
+
+	/**
+	 * Returns the name of the method.
+	 * 
+	 * @return
+	 */
+	public String getMethodName() {
+
+		String name = getName();
+		String methodName = name.substring(0, name.indexOf('('));
+		return FUNCTIONS.get(methodName);
+	}
+}

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

@@ -0,0 +1,120 @@
+/*
+ * 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.spel;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.expression.spel.ExpressionState;
+import org.springframework.expression.spel.ast.OpDivide;
+import org.springframework.expression.spel.ast.OpMinus;
+import org.springframework.expression.spel.ast.OpModulus;
+import org.springframework.expression.spel.ast.OpMultiply;
+import org.springframework.expression.spel.ast.OpPlus;
+import org.springframework.expression.spel.ast.Operator;
+
+/**
+ * An {@link ExpressionNode} representing an operator.
+ * 
+ * @author Oliver Gierke
+ * @author Thomas Darimont
+ */
+public class OperatorNode extends ExpressionNode {
+
+	private static final Map<String, String> OPERATORS;
+
+	static {
+
+		Map<String, String> map = new HashMap<String, String>(6);
+
+		map.put("+", "$add");
+		map.put("-", "$subtract");
+		map.put("*", "$multiply");
+		map.put("/", "$divide");
+		map.put("%", "$mod");
+
+		OPERATORS = Collections.unmodifiableMap(map);
+	}
+
+	private final Operator operator;
+
+	/**
+	 * Creates a new {@link OperatorNode} from the given {@link Operator} and {@link ExpressionState}.
+	 * 
+	 * @param node must not be {@literal null}.
+	 * @param state must not be {@literal null}.
+	 */
+	OperatorNode(Operator node, ExpressionState state) {
+		super(node, state);
+		this.operator = node;
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.spel.ExpressionNode#isMathematicalOperation()
+	 */
+	@Override
+	public boolean isMathematicalOperation() {
+		return operator instanceof OpMinus || operator instanceof OpPlus || operator instanceof OpMultiply
+				|| operator instanceof OpDivide || operator instanceof OpModulus;
+	}
+
+	/**
+	 * Returns whether the operator is unary.
+	 * 
+	 * @return
+	 */
+	public boolean isUnaryOperator() {
+		return operator.getRightOperand() == null;
+	}
+
+	/**
+	 * Returns the Mongo expression of the operator.
+	 * 
+	 * @return
+	 */
+	public String getMongoOperator() {
+		return OPERATORS.get(operator.getOperatorName());
+	}
+
+	/**
+	 * Returns whether the operator is a unary minus, e.g. -1.
+	 * 
+	 * @return
+	 */
+	public boolean isUnaryMinus() {
+		return isUnaryOperator() && operator instanceof OpMinus;
+	}
+
+	/**
+	 * Returns the left operand as {@link ExpressionNode}.
+	 * 
+	 * @return
+	 */
+	public ExpressionNode getLeft() {
+		return from(operator.getLeftOperand());
+	}
+
+	/**
+	 * Returns the right operand as {@link ExpressionNode}.
+	 * 
+	 * @return
+	 */
+	public ExpressionNode getRight() {
+		return from(operator.getRightOperand());
+	}
+}

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

@@ -0,0 +1,5 @@
+/**
+ * Support classes to transform SpEL expressions into MongoDB expressions.
+ * @since 1.4
+ */
+package org.springframework.data.mongodb.core.spel;

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

@@ -158,7 +158,15 @@ public class GridFsTemplate implements GridFsOperations, ResourcePatternResolver
 	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#find(com.mongodb.DBObject)
 	 */
 	public List<GridFSDBFile> find(Query query) {
-		return getGridFs().find(getMappedQuery(query));
+
+		if (query == null) {
+			return getGridFs().find((DBObject) null);
+		}
+
+		DBObject queryObject = getMappedQuery(query.getQueryObject());
+		DBObject sortObject = getMappedQuery(query.getSortObject());
+
+		return getGridFs().find(queryObject, sortObject);
 	}
 
 	/*
@@ -221,7 +229,11 @@ public class GridFsTemplate implements GridFsOperations, ResourcePatternResolver
 	}
 
 	private DBObject getMappedQuery(Query query) {
-		return query == null ? null : queryMapper.getMappedObject(query.getQueryObject(), null);
+		return query == null ? null : getMappedQuery(query.getQueryObject());
+	}
+
+	private DBObject getMappedQuery(DBObject query) {
+		return query == null ? null : queryMapper.getMappedObject(query, null);
 	}
 
 	private GridFS getGridFs() {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 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.

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

@@ -21,15 +21,19 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.springframework.data.annotation.QueryAnnotation;
+
 /**
  * Annotation to declare finder queries directly on repository methods. Both attributes allow using a placeholder
  * notation of {@code ?0}, {@code ?1} and so on.
  * 
  * @author Oliver Gierke
+ * @author Thomas Darimont
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 @Documented
+@QueryAnnotation
 public @interface Query {
 
 	/**

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

@@ -35,6 +35,7 @@ import org.springframework.data.repository.query.QueryLookupStrategy.Key;
  * {@link #basePackages()} or {@link #basePackageClasses()} it will trigger scanning of the package of annotated class.
  * 
  * @author Oliver Gierke
+ * @author Thomas Darimont
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
@@ -119,4 +120,10 @@ public @interface EnableMongoRepositories {
 	 * @return
 	 */
 	boolean createIndexesForQueryMethods() default false;
+
+	/**
+	 * Configures whether nested repository-interfaces (e.g. defined as inner classes) should be discovered by the
+	 * repositories infrastructure.
+	 */
+	boolean considerNestedRepositories() default false;
 }

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

@@ -17,6 +17,7 @@ package org.springframework.data.mongodb.repository.query;
 
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
 
@@ -35,6 +36,7 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor.PotentiallyConvertingIterator;
 import org.springframework.data.repository.query.parser.AbstractQueryCreator;
 import org.springframework.data.repository.query.parser.Part;
+import org.springframework.data.repository.query.parser.Part.IgnoreCaseType;
 import org.springframework.data.repository.query.parser.Part.Type;
 import org.springframework.data.repository.query.parser.PartTree;
 import org.springframework.util.Assert;
@@ -43,6 +45,7 @@ import org.springframework.util.Assert;
  * Custom query creator to create Mongo criterias.
  * 
  * @author Oliver Gierke
+ * @author Thomas Darimont
  */
 class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
 
@@ -99,7 +102,7 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
 
 		PersistentPropertyPath<MongoPersistentProperty> path = context.getPersistentPropertyPath(part.getProperty());
 		MongoPersistentProperty property = path.getLeafProperty();
-		Criteria criteria = from(part.getType(), property,
+		Criteria criteria = from(part, property,
 				where(path.toDotPath(MongoPersistentProperty.PropertyToFieldNameConverter.INSTANCE)),
 				(PotentiallyConvertingIterator) iterator);
 
@@ -120,7 +123,7 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
 		PersistentPropertyPath<MongoPersistentProperty> path = context.getPersistentPropertyPath(part.getProperty());
 		MongoPersistentProperty property = path.getLeafProperty();
 
-		return from(part.getType(), property,
+		return from(part, property,
 				base.and(path.toDotPath(MongoPersistentProperty.PropertyToFieldNameConverter.INSTANCE)),
 				(PotentiallyConvertingIterator) iterator);
 	}
@@ -165,9 +168,11 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
 	 * @param parameters
 	 * @return
 	 */
-	private Criteria from(Type type, MongoPersistentProperty property, Criteria criteria,
+	private Criteria from(Part part, MongoPersistentProperty property, Criteria criteria,
 			PotentiallyConvertingIterator parameters) {
 
+		Type type = part.getType();
+
 		switch (type) {
 			case AFTER:
 			case GREATER_THAN:
@@ -193,8 +198,7 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
 			case STARTING_WITH:
 			case ENDING_WITH:
 			case CONTAINING:
-				String value = parameters.next().toString();
-				return criteria.regex(toLikeRegex(value, type));
+				return addAppropriateLikeRegexTo(criteria, part, parameters.next().toString());
 			case REGEX:
 				return criteria.regex(parameters.next().toString());
 			case EXISTS:
@@ -220,19 +224,103 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
 					criteria.maxDistance(distance.getNormalizedValue());
 				}
 				return criteria;
-
 			case WITHIN:
+
 				Object parameter = parameters.next();
 				return criteria.within((Shape) parameter);
 			case SIMPLE_PROPERTY:
-				return criteria.is(parameters.nextConverted(property));
+
+				return isSimpleComparisionPossible(part) ? criteria.is(parameters.nextConverted(property))
+						: createLikeRegexCriteriaOrThrow(part, property, criteria, parameters, false);
+
 			case NEGATING_SIMPLE_PROPERTY:
-				return criteria.ne(parameters.nextConverted(property));
+
+				return isSimpleComparisionPossible(part) ? criteria.ne(parameters.nextConverted(property))
+						: createLikeRegexCriteriaOrThrow(part, property, criteria, parameters, true);
 			default:
 				throw new IllegalArgumentException("Unsupported keyword!");
 		}
 	}
 
+	private boolean isSimpleComparisionPossible(Part part) {
+
+		switch (part.shouldIgnoreCase()) {
+			case NEVER:
+				return true;
+			case WHEN_POSSIBLE:
+				return part.getProperty().getType() != String.class;
+			case ALWAYS:
+				return false;
+			default:
+				return true;
+		}
+	}
+
+	/**
+	 * Creates and extends the given criteria with a like-regex if necessary.
+	 * 
+	 * @param part
+	 * @param property
+	 * @param criteria
+	 * @param parameters
+	 * @param shouldNegateExpression
+	 * @return the criteria extended with the like-regex.
+	 */
+	private Criteria createLikeRegexCriteriaOrThrow(Part part, MongoPersistentProperty property, Criteria criteria,
+			PotentiallyConvertingIterator parameters, boolean shouldNegateExpression) {
+
+		switch (part.shouldIgnoreCase()) {
+
+			case ALWAYS:
+				if (part.getProperty().getType() != String.class) {
+					throw new IllegalArgumentException(String.format("part %s must be of type String but was %s",
+							part.getProperty(), part.getType()));
+				}
+				// fall-through
+
+			case WHEN_POSSIBLE:
+				if (shouldNegateExpression) {
+					criteria = criteria.not();
+				}
+				return addAppropriateLikeRegexTo(criteria, part, parameters.nextConverted(property).toString());
+
+			case NEVER:
+				// intentional no-op
+		}
+
+		throw new IllegalArgumentException(String.format("part.shouldCaseIgnore must be one of %s, but was %s",
+				Arrays.asList(IgnoreCaseType.ALWAYS, IgnoreCaseType.WHEN_POSSIBLE), part.shouldIgnoreCase()));
+	}
+
+	/**
+	 * Creates an appropriate like-regex and appends it to the given criteria.
+	 * 
+	 * @param criteria
+	 * @param part
+	 * @param value
+	 * @return the criteria extended with the regex.
+	 */
+	private Criteria addAppropriateLikeRegexTo(Criteria criteria, Part part, String value) {
+
+		return criteria.regex(toLikeRegex(value, part), toRegexOptions(part));
+	}
+
+	/**
+	 * @param part
+	 * @return the regex options or {@literal null}.
+	 */
+	private String toRegexOptions(Part part) {
+
+		String regexOptions = null;
+		switch (part.shouldIgnoreCase()) {
+			case WHEN_POSSIBLE:
+			case ALWAYS:
+				regexOptions = "i";
+			case NEVER:
+		}
+		return regexOptions;
+	}
+
 	/**
 	 * Returns the next element from the given {@link Iterator} expecting it to be of a certain type.
 	 * 
@@ -265,7 +353,9 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
 		return new Object[] { next };
 	}
 
-	private String toLikeRegex(String source, Type type) {
+	private String toLikeRegex(String source, Part part) {
+
+		Type type = part.getType();
 
 		switch (type) {
 			case STARTING_WITH:
@@ -277,6 +367,9 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
 			case CONTAINING:
 				source = "*" + source + "*";
 				break;
+			case SIMPLE_PROPERTY:
+			case NEGATING_SIMPLE_PROPERTY:
+				source = "^" + source + "$";
 			default:
 		}
 

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

@@ -28,6 +28,7 @@ import com.mongodb.DBObject;
 import com.mysema.query.mongodb.MongodbSerializer;
 import com.mysema.query.types.Path;
 import com.mysema.query.types.PathMetadata;
+import com.mysema.query.types.PathType;
 
 /**
  * Custom {@link MongodbSerializer} to take mapping information into account when building keys for constraints.
@@ -61,6 +62,10 @@ class SpringDataMongodbSerializer extends MongodbSerializer {
 	@Override
 	protected String getKeyForPath(Path<?> expr, PathMetadata<?> metadata) {
 
+		if (!metadata.getPathType().equals(PathType.PROPERTY)) {
+			return super.getKeyForPath(expr, metadata);
+		}
+
 		Path<?> parent = metadata.getParent();
 		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(parent.getType());
 		MongoPersistentProperty property = entity.getPersistentProperty(metadata.getName());

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/DBObjectUtils.java

@@ -0,0 +1,33 @@
+/*
+ * 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.util;
+
+import com.mongodb.BasicDBList;
+
+/**
+ * @author Thomas Darimont
+ */
+public class DBObjectUtils {
+
+	public static BasicDBList dbList(Object... items) {
+
+		BasicDBList list = new BasicDBList();
+		for (Object item : items) {
+			list.add(item);
+		}
+		return list;
+	}
+}

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

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

spring-data-mongodb/src/main/resources/META-INF/spring.schemas

@@ -2,4 +2,5 @@ http\://www.springframework.org/schema/data/mongo/spring-mongo-1.0.xsd=org/sprin
 http\://www.springframework.org/schema/data/mongo/spring-mongo-1.1.xsd=org/springframework/data/mongodb/config/spring-mongo-1.1.xsd
 http\://www.springframework.org/schema/data/mongo/spring-mongo-1.2.xsd=org/springframework/data/mongodb/config/spring-mongo-1.2.xsd
 http\://www.springframework.org/schema/data/mongo/spring-mongo-1.3.xsd=org/springframework/data/mongodb/config/spring-mongo-1.3.xsd
-http\://www.springframework.org/schema/data/mongo/spring-mongo.xsd=org/springframework/data/mongodb/config/spring-mongo-1.3.xsd
+http\://www.springframework.org/schema/data/mongo/spring-mongo-1.4.xsd=org/springframework/data/mongodb/config/spring-mongo-1.4.xsd
+http\://www.springframework.org/schema/data/mongo/spring-mongo.xsd=org/springframework/data/mongodb/config/spring-mongo-1.4.xsd

spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.4.xsd

@@ -0,0 +1,633 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xsd:schema xmlns="http://www.springframework.org/schema/data/mongo"
+						xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+						xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+						xmlns:beans="http://www.springframework.org/schema/beans"
+						xmlns:tool="http://www.springframework.org/schema/tool"
+						xmlns:context="http://www.springframework.org/schema/context"
+						xmlns:repository="http://www.springframework.org/schema/data/repository"
+						targetNamespace="http://www.springframework.org/schema/data/mongo"
+						elementFormDefault="qualified" attributeFormDefault="unqualified">
+
+	<xsd:import namespace="http://www.springframework.org/schema/beans" />
+	<xsd:import namespace="http://www.springframework.org/schema/tool" />
+	<xsd:import namespace="http://www.springframework.org/schema/context" />
+	<xsd:import namespace="http://www.springframework.org/schema/data/repository"
+				schemaLocation="http://www.springframework.org/schema/data/repository/spring-repository.xsd" />
+
+	<xsd:element name="mongo" type="mongoType">
+		<xsd:annotation>
+			<xsd:documentation source="org.springframework.data.mongodb.core.core.MongoFactoryBean"><![CDATA[
+Defines a Mongo instance used for accessing MongoDB'.
+			]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:annotation>
+					<tool:exports type="com.mongodb.Mongo"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+	</xsd:element>
+
+	<xsd:element name="db-factory">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Defines a MongoDbFactory for connecting to a specific database
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="id" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the mongo definition (by default "mongoDbFactory").]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="mongo-ref" type="mongoRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The reference to a Mongo instance. If not configured a default com.mongodb.Mongo instance will be created.
+					]]>
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="dbname" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the database to connect to. Default is 'db'.
+							]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="authentication-dbname" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the authentication database to connect to. Default is 'db'.
+							]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="port" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The port to connect to MongoDB server.  Default is 27017
+							]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="host" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The host to connect to a MongoDB server.  Default is localhost
+							]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="username" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The username to use when connecting to a MongoDB server.
+							]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="password" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The password to use when connecting to a MongoDB server.
+							]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="uri" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The Mongo URI string.]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="write-concern">
+				<xsd:annotation>
+					<xsd:documentation>
+					The WriteConcern that will be the default value used when asking the MongoDbFactory for a DB object
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
+				</xsd:simpleType>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:attributeGroup name="mongo-repository-attributes">
+		<xsd:attribute name="mongo-template-ref" type="mongoTemplateRef" default="mongoTemplate">
+			<xsd:annotation>
+				<xsd:documentation>
+					The reference to a MongoTemplate. Will default to 'mongoTemplate'.
+				</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="create-query-indexes" type="xsd:boolean" default="false">
+			<xsd:annotation>
+				<xsd:documentation>
+					Enables creation of indexes for queries that get derived from the method name
+					and thus reference domain class properties. Defaults to false.
+				</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:attributeGroup>
+
+	<xsd:element name="repositories">
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:extension base="repository:repositories">
+					<xsd:attributeGroup ref="mongo-repository-attributes"/>
+					<xsd:attributeGroup ref="repository:repository-attributes"/>
+				</xsd:extension>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="mapping-converter">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[Defines a MongoConverter for getting rich mapping functionality.]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:exports type="org.springframework.data.mongodb.core.convert.MappingMongoConverter" />
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="custom-converters" minOccurs="0">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
+        Top-level element that contains one or more custom converters to be used for mapping
+        domain objects to and from Mongo's DBObject]]>
+						</xsd:documentation>
+					</xsd:annotation>
+					<xsd:complexType>
+						<xsd:sequence>
+							<xsd:element name="converter" type="customConverterType" minOccurs="0" maxOccurs="unbounded"/>
+						</xsd:sequence>
+						<xsd:attribute name="base-package" type="xsd:string" />
+					</xsd:complexType>
+				</xsd:element>
+			</xsd:sequence>
+			<xsd:attribute name="id" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the MappingMongoConverter instance (by default "mappingConverter").]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="base-package" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The base package in which to scan for entities annotated with @Document
+							]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="db-factory-ref" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation>
+						The reference to a DbFactory.
+					</xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to type="org.springframework.data.mongodb.MongoDbFactory" />
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="type-mapper-ref" type="typeMapperRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation>
+						The reference to a MongoTypeMapper to be used by this MappingMongoConverter.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="mapping-context-ref" type="mappingContextRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation source="org.springframework.data.mapping.model.MappingContext">
+						The reference to a MappingContext. Will default to 'mappingContext'.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="disable-validation" use="optional">
+				<xsd:annotation>
+					<xsd:documentation source="org.springframework.data.mongodb.core.mapping.event.ValidatingMongoEventListener">
+						Disables JSR-303 validation on MongoDB documents before they are saved. By default it is set to false.
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="xsd:boolean xsd:string"/>
+				</xsd:simpleType>
+			</xsd:attribute>
+			<xsd:attribute name="abbreviate-field-names" use="optional" default="false">
+				<xsd:annotation>
+					<xsd:documentation source="org.springframework.data.mongodb.core.mapping.CamelCaseAbbreviatingFieldNamingStrategy">
+						Enables abbreviating the field names for domain class properties to the
+						first character of their camel case names, e.g. fooBar -> fb.
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="xsd:boolean xsd:string"/>
+				</xsd:simpleType>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="jmx">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Defines a JMX Model MBeans for monitoring a MongoDB server'.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="mongo-ref" type="mongoRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the Mongo object that determines what server to monitor. (by default "mongo").]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+	
+	<xsd:element name="auditing">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation>
+					<tool:exports type="org.springframework.data.mongodb.core.mapping.event.AuditingEventListener" />
+					<tool:exports type="org.springframework.data.auditing.IsNewAwareAuditingHandler" />
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attributeGroup ref="repository:auditing-attributes" />
+			<xsd:attribute name="mapping-context-ref" type="mappingContextRef" />
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:simpleType name="typeMapperRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mongodb.core.convert.MongoTypeMapper"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="mappingContextRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mapping.model.MappingContext"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="mongoTemplateRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mongodb.core.core.MongoTemplate"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="mongoRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mongodb.core.core.MongoFactoryBean"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+	
+	<xsd:simpleType name="sslSocketFactoryRef">
+	<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="javax.net.ssl.SSLSocketFactory"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="writeConcernEnumeration">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="NONE" />
+			<xsd:enumeration value="NORMAL" />
+			<xsd:enumeration value="SAFE" />
+			<xsd:enumeration value="FSYNC_SAFE" />
+			<xsd:enumeration value="REPLICAS_SAFE" />
+			<xsd:enumeration value="JOURNAL_SAFE" />
+			<xsd:enumeration value="MAJORITY" />
+		</xsd:restriction>
+	</xsd:simpleType>
+	<!--  MLP
+	<xsd:attributeGroup name="writeConcern">
+		<xsd:attribute name="write-concern">
+			<xsd:simpleType>
+				<xsd:restriction base="xsd:string">
+					<xsd:enumeration value="NONE" />
+					<xsd:enumeration value="NORMAL" />
+					<xsd:enumeration value="SAFE" />
+					<xsd:enumeration value="FSYNC_SAFE" />
+					<xsd:enumeration value="REPLICA_SAFE" />
+					<xsd:enumeration value="JOURNAL_SAFE" />
+					<xsd:enumeration value="MAJORITY" />
+				</xsd:restriction>
+			</xsd:simpleType>
+		</xsd:attribute>
+	</xsd:attributeGroup>
+	-->
+	<xsd:complexType name="mongoType">
+		<xsd:sequence minOccurs="0" maxOccurs="1">
+			<xsd:element name="options" type="optionsType">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The Mongo driver options
+							]]></xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation>
+							<tool:exports type="com.mongodb.MongoOptions"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+			<xsd:attribute name="write-concern">
+				<xsd:annotation>
+					<xsd:documentation>
+					The WriteConcern that will be the default value used when asking the MongoDbFactory for a DB object
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
+				</xsd:simpleType>
+			</xsd:attribute>		
+		<!-- MLP 
+		<xsd:attributeGroup ref="writeConcern" />
+		-->
+		<xsd:attribute name="id" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The name of the mongo definition (by default "mongo").]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="port" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The port to connect to MongoDB server.  Default is 27017
+							]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="host" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The host to connect to a MongoDB server.  Default is localhost
+							]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="replica-set" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The comma delimited list of host:port entries to use for replica set/pairs.
+							]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>				
+	</xsd:complexType>
+
+	<xsd:complexType name="optionsType">
+		<xsd:attribute name="connections-per-host" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override	
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="threads-allowed-to-block-for-connection-multiplier" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The multiplier for connectionsPerHost for # of threads that can block.  Default is 5.
+If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5, 
+then 50 threads can block more than that and an exception will be thrown.			
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="max-wait-time" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)	
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connect-timeout" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The connect timeout in milliseconds. 0 is default and infinite.	
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="socket-timeout" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The socket timeout.  0 is default and infinite.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="socket-keep-alive" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The keep alive flag, controls whether or not to have socket keep alive timeout.  Defaults to false.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>		
+		<xsd:attribute name="auto-connect-retry" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+This controls whether or not on a connect, the system retries automatically.  Default is false. 
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="max-auto-connect-retry-time" type="xsd:long">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on. 
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="write-number" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+This specifies the number of servers to wait for on the write operation, and exception raising behavior.  The 'w' option to the getlasterror command.  Defaults to 0.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="write-timeout" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+This controls timeout for write operations in milliseconds.  The 'wtimeout' option to the getlasterror command.  Defaults to 0 (indefinite).  Greater than zero is number of milliseconds to wait.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="write-fsync" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+This controls whether or not to fsync.  The 'fsync' option to the getlasterror command. Defaults to false.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>						
+		<xsd:attribute name="slave-ok" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+This controls if the driver is allowed to read from secondaries or slaves.  Defaults to false.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>				
+		<xsd:attribute name="ssl" type="xsd:boolean">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+This controls if the driver should us an SSL connection.  Defaults to false.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="ssl-socket-factory-ref" type="sslSocketFactoryRef" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The SSLSocketFactory to use for the SSL connection. If none is configured here, SSLSocketFactory#getDefault() will be used.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<xsd:group name="beanElementGroup">
+		<xsd:choice>
+			<xsd:element ref="beans:bean"/>
+			<xsd:element ref="beans:ref"/>
+		</xsd:choice>
+	</xsd:group>
+
+	<xsd:complexType name="customConverterType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+  Element defining a custom converterr.
+      ]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:group ref="beanElementGroup" minOccurs="0" maxOccurs="1"/>
+		<xsd:attribute name="ref" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation>
+					A reference to a custom converter.
+				</xsd:documentation>
+				<xsd:appinfo>
+					<tool:annotation kind="ref"/>
+				</xsd:appinfo>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<xsd:simpleType name="converterRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mongodb.core.convert.MongoConverter"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:element name="template">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Defines a MongoDbFactory for connecting to a specific database
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="id" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the mongo definition (by default "mongoDbFactory").]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="converter-ref" type="converterRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The reference to a Mongoconverter instance.
+					]]>
+					</xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to type="org.springframework.data.mongodb.core.convert.MongoConverter"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="db-factory-ref" type="xsd:string"
+				use="optional">
+				<xsd:annotation>
+					<xsd:documentation>
+						The reference to a DbFactory.
+					</xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to
+								type="org.springframework.data.mongodb.MongoDbFactory" />
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="write-concern">
+				<xsd:annotation>
+					<xsd:documentation>
+					The WriteConcern that will be the default value used when asking the MongoDbFactory for a DB object
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
+				</xsd:simpleType>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+	
+	<xsd:element name="gridFsTemplate">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Defines a MongoDbFactory for connecting to a specific database
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="id" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the mongo definition (by default "mongoDbFactory").]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="converter-ref" type="converterRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The reference to a Mongoconverter instance.
+					]]>
+					</xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to type="org.springframework.data.mongodb.core.convert.MongoConverter"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="db-factory-ref" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation>
+						The reference to a DbFactory.
+					</xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to type="org.springframework.data.mongodb.MongoDbFactory" />
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+</xsd:schema>

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractIntegrationTests.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 static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.dao.DataAccessException;
+import org.springframework.data.mongodb.core.CollectionCallback;
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBCollection;
+import com.mongodb.Mongo;
+import com.mongodb.MongoClient;
+import com.mongodb.MongoException;
+
+/**
+ * @author Oliver Gierke
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+public abstract class AbstractIntegrationTests {
+
+	@Configuration
+	static class TestConfig extends AbstractMongoConfiguration {
+
+		@Override
+		protected String getDatabaseName() {
+			return "database";
+		}
+
+		@Override
+		public Mongo mongo() throws Exception {
+			return new MongoClient();
+		}
+	}
+
+	@Autowired MongoOperations operations;
+
+	@Before
+	@After
+	public void cleanUp() {
+
+		for (String collectionName : operations.getCollectionNames()) {
+			if (!collectionName.startsWith("system")) {
+				operations.execute(collectionName, new CollectionCallback<Void>() {
+					@Override
+					public Void doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+						collection.remove(new BasicDBObject());
+						assertThat(collection.find().hasNext(), is(false));
+						return null;
+					}
+				});
+			}
+		}
+	}
+}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractMongoConfigurationUnitTests.java

@@ -25,6 +25,7 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoTypeMapper;
@@ -35,6 +36,7 @@ import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import com.mongodb.Mongo;
+import com.mongodb.MongoClient;
 
 /**
  * Unit tests for {@link AbstractMongoConfiguration}.
@@ -84,12 +86,13 @@ public class AbstractMongoConfigurationUnitTests {
 	@Test
 	public void containsMongoDbFactoryButNoMongoBean() {
 
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(SampleMongoConfiguration.class);
+		AbstractApplicationContext context = new AnnotationConfigApplicationContext(SampleMongoConfiguration.class);
 
 		assertThat(context.getBean(MongoDbFactory.class), is(notNullValue()));
 
 		exception.expect(NoSuchBeanDefinitionException.class);
 		context.getBean(Mongo.class);
+		context.close();
 	}
 
 	@Test
@@ -109,12 +112,13 @@ public class AbstractMongoConfigurationUnitTests {
 	@Test
 	public void lifecycleCallbacksAreInvokedInAppropriateOrder() {
 
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(SampleMongoConfiguration.class);
+		AbstractApplicationContext context = new AnnotationConfigApplicationContext(SampleMongoConfiguration.class);
 		MongoMappingContext mappingContext = context.getBean(MongoMappingContext.class);
 		BasicMongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(Entity.class);
 		StandardEvaluationContext spElContext = (StandardEvaluationContext) ReflectionTestUtils.getField(entity, "context");
 
 		assertThat(spElContext.getBeanResolver(), is(notNullValue()));
+		context.close();
 	}
 
 	/**
@@ -123,12 +127,21 @@ public class AbstractMongoConfigurationUnitTests {
 	@Test
 	public void shouldBeAbleToConfigureCustomTypeMapperViaJavaConfig() {
 
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(SampleMongoConfiguration.class);
+		AbstractApplicationContext context = new AnnotationConfigApplicationContext(SampleMongoConfiguration.class);
 		MongoTypeMapper typeMapper = context.getBean(CustomMongoTypeMapper.class);
 		MappingMongoConverter mmc = context.getBean(MappingMongoConverter.class);
 
 		assertThat(mmc, is(notNullValue()));
 		assertThat(mmc.getTypeMapper(), is(typeMapper));
+		context.close();
+	}
+
+	/**
+	 * @see DATAMONGO-789
+	 */
+	@Test
+	public void authenticationDatabaseShouldDefaultToNull() {
+		assertThat(new SampleMongoConfiguration().getAuthenticationDatabaseName(), is(nullValue()));
 	}
 
 	private static void assertScanningDisabled(final String value) throws ClassNotFoundException {
@@ -154,7 +167,7 @@ public class AbstractMongoConfigurationUnitTests {
 
 		@Override
 		public Mongo mongo() throws Exception {
-			return new Mongo();
+			return new MongoClient();
 		}
 
 		@Bean

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AuditingIntegrationTests.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.
@@ -20,7 +20,7 @@ import static org.junit.Assert.*;
 
 import org.joda.time.DateTime;
 import org.junit.Test;
-import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.Id;
@@ -35,9 +35,9 @@ import org.springframework.data.mongodb.core.mapping.event.BeforeConvertEvent;
 public class AuditingIntegrationTests {
 
 	@Test
-	public void enablesAuditingAndSetsPropertiesAccordingly() {
+	public void enablesAuditingAndSetsPropertiesAccordingly() throws Exception {
 
-		ApplicationContext context = new ClassPathXmlApplicationContext("auditing.xml", getClass());
+		AbstractApplicationContext context = new ClassPathXmlApplicationContext("auditing.xml", getClass());
 
 		Entity entity = new Entity();
 		BeforeConvertEvent<Entity> event = new BeforeConvertEvent<Entity>(entity);
@@ -46,23 +46,20 @@ public class AuditingIntegrationTests {
 		assertThat(entity.created, is(notNullValue()));
 		assertThat(entity.modified, is(entity.created));
 
+		Thread.sleep(10);
 		entity.id = 1L;
 		event = new BeforeConvertEvent<Entity>(entity);
 		context.publishEvent(event);
 
 		assertThat(entity.created, is(notNullValue()));
 		assertThat(entity.modified, is(not(entity.created)));
+		context.close();
 	}
 
 	class Entity {
 
-		@CreatedDate
-		DateTime created;
-
-		@LastModifiedDate
-		DateTime modified;
-
-		@Id
-		Long id;
+		@CreatedDate DateTime created;
+		@LastModifiedDate DateTime modified;
+		@Id Long id;
 	}
 }

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AuditingViaJavaConfigRepositoriesTests.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.config;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.domain.AuditorAware;
+import org.springframework.data.mongodb.core.AuditablePerson;
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
+import org.springframework.stereotype.Repository;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.mongodb.MongoClient;
+
+/**
+ * Integration tests for auditing via Java config.
+ * 
+ * @author Thomas Darimont
+ * @author Oliver Gierke
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+public class AuditingViaJavaConfigRepositoriesTests {
+
+	@Autowired AuditablePersonRepository auditablePersonRepository;
+	@Autowired AuditorAware<AuditablePerson> auditorAware;
+	AuditablePerson auditor;
+
+	@Configuration
+	@EnableMongoAuditing(auditorAwareRef = "auditorProvider")
+	@EnableMongoRepositories(basePackageClasses = AuditablePersonRepository.class, considerNestedRepositories = true)
+	static class Config {
+
+		@Bean
+		public MongoOperations mongoTemplate() throws Exception {
+			return new MongoTemplate(new SimpleMongoDbFactory(new MongoClient(), "database"));
+		}
+
+		@Bean
+		public MongoMappingContext mappingContext() {
+			return new MongoMappingContext();
+		}
+
+		@Bean
+		@SuppressWarnings("unchecked")
+		public AuditorAware<AuditablePerson> auditorProvider() {
+			return mock(AuditorAware.class);
+		}
+	}
+
+	@Before
+	public void setup() {
+		auditablePersonRepository.deleteAll();
+		this.auditor = auditablePersonRepository.save(new AuditablePerson("auditor"));
+	}
+
+	@Test
+	public void basicAuditing() {
+
+		doReturn(this.auditor).when(this.auditorAware).getCurrentAuditor();
+
+		AuditablePerson user = new AuditablePerson("user");
+
+		AuditablePerson savedUser = auditablePersonRepository.save(user);
+		System.out.println(savedUser);
+
+		AuditablePerson createdBy = savedUser.getCreatedBy();
+		assertThat(createdBy, is(notNullValue()));
+		assertThat(createdBy.getFirstname(), is(this.auditor.getFirstname()));
+	}
+
+	@Repository
+	static interface AuditablePersonRepository extends MongoRepository<AuditablePerson, String> {}
+}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoAuditingRegistrarUnitTests.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.config;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.core.type.AnnotationMetadata;
+
+/**
+ * Unit tests for {@link JpaAuditingRegistrar}.
+ * 
+ * @see DATAMONGO-792
+ * @author Oliver Gierke
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class MongoAuditingRegistrarUnitTests {
+
+	MongoAuditingRegistrar registrar = new MongoAuditingRegistrar();
+
+	@Mock AnnotationMetadata metadata;
+	@Mock BeanDefinitionRegistry registry;
+
+	@Test(expected = IllegalArgumentException.class)
+	public void rejectsNullAnnotationMetadata() {
+		registrar.registerBeanDefinitions(null, registry);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void rejectsNullBeanDefinitionRegistry() {
+		registrar.registerBeanDefinitions(metadata, null);
+	}
+}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoDbFactoryParserIntegrationTests.java

@@ -1,11 +1,11 @@
 /*
- * 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.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -27,7 +27,7 @@ import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
 import org.springframework.beans.factory.support.BeanDefinitionReader;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
-import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.data.mongodb.MongoDbFactory;
@@ -36,6 +36,7 @@ import org.springframework.test.util.ReflectionTestUtils;
 
 import com.mongodb.DB;
 import com.mongodb.Mongo;
+import com.mongodb.MongoClient;
 import com.mongodb.MongoURI;
 import com.mongodb.WriteConcern;
 
@@ -57,9 +58,11 @@ public class MongoDbFactoryParserIntegrationTests {
 
 	@Test
 	public void testWriteConcern() throws Exception {
-		SimpleMongoDbFactory dbFactory = new SimpleMongoDbFactory(new Mongo("localhost"), "database");
+
+		SimpleMongoDbFactory dbFactory = new SimpleMongoDbFactory(new MongoClient("localhost"), "database");
 		dbFactory.setWriteConcern(WriteConcern.SAFE);
 		dbFactory.getDb();
+
 		assertThat(ReflectionTestUtils.getField(dbFactory, "writeConcern"), is((Object) WriteConcern.SAFE));
 	}
 
@@ -82,11 +85,13 @@ public class MongoDbFactoryParserIntegrationTests {
 	@Test
 	public void readsReplicasWriteConcernCorrectly() {
 
-		ApplicationContext ctx = new ClassPathXmlApplicationContext("namespace/db-factory-bean-custom-write-concern.xml");
+		AbstractApplicationContext ctx = new ClassPathXmlApplicationContext(
+				"namespace/db-factory-bean-custom-write-concern.xml");
 		MongoDbFactory factory = ctx.getBean("second", MongoDbFactory.class);
 		DB db = factory.getDb();
 
 		assertThat(db.getWriteConcern(), is(WriteConcern.REPLICAS_SAFE));
+		ctx.close();
 	}
 
 	private void assertWriteConcern(ClassPathXmlApplicationContext ctx, WriteConcern expectedWriteConcern) {

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoNamespaceTests.java

@@ -18,6 +18,8 @@ package org.springframework.data.mongodb.config;
 import static org.junit.Assert.*;
 import static org.springframework.test.util.ReflectionTestUtils.*;
 
+import javax.net.ssl.SSLSocketFactory;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,13 +43,13 @@ import com.mongodb.WriteConcern;
  * @author Mark Pollack
  * @author Oliver Gierke
  * @author Martin Baumgartner
+ * @author Thomas Darimont
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
 public class MongoNamespaceTests {
 
-	@Autowired
-	private ApplicationContext ctx;
+	@Autowired ApplicationContext ctx;
 
 	@Test
 	public void testMongoSingleton() throws Exception {
@@ -59,12 +61,46 @@ public class MongoNamespaceTests {
 
 	@Test
 	public void testMongoSingletonWithAttributes() throws Exception {
+
 		assertTrue(ctx.containsBean("defaultMongo"));
 		MongoFactoryBean mfb = (MongoFactoryBean) ctx.getBean("&defaultMongo");
 		String host = (String) getField(mfb, "host");
 		Integer port = (Integer) getField(mfb, "port");
 		assertEquals("localhost", host);
 		assertEquals(new Integer(27017), port);
+
+		MongoOptions options = (MongoOptions) getField(mfb, "mongoOptions");
+		assertFalse("By default socketFactory should not be a SSLSocketFactory",
+				options.getSocketFactory() instanceof SSLSocketFactory);
+	}
+
+	/**
+	 * @see DATAMONGO-764
+	 */
+	@Test
+	public void testMongoSingletonWithSslEnabled() throws Exception {
+
+		assertTrue(ctx.containsBean("mongoSsl"));
+		MongoFactoryBean mfb = (MongoFactoryBean) ctx.getBean("&mongoSsl");
+
+		MongoOptions options = (MongoOptions) getField(mfb, "mongoOptions");
+		assertTrue("socketFactory should be a SSLSocketFactory", options.getSocketFactory() instanceof SSLSocketFactory);
+	}
+
+	/**
+	 * @see DATAMONGO-764
+	 */
+	@Test
+	public void testMongoSingletonWithSslEnabledAndCustomSslSocketFactory() throws Exception {
+
+		assertTrue(ctx.containsBean("mongoSslWithCustomSslFactory"));
+		MongoFactoryBean mfb = (MongoFactoryBean) ctx.getBean("&mongoSslWithCustomSslFactory");
+
+		SSLSocketFactory customSslSocketFactory = ctx.getBean("customSslSocketFactory", SSLSocketFactory.class);
+		MongoOptions options = (MongoOptions) getField(mfb, "mongoOptions");
+
+		assertTrue("socketFactory should be a SSLSocketFactory", options.getSocketFactory() instanceof SSLSocketFactory);
+		assertSame(customSslSocketFactory, options.getSocketFactory());
 	}
 
 	@Test
@@ -78,6 +114,24 @@ public class MongoNamespaceTests {
 		assertEquals("database", getField(dbf, "databaseName"));
 	}
 
+	/**
+	 * @see DATAMONGO-789
+	 */
+	@Test
+	public void testThirdMongoDbFactory() {
+
+		assertTrue(ctx.containsBean("thirdMongoDbFactory"));
+
+		MongoDbFactory dbf = (MongoDbFactory) ctx.getBean("thirdMongoDbFactory");
+		Mongo mongo = (Mongo) getField(dbf, "mongo");
+
+		assertEquals("localhost", mongo.getAddress().getHost());
+		assertEquals(27017, mongo.getAddress().getPort());
+		assertEquals(new UserCredentials("joe", "secret"), getField(dbf, "credentials"));
+		assertEquals("database", getField(dbf, "databaseName"));
+		assertEquals("admin", getField(dbf, "authenticationDatabaseName"));
+	}
+
 	/**
 	 * @see DATAMONGO-140
 	 */

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoParserIntegrationTests.java

@@ -27,6 +27,7 @@ import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionReader;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
+import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.io.ClassPathResource;
 
@@ -44,8 +45,9 @@ public class MongoParserIntegrationTests {
 
 	@Before
 	public void setUp() {
-		factory = new DefaultListableBeanFactory();
-		reader = new XmlBeanDefinitionReader(factory);
+
+		this.factory = new DefaultListableBeanFactory();
+		this.reader = new XmlBeanDefinitionReader(factory);
 	}
 
 	@Test
@@ -68,9 +70,10 @@ public class MongoParserIntegrationTests {
 
 		reader.loadBeanDefinitions(new ClassPathResource("namespace/mongo-bean.xml"));
 
-		GenericApplicationContext context = new GenericApplicationContext(factory);
+		AbstractApplicationContext context = new GenericApplicationContext(factory);
 		context.refresh();
 
 		assertThat(context.getBean("mongo2", Mongo.class), is(notNullValue()));
+		context.close();
 	}
 }

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/AuditablePerson.java

@@ -0,0 +1,62 @@
+/*
+ * 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.data.annotation.CreatedBy;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.DBRef;
+
+/**
+ * Domain class for auditing functionality testing.
+ * 
+ * @author Thomas Darimont
+ */
+public class AuditablePerson {
+
+	@Id private String id;
+	private String firstname;
+	@DBRef @CreatedBy private AuditablePerson createdBy;
+
+	public AuditablePerson() {}
+
+	public AuditablePerson(String firstName) {
+		this.firstname = firstName;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getFirstname() {
+		return firstname;
+	}
+
+	public void setFirstname(String firstName) {
+		this.firstname = firstName;
+	}
+
+	public AuditablePerson getCreatedBy() {
+		return createdBy;
+	}
+
+	public void setCreatedBy(AuditablePerson createdBy) {
+		this.createdBy = createdBy;
+	}
+}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DBObjectTestUtils.java

@@ -26,9 +26,9 @@ import com.mongodb.DBObject;
  * 
  * @author Oliver Gierke
  */
-public abstract class DBObjectUtils {
+public abstract class DBObjectTestUtils {
 
-	private DBObjectUtils() {
+	private DBObjectTestUtils() {
 
 	}
 

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/JmxServer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-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;
 
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -22,6 +21,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
  * Server application than can be run as an app or unit test.
  * 
  * @author Mark Pollack
+ * @author Oliver Gierke
  */
 public class JmxServer {
 
@@ -29,8 +29,8 @@ public class JmxServer {
 		new JmxServer().run();
 	}
 
+	@SuppressWarnings("resource")
 	public void run() {
 		new ClassPathXmlApplicationContext(new String[] { "infrastructure.xml", "server-jmx.xml" });
 	}
-
 }

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoDbUtilsIntegrationTests.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.
@@ -32,15 +32,18 @@ import org.springframework.scheduling.concurrent.ThreadPoolExecutorFactoryBean;
 
 import com.mongodb.DB;
 import com.mongodb.Mongo;
+import com.mongodb.MongoClient;
 import com.mongodb.MongoException;
 
 /**
  * Integration tests for {@link MongoDbUtils}.
  * 
  * @author Oliver Gierke
+ * @author Thomas Darimont
  */
 public class MongoDbUtilsIntegrationTests {
 
+	static final String AUTHENTICATION_DATABASE_NAME = "admin";
 	static final String DATABASE_NAME = "dbAuthTests";
 	static final UserCredentials CREDENTIALS = new UserCredentials("admin", "admin");
 
@@ -54,17 +57,9 @@ public class MongoDbUtilsIntegrationTests {
 	@BeforeClass
 	public static void setUp() throws Exception {
 
-		mongo = new Mongo();
+		mongo = new MongoClient();
 		template = new MongoTemplate(mongo, DATABASE_NAME);
 
-		// Create sample user
-		template.execute(new DbCallback<Void>() {
-			public Void doInDB(DB db) throws MongoException, DataAccessException {
-				db.addUser("admin", "admin".toCharArray());
-				return null;
-			}
-		});
-
 		factory = new ThreadPoolExecutorFactoryBean();
 		factory.setCorePoolSize(2);
 		factory.setMaxPoolSize(10);
@@ -95,6 +90,14 @@ public class MongoDbUtilsIntegrationTests {
 	@Test
 	public void authenticatesCorrectlyInMultithreadedEnvironment() throws Exception {
 
+		// Create sample user
+		template.execute(new DbCallback<Void>() {
+			public Void doInDB(DB db) throws MongoException, DataAccessException {
+				db.addUser("admin", "admin".toCharArray());
+				return null;
+			}
+		});
+
 		Callable<Void> callable = new Callable<Void>() {
 			public Void call() throws Exception {
 
@@ -121,4 +124,45 @@ public class MongoDbUtilsIntegrationTests {
 			fail("Exception occurred!" + exception);
 		}
 	}
+
+	/**
+	 * @see DATAMONGO-789
+	 */
+	@Test
+	public void authenticatesCorrectlyWithAuthenticationDB() throws Exception {
+
+		// Create sample user
+		template.execute(new DbCallback<Void>() {
+			public Void doInDB(DB db) throws MongoException, DataAccessException {
+				db.getSisterDB("admin").addUser("admin", "admin".toCharArray());
+				return null;
+			}
+		});
+
+		Callable<Void> callable = new Callable<Void>() {
+			public Void call() throws Exception {
+
+				try {
+					DB db = MongoDbUtils.getDB(mongo, DATABASE_NAME, CREDENTIALS, AUTHENTICATION_DATABASE_NAME);
+					assertThat(db, is(notNullValue()));
+				} catch (Exception o_O) {
+					MongoDbUtilsIntegrationTests.this.exception = o_O;
+				}
+
+				return null;
+			}
+		};
+
+		List<Callable<Void>> callables = new ArrayList<Callable<Void>>();
+
+		for (int i = 0; i < 10; i++) {
+			callables.add(callable);
+		}
+
+		service.invokeAll(callables);
+
+		if (exception != null) {
+			fail("Exception occurred!" + exception);
+		}
+	}
 }

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoExceptionTranslatorUnitTests.java

@@ -23,6 +23,9 @@ import java.net.UnknownHostException;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.core.NestedRuntimeException;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataAccessResourceFailureException;
@@ -43,10 +46,13 @@ import com.mongodb.ServerAddress;
  * @author Michal Vich
  * @author Oliver Gierke
  */
+@RunWith(MockitoJUnitRunner.class)
 public class MongoExceptionTranslatorUnitTests {
 
 	MongoExceptionTranslator translator;
 
+	@Mock DuplicateKey exception;
+
 	@Before
 	public void setUp() {
 		translator = new MongoExceptionTranslator();
@@ -55,10 +61,8 @@ public class MongoExceptionTranslatorUnitTests {
 	@Test
 	public void translateDuplicateKey() {
 
-		DuplicateKey exception = new DuplicateKey(1, "Duplicated key");
 		DataAccessException translatedException = translator.translateExceptionIfPossible(exception);
-
-		expectExceptionWithCauseMessage(translatedException, DuplicateKeyException.class, "Duplicated key");
+		expectExceptionWithCauseMessage(translatedException, DuplicateKeyException.class, null);
 	}
 
 	@Test

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoOptionsFactoryBeanUnitTests.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,16 +15,20 @@
  */
 package org.springframework.data.mongodb.core;
 
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import javax.net.ssl.SSLSocketFactory;
+
 import org.junit.Test;
 
 import com.mongodb.MongoOptions;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
 
 /**
  * Unit tests for {@link MongoOptionsFactoryBean}.
  * 
  * @author Oliver Gierke
+ * @author Mike Saavedra
  */
 public class MongoOptionsFactoryBeanUnitTests {
 
@@ -41,4 +45,19 @@ public class MongoOptionsFactoryBeanUnitTests {
 		MongoOptions options = bean.getObject();
 		assertThat(options.maxAutoConnectRetryTime, is(27L));
 	}
+
+	/**
+	 * @see DATAMONGO-764
+	 */
+	@Test
+	public void testSslConnection() {
+
+		MongoOptionsFactoryBean bean = new MongoOptionsFactoryBean();
+		bean.setSsl(true);
+		bean.afterPropertiesSet();
+
+		MongoOptions options = bean.getObject();
+		assertNotNull(options.getSocketFactory());
+		assertTrue(options.getSocketFactory() instanceof SSLSocketFactory);
+	}
 }

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java

@@ -57,6 +57,8 @@ import org.springframework.data.mapping.model.MappingException;
 import org.springframework.data.mongodb.InvalidMongoDbApiUsageException;
 import org.springframework.data.mongodb.MongoDbFactory;
 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.index.Index;
 import org.springframework.data.mongodb.core.index.Index.Duplicates;
@@ -90,6 +92,7 @@ import com.mongodb.WriteResult;
  * @author Amol Nayak
  * @author Patryk Wasik
  * @author Thomas Darimont
+ * @author Komi Innocent
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration("classpath:infrastructure.xml")
@@ -118,7 +121,8 @@ public class MongoTemplateTests {
 		mappingContext.setSimpleTypeHolder(conversions.getSimpleTypeHolder());
 		mappingContext.initialize();
 
-		MappingMongoConverter mappingConverter = new MappingMongoConverter(factory, mappingContext);
+		DbRefResolver dbRefResolver = new DefaultDbRefResolver(factory);
+		MappingMongoConverter mappingConverter = new MappingMongoConverter(dbRefResolver, mappingContext);
 		mappingConverter.setCustomConversions(conversions);
 		mappingConverter.afterPropertiesSet();
 
@@ -333,6 +337,43 @@ public class MongoTemplateTests {
 		assertThat(field, is(IndexField.create("age", Direction.DESC)));
 	}
 
+	/**
+	 * @see DATAMONGO-746
+	 */
+	@Test
+	public void testReadIndexInfoForIndicesCreatedViaMongoShellCommands() throws Exception {
+
+		String command = "db." + template.getCollectionName(Person.class)
+				+ ".ensureIndex({'age':-1}, {'unique':true, 'sparse':true})";
+		template.indexOps(Person.class).dropAllIndexes();
+
+		assertThat(template.indexOps(Person.class).getIndexInfo().isEmpty(), is(true));
+		factory.getDb().eval(command);
+
+		List<DBObject> indexInfo = template.getCollection(template.getCollectionName(Person.class)).getIndexInfo();
+		String indexKey = null;
+		boolean unique = false;
+
+		for (DBObject ix : indexInfo) {
+			if ("age_-1".equals(ix.get("name"))) {
+				indexKey = ix.get("key").toString();
+				unique = (Boolean) ix.get("unique");
+			}
+		}
+
+		assertThat(indexKey, is("{ \"age\" : -1.0}"));
+		assertThat(unique, is(true));
+
+		IndexInfo info = template.indexOps(Person.class).getIndexInfo().get(1);
+		assertThat(info.isUnique(), is(true));
+		assertThat(info.isSparse(), is(true));
+
+		List<IndexField> indexFields = info.getIndexFields();
+		IndexField field = indexFields.get(0);
+
+		assertThat(field, is(IndexField.create("age", Direction.DESC)));
+	}
+
 	@Test
 	public void testProperHandlingOfDifferentIdTypesWithMappingMongoConverter() throws Exception {
 		testProperHandlingOfDifferentIdTypes(this.mappingTemplate);
@@ -1996,6 +2037,24 @@ public class MongoTemplateTests {
 		assertThat(result.get(2).getClass(), is((Object) VerySpecialDoc.class));
 	}
 
+	/**
+	 * @see DATAMONGO-771
+	 */
+	@Test
+	public void allowInsertWithPlainJsonString() {
+
+		String id = "4711";
+		String value = "bubu";
+		String json = String.format("{_id:%s, field: '%s'}", id, value);
+
+		template.insert(json, "sample");
+		List<Sample> result = template.findAll(Sample.class);
+
+		assertThat(result.size(), is(1));
+		assertThat(result.get(0).id, is(id));
+		assertThat(result.get(0).field, is(value));
+	}
+
 	static interface Model {
 		String value();
 

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUnitTests.java

@@ -40,6 +40,7 @@ import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.convert.CustomConversions;
+import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.index.MongoPersistentEntityIndexCreator;
@@ -64,27 +65,26 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests {
 
 	MongoTemplate template;
 
-	@Mock
-	MongoDbFactory factory;
-	@Mock
-	Mongo mongo;
-	@Mock
-	DB db;
-	@Mock
-	DBCollection collection;
+	@Mock MongoDbFactory factory;
+	@Mock Mongo mongo;
+	@Mock DB db;
+	@Mock DBCollection collection;
 
+	MongoExceptionTranslator exceptionTranslator = new MongoExceptionTranslator();
 	MappingMongoConverter converter;
 	MongoMappingContext mappingContext;
 
 	@Before
 	public void setUp() {
 
+		when(factory.getDb()).thenReturn(db);
+		when(factory.getExceptionTranslator()).thenReturn(exceptionTranslator);
+		when(db.getCollection(Mockito.any(String.class))).thenReturn(collection);
+
 		this.mappingContext = new MongoMappingContext();
-		this.converter = new MappingMongoConverter(factory, mappingContext);
+		this.converter = new MappingMongoConverter(new DefaultDbRefResolver(factory), mappingContext);
 		this.template = new MongoTemplate(factory, converter);
 
-		when(factory.getDb()).thenReturn(db);
-		when(db.getCollection(Mockito.any(String.class))).thenReturn(collection);
 	}
 
 	@Test(expected = IllegalArgumentException.class)
@@ -228,14 +228,12 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests {
 
 	class AutogenerateableId {
 
-		@Id
-		BigInteger id;
+		@Id BigInteger id;
 	}
 
 	class NotAutogenerateableId {
 
-		@Id
-		Integer id;
+		@Id Integer id;
 
 		public Pattern getId() {
 			return Pattern.compile(".");

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonExample.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-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,23 +17,27 @@ package org.springframework.data.mongodb.core;
 
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.context.support.AbstractApplicationContext;
 
+/**
+ * @author Jon Brisbin
+ * @author Oliver Gierke
+ */
 public class PersonExample {
 
-	private static final Log log = LogFactory.getLog(PersonExample.class);
-	@Autowired
-	private MongoOperations mongoOps;
+	private static final Logger LOGGER = LoggerFactory.getLogger(PersonExample.class);
+
+	@Autowired private MongoOperations mongoOps;
 
 	public static void main(String[] args) {
-		ApplicationContext applicationContext = new AnnotationConfigApplicationContext(PersonExampleAppConfig.class);
+		AbstractApplicationContext applicationContext = new AnnotationConfigApplicationContext(PersonExampleAppConfig.class);
 		PersonExample example = applicationContext.getBean(PersonExample.class);
 		example.doWork();
+		applicationContext.close();
 	}
 
 	public void doWork() {
@@ -51,23 +55,23 @@ public class PersonExample {
 
 		mongoOps.save(p2);
 
-		log.debug("Saved: " + p);
+		LOGGER.debug("Saved: " + p);
 
 		p = mongoOps.findById(p.getId(), PersonWithIdPropertyOfTypeString.class);
 
-		log.debug("Found: " + p);
+		LOGGER.debug("Found: " + p);
 
 		// mongoOps.updateFirst(new Query(where("firstName").is("Sven")), new Update().set("age", 24));
 
 		// mongoOps.updateFirst(new Query(where("firstName").is("Sven")), update("age", 24));
 
 		p = mongoOps.findById(p.getId(), PersonWithIdPropertyOfTypeString.class);
-		log.debug("Updated: " + p);
+		LOGGER.debug("Updated: " + p);
 
 		List<PersonWithIdPropertyOfTypeString> folks = mongoOps.findAll(PersonWithIdPropertyOfTypeString.class);
-		log.debug("Querying for all people...");
+		LOGGER.debug("Querying for all people...");
 		for (PersonWithIdPropertyOfTypeString element : folks) {
-			log.debug(element);
+			LOGGER.debug(element.toString());
 		}
 
 		// mongoOps.remove( query(whereId().is(p.getId())), p.getClass());
@@ -76,10 +80,7 @@ public class PersonExample {
 
 		List<PersonWithIdPropertyOfTypeString> people = mongoOps.findAll(PersonWithIdPropertyOfTypeString.class);
 
-		// PersonWithIdPropertyOfTypeString p2 = mongoOps.findOne(query(whereId().is(p.getId())),
-		// PersonWithIdPropertyOfTypeString.class);
-
-		log.debug("Number of people = : " + people.size());
+		LOGGER.debug("Number of people = : " + people.size());
 
 	}
 

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonExampleAppConfig.java

@@ -17,16 +17,16 @@ package org.springframework.data.mongodb.core;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.mongodb.core.MongoTemplate;
 
 import com.mongodb.Mongo;
+import com.mongodb.MongoClient;
 
 @Configuration
 public class PersonExampleAppConfig {
 
 	@Bean
 	public Mongo mongo() throws Exception {
-		return new Mongo("localhost");
+		return new MongoClient("localhost");
 	}
 
 	@Bean

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SimpleMongoDbFactoryUnitTests.java

@@ -39,8 +39,7 @@ import com.mongodb.MongoURI;
 @RunWith(MockitoJUnitRunner.class)
 public class SimpleMongoDbFactoryUnitTests {
 
-	@Mock
-	Mongo mongo;
+	@Mock Mongo mongo;
 
 	/**
 	 * @see DATADOC-254
@@ -66,6 +65,7 @@ public class SimpleMongoDbFactoryUnitTests {
 	 * @throws UnknownHostException
 	 */
 	@Test
+	@SuppressWarnings("deprecation")
 	public void mongoUriConstructor() throws UnknownHostException {
 
 		MongoURI mongoURI = new MongoURI("mongodb://myUsername:myPassword@localhost/myDatabase.myCollection");
@@ -77,6 +77,16 @@ public class SimpleMongoDbFactoryUnitTests {
 		assertThat(ReflectionTestUtils.getField(mongoDbFactory, "databaseName").toString(), is("myDatabase"));
 	}
 
+	/**
+	 * @see DATAMONGO-789
+	 */
+	@Test
+	public void defaultsAuthenticationDatabaseToDatabase() {
+
+		SimpleMongoDbFactory factory = new SimpleMongoDbFactory(mongo, "foo");
+		assertThat(ReflectionTestUtils.getField(factory, "authenticationDatabaseName"), is((Object) "foo"));
+	}
+
 	private void rejectsDatabaseName(String databaseName) {
 
 		try {

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/TestMongoConfiguration.java

@@ -10,6 +10,7 @@ import org.springframework.data.mongodb.core.convert.CustomConversions;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 
 import com.mongodb.Mongo;
+import com.mongodb.MongoClient;
 
 public class TestMongoConfiguration extends AbstractMongoConfiguration {
 
@@ -21,7 +22,7 @@ public class TestMongoConfiguration extends AbstractMongoConfiguration {
 	@Override
 	@Bean
 	public Mongo mongo() throws Exception {
-		return new Mongo("127.0.0.1", 27017);
+		return new MongoClient("127.0.0.1", 27017);
 	}
 
 	@Override

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/UnwrapAndReadDbObjectCallbackUnitTests.java

@@ -25,6 +25,7 @@ import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.MongoTemplate.UnwrapAndReadDbObjectCallback;
+import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 
@@ -46,7 +47,8 @@ public class UnwrapAndReadDbObjectCallbackUnitTests {
 	public void setUp() {
 
 		MongoTemplate template = new MongoTemplate(factory);
-		MappingMongoConverter converter = new MappingMongoConverter(factory, new MongoMappingContext());
+		MappingMongoConverter converter = new MappingMongoConverter(new DefaultDbRefResolver(factory),
+				new MongoMappingContext());
 
 		this.callback = template.new UnwrapAndReadDbObjectCallback<Target>(converter, Target.class);
 	}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationTests.java

@@ -15,13 +15,16 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
+import static org.junit.Assume.*;
 import static org.springframework.data.domain.Sort.Direction.*;
 import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 
 import java.io.BufferedInputStream;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -29,16 +32,20 @@ import java.util.Scanner;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.dao.DataAccessException;
+import org.springframework.data.mapping.model.MappingException;
 import org.springframework.data.mongodb.core.CollectionCallback;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.util.Version;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -63,18 +70,31 @@ public class AggregationTests {
 
 	private static final String INPUT_COLLECTION = "aggregation_test_collection";
 	private static final Logger LOGGER = LoggerFactory.getLogger(AggregationTests.class);
+	private static final Version TWO_DOT_FOUR = new Version(2, 4);
 
 	private static boolean initialized = false;
 
 	@Autowired MongoTemplate mongoTemplate;
 
+	@Rule public ExpectedException exception = ExpectedException.none();
+	private static Version mongoVersion;
+
 	@Before
 	public void setUp() {
 
+		queryMongoVersionIfNecessary();
 		cleanDb();
 		initSampleDataIfNecessary();
 	}
 
+	private void queryMongoVersionIfNecessary() {
+
+		if (mongoVersion == null) {
+			CommandResult result = mongoTemplate.executeCommand("{ buildInfo: 1 }");
+			mongoVersion = Version.parse(result.get("version").toString());
+		}
+	}
+
 	@After
 	public void cleanUp() {
 		cleanDb();
@@ -84,6 +104,9 @@ public class AggregationTests {
 		mongoTemplate.dropCollection(INPUT_COLLECTION);
 		mongoTemplate.dropCollection(Product.class);
 		mongoTemplate.dropCollection(UserWithLikes.class);
+		mongoTemplate.dropCollection(DATAMONGO753.class);
+		mongoTemplate.dropCollection(Data.class);
+		mongoTemplate.dropCollection(DATAMONGO788.class);
 	}
 
 	/**
@@ -96,9 +119,7 @@ public class AggregationTests {
 
 		if (!initialized) {
 
-			CommandResult result = mongoTemplate.executeCommand("{ buildInfo: 1 }");
-			Object version = result.get("version");
-			LOGGER.debug("Server uses MongoDB Version: {}", version);
+			LOGGER.debug("Server uses MongoDB Version: {}", mongoVersion);
 
 			mongoTemplate.dropCollection(ZipInfo.class);
 			mongoTemplate.execute(ZipInfo.class, new CollectionCallback<Void>() {
@@ -424,13 +445,8 @@ public class AggregationTests {
 	@Test
 	public void arithmenticOperatorsInProjectionExample() {
 
-		double taxRate = 0.19;
-		double netPrice = 1.99;
-		double discountRate = 0.05;
-		int spaceUnits = 3;
-		String productId = "P1";
-		String productName = "A";
-		mongoTemplate.insert(new Product(productId, productName, netPrice, spaceUnits, discountRate, taxRate));
+		Product product = new Product("P1", "A", 1.99, 3, 0.05, 0.19);
+		mongoTemplate.insert(product);
 
 		TypedAggregation<Product> agg = newAggregation(Product.class, //
 				project("name", "netPrice") //
@@ -439,20 +455,293 @@ public class AggregationTests {
 						.and("netPrice").multiply(2).as("netPriceMul2") //
 						.and("netPrice").divide(1.19).as("netPriceDiv119") //
 						.and("spaceUnits").mod(2).as("spaceUnitsMod2") //
+						.and("spaceUnits").plus("spaceUnits").as("spaceUnitsPlusSpaceUnits") //
+						.and("spaceUnits").minus("spaceUnits").as("spaceUnitsMinusSpaceUnits") //
+						.and("spaceUnits").multiply("spaceUnits").as("spaceUnitsMultiplySpaceUnits") //
+						.and("spaceUnits").divide("spaceUnits").as("spaceUnitsDivideSpaceUnits") //
+						.and("spaceUnits").mod("spaceUnits").as("spaceUnitsModSpaceUnits") //
 		);
 
 		AggregationResults<DBObject> result = mongoTemplate.aggregate(agg, DBObject.class);
 		List<DBObject> resultList = result.getMappedResults();
 
 		assertThat(resultList, is(notNullValue()));
-		assertThat((String) resultList.get(0).get("_id"), is(productId));
-		assertThat((String) resultList.get(0).get("name"), is(productName));
-		assertThat((Double) resultList.get(0).get("netPricePlus1"), is(netPrice + 1));
-		assertThat((Double) resultList.get(0).get("netPriceMinus1"), is(netPrice - 1));
-		assertThat((Double) resultList.get(0).get("netPriceMul2"), is(netPrice * 2));
-		assertThat((Double) resultList.get(0).get("netPriceDiv119"), is(netPrice / 1.19));
-		assertThat((Integer) resultList.get(0).get("spaceUnitsMod2"), is(spaceUnits % 2));
+		assertThat((String) resultList.get(0).get("_id"), is(product.id));
+		assertThat((String) resultList.get(0).get("name"), is(product.name));
+		assertThat((Double) resultList.get(0).get("netPricePlus1"), is(product.netPrice + 1));
+		assertThat((Double) resultList.get(0).get("netPriceMinus1"), is(product.netPrice - 1));
+		assertThat((Double) resultList.get(0).get("netPriceMul2"), is(product.netPrice * 2));
+		assertThat((Double) resultList.get(0).get("netPriceDiv119"), is(product.netPrice / 1.19));
+		assertThat((Integer) resultList.get(0).get("spaceUnitsMod2"), is(product.spaceUnits % 2));
+		assertThat((Integer) resultList.get(0).get("spaceUnitsPlusSpaceUnits"), is(product.spaceUnits + product.spaceUnits));
+		assertThat((Integer) resultList.get(0).get("spaceUnitsMinusSpaceUnits"),
+				is(product.spaceUnits - product.spaceUnits));
+		assertThat((Integer) resultList.get(0).get("spaceUnitsMultiplySpaceUnits"), is(product.spaceUnits
+				* product.spaceUnits));
+		assertThat((Double) resultList.get(0).get("spaceUnitsDivideSpaceUnits"),
+				is((double) (product.spaceUnits / product.spaceUnits)));
+		assertThat((Integer) resultList.get(0).get("spaceUnitsModSpaceUnits"), is(product.spaceUnits % product.spaceUnits));
+	}
 
+	/**
+	 * @see DATAMONGO-774
+	 */
+	@Test
+	public void expressionsInProjectionExample() {
+
+		Product product = new Product("P1", "A", 1.99, 3, 0.05, 0.19);
+		mongoTemplate.insert(product);
+
+		TypedAggregation<Product> agg = newAggregation(Product.class, //
+				project("name", "netPrice") //
+						.andExpression("netPrice + 1").as("netPricePlus1") //
+						.andExpression("netPrice - 1").as("netPriceMinus1") //
+						.andExpression("netPrice / 2").as("netPriceDiv2") //
+						.andExpression("netPrice * 1.19").as("grossPrice") //
+						.andExpression("spaceUnits % 2").as("spaceUnitsMod2") //
+						.andExpression("(netPrice * 0.8  + 1.2) * 1.19").as("grossPriceIncludingDiscountAndCharge") //
+
+		);
+
+		AggregationResults<DBObject> result = mongoTemplate.aggregate(agg, DBObject.class);
+		List<DBObject> resultList = result.getMappedResults();
+
+		assertThat(resultList, is(notNullValue()));
+		assertThat((String) resultList.get(0).get("_id"), is(product.id));
+		assertThat((String) resultList.get(0).get("name"), is(product.name));
+		assertThat((Double) resultList.get(0).get("netPricePlus1"), is(product.netPrice + 1));
+		assertThat((Double) resultList.get(0).get("netPriceMinus1"), is(product.netPrice - 1));
+		assertThat((Double) resultList.get(0).get("netPriceDiv2"), is(product.netPrice / 2));
+		assertThat((Double) resultList.get(0).get("grossPrice"), is(product.netPrice * 1.19));
+		assertThat((Integer) resultList.get(0).get("spaceUnitsMod2"), is(product.spaceUnits % 2));
+		assertThat((Double) resultList.get(0).get("grossPriceIncludingDiscountAndCharge"),
+				is((product.netPrice * 0.8 + 1.2) * 1.19));
+	}
+
+	/**
+	 * @see DATAMONGO-774
+	 */
+	@Test
+	public void stringExpressionsInProjectionExample() {
+
+		assumeTrue(mongoVersion.isGreaterThanOrEqualTo(TWO_DOT_FOUR));
+
+		Product product = new Product("P1", "A", 1.99, 3, 0.05, 0.19);
+		mongoTemplate.insert(product);
+
+		TypedAggregation<Product> agg = newAggregation(Product.class, //
+				project("name", "netPrice") //
+						.andExpression("concat(name, '_bubu')").as("name_bubu") //
+		);
+
+		AggregationResults<DBObject> result = mongoTemplate.aggregate(agg, DBObject.class);
+		List<DBObject> resultList = result.getMappedResults();
+
+		assertThat(resultList, is(notNullValue()));
+		assertThat((String) resultList.get(0).get("_id"), is(product.id));
+		assertThat((String) resultList.get(0).get("name"), is(product.name));
+		assertThat((String) resultList.get(0).get("name_bubu"), is(product.name + "_bubu"));
+	}
+
+	/**
+	 * @see DATAMONGO-774
+	 */
+	@Test
+	public void expressionsInProjectionExampleShowcase() {
+
+		Product product = new Product("P1", "A", 1.99, 3, 0.05, 0.19);
+		mongoTemplate.insert(product);
+
+		double shippingCosts = 1.2;
+
+		TypedAggregation<Product> agg = newAggregation(Product.class, //
+				project("name", "netPrice") //
+						.andExpression("(netPrice * (1-discountRate)  + [0]) * (1+taxRate)", shippingCosts).as("salesPrice") //
+		);
+
+		AggregationResults<DBObject> result = mongoTemplate.aggregate(agg, DBObject.class);
+		List<DBObject> resultList = result.getMappedResults();
+
+		assertThat(resultList, is(notNullValue()));
+		DBObject firstItem = resultList.get(0);
+		assertThat((String) firstItem.get("_id"), is(product.id));
+		assertThat((String) firstItem.get("name"), is(product.name));
+		assertThat((Double) firstItem.get("salesPrice"), is((product.netPrice * (1 - product.discountRate) + shippingCosts)
+				* (1 + product.taxRate)));
+	}
+
+	@Test
+	public void shouldThrowExceptionIfUnknownFieldIsReferencedInArithmenticExpressionsInProjection() {
+
+		exception.expect(MappingException.class);
+		exception.expectMessage("unknown");
+
+		Product product = new Product("P1", "A", 1.99, 3, 0.05, 0.19);
+		mongoTemplate.insert(product);
+
+		TypedAggregation<Product> agg = newAggregation(Product.class, //
+				project("name", "netPrice") //
+						.andExpression("unknown + 1").as("netPricePlus1") //
+		);
+
+		mongoTemplate.aggregate(agg, DBObject.class);
+	}
+
+	/**
+	 * @see DATAMONGO-753
+	 * @see http 
+	 *      ://stackoverflow.com/questions/18653574/spring-data-mongodb-aggregation-framework-invalid-reference-in-group
+	 *      -operati
+	 */
+	@Test
+	public void allowsNestedFieldReferencesAsGroupIdsInGroupExpressions() {
+
+		mongoTemplate.insert(new DATAMONGO753().withPDs(new PD("A", 1), new PD("B", 1), new PD("C", 1)));
+		mongoTemplate.insert(new DATAMONGO753().withPDs(new PD("B", 1), new PD("B", 1), new PD("C", 1)));
+
+		TypedAggregation<DATAMONGO753> agg = newAggregation(DATAMONGO753.class, //
+				unwind("pd"), //
+				group("pd.pDch") // the nested field expression
+						.sum("pd.up").as("uplift"), //
+				project("_id", "uplift"));
+
+		AggregationResults<DBObject> result = mongoTemplate.aggregate(agg, DBObject.class);
+		List<DBObject> stats = result.getMappedResults();
+
+		assertThat(stats.size(), is(3));
+		assertThat(stats.get(0).get("_id").toString(), is("C"));
+		assertThat((Integer) stats.get(0).get("uplift"), is(2));
+		assertThat(stats.get(1).get("_id").toString(), is("B"));
+		assertThat((Integer) stats.get(1).get("uplift"), is(3));
+		assertThat(stats.get(2).get("_id").toString(), is("A"));
+		assertThat((Integer) stats.get(2).get("uplift"), is(1));
+	}
+
+	/**
+	 * @see DATAMONGO-753
+	 * @see http 
+	 *      ://stackoverflow.com/questions/18653574/spring-data-mongodb-aggregation-framework-invalid-reference-in-group
+	 *      -operati
+	 */
+	@Test
+	public void aliasesNestedFieldInProjectionImmediately() {
+
+		mongoTemplate.insert(new DATAMONGO753().withPDs(new PD("A", 1), new PD("B", 1), new PD("C", 1)));
+		mongoTemplate.insert(new DATAMONGO753().withPDs(new PD("B", 1), new PD("B", 1), new PD("C", 1)));
+
+		TypedAggregation<DATAMONGO753> agg = newAggregation(DATAMONGO753.class, //
+				unwind("pd"), //
+				project().and("pd.up").as("up"));
+
+		AggregationResults<DBObject> results = mongoTemplate.aggregate(agg, DBObject.class);
+		List<DBObject> mappedResults = results.getMappedResults();
+
+		assertThat(mappedResults, hasSize(6));
+		for (DBObject element : mappedResults) {
+			assertThat(element.get("up"), is((Object) 1));
+		}
+	}
+
+	/**
+	 * @DATAMONGO-774
+	 */
+	@Test
+	public void shouldPerformDateProjectionOperatorsCorrectly() throws ParseException {
+
+		assumeTrue(mongoVersion.isGreaterThanOrEqualTo(TWO_DOT_FOUR));
+
+		Data data = new Data();
+		data.stringValue = "ABC";
+		mongoTemplate.insert(data);
+
+		TypedAggregation<Data> agg = newAggregation(Data.class, project() //
+				.andExpression("concat(stringValue, 'DE')").as("concat") //
+				.andExpression("strcasecmp(stringValue,'XYZ')").as("strcasecmp") //
+				.andExpression("substr(stringValue,1,1)").as("substr") //
+				.andExpression("toLower(stringValue)").as("toLower") //
+				.andExpression("toUpper(toLower(stringValue))").as("toUpper") //
+		);
+
+		AggregationResults<DBObject> results = mongoTemplate.aggregate(agg, DBObject.class);
+		DBObject dbo = results.getUniqueMappedResult();
+
+		assertThat(dbo, is(notNullValue()));
+		assertThat((String) dbo.get("concat"), is("ABCDE"));
+		assertThat((Integer) dbo.get("strcasecmp"), is(-1));
+		assertThat((String) dbo.get("substr"), is("B"));
+		assertThat((String) dbo.get("toLower"), is("abc"));
+		assertThat((String) dbo.get("toUpper"), is("ABC"));
+	}
+
+	/**
+	 * @DATAMONGO-774
+	 */
+	@Test
+	public void shouldPerformStringProjectionOperatorsCorrectly() throws ParseException {
+
+		assumeTrue(mongoVersion.isGreaterThanOrEqualTo(TWO_DOT_FOUR));
+
+		Data data = new Data();
+		data.dateValue = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss.SSSZ").parse("29.08.1983 12:34:56.789+0000");
+		mongoTemplate.insert(data);
+
+		TypedAggregation<Data> agg = newAggregation(Data.class, project() //
+				.andExpression("dayOfYear(dateValue)").as("dayOfYear") //
+				.andExpression("dayOfMonth(dateValue)").as("dayOfMonth") //
+				.andExpression("dayOfWeek(dateValue)").as("dayOfWeek") //
+				.andExpression("year(dateValue)").as("year") //
+				.andExpression("month(dateValue)").as("month") //
+				.andExpression("week(dateValue)").as("week") //
+				.andExpression("hour(dateValue)").as("hour") //
+				.andExpression("minute(dateValue)").as("minute") //
+				.andExpression("second(dateValue)").as("second") //
+				.andExpression("millisecond(dateValue)").as("millisecond") //
+		);
+
+		AggregationResults<DBObject> results = mongoTemplate.aggregate(agg, DBObject.class);
+		DBObject dbo = results.getUniqueMappedResult();
+
+		assertThat(dbo, is(notNullValue()));
+		assertThat((Integer) dbo.get("dayOfYear"), is(241));
+		assertThat((Integer) dbo.get("dayOfMonth"), is(29));
+		assertThat((Integer) dbo.get("dayOfWeek"), is(2));
+		assertThat((Integer) dbo.get("year"), is(1983));
+		assertThat((Integer) dbo.get("month"), is(8));
+		assertThat((Integer) dbo.get("week"), is(35));
+		assertThat((Integer) dbo.get("hour"), is(12));
+		assertThat((Integer) dbo.get("minute"), is(34));
+		assertThat((Integer) dbo.get("second"), is(56));
+		assertThat((Integer) dbo.get("millisecond"), is(789));
+	}
+
+	/**
+	 * @see DATAMONGO-788
+	 */
+	@Test
+	public void referencesToGroupIdsShouldBeRenderedProperly() {
+
+		mongoTemplate.insert(new DATAMONGO788(1, 1));
+		mongoTemplate.insert(new DATAMONGO788(1, 1));
+		mongoTemplate.insert(new DATAMONGO788(1, 1));
+		mongoTemplate.insert(new DATAMONGO788(2, 1));
+		mongoTemplate.insert(new DATAMONGO788(2, 1));
+
+		AggregationOperation projectFirst = Aggregation.project("x", "y").and("xField").as("x").and("yField").as("y");
+		AggregationOperation group = Aggregation.group("x", "y").count().as("xPerY");
+		AggregationOperation project = Aggregation.project("xPerY", "x", "y").andExclude("_id");
+
+		TypedAggregation<DATAMONGO788> aggregation = Aggregation.newAggregation(DATAMONGO788.class, projectFirst, group,
+				project);
+		AggregationResults<DBObject> aggResults = mongoTemplate.aggregate(aggregation, DBObject.class);
+		List<DBObject> items = aggResults.getMappedResults();
+
+		assertThat(items.size(), is(2));
+		assertThat((Integer) items.get(0).get("xPerY"), is(2));
+		assertThat((Integer) items.get(0).get("x"), is(2));
+		assertThat((Integer) items.get(0).get("y"), is(1));
+		assertThat((Integer) items.get(1).get("xPerY"), is(3));
+		assertThat((Integer) items.get(1).get("x"), is(1));
+		assertThat((Integer) items.get(1).get("y"), is(1));
 	}
 
 	private void assertLikeStats(LikeStats like, String id, long count) {
@@ -502,4 +791,40 @@ public class AggregationTests {
 		assertThat(tagCount.getN(), is(n));
 	}
 
+	static class DATAMONGO753 {
+		PD[] pd;
+
+		DATAMONGO753 withPDs(PD... pds) {
+			this.pd = pds;
+			return this;
+		}
+	}
+
+	static class PD {
+		String pDch;
+		@org.springframework.data.mongodb.core.mapping.Field("alias") int up;
+
+		public PD(String pDch, int up) {
+			this.pDch = pDch;
+			this.up = up;
+		}
+	}
+
+	static class DATAMONGO788 {
+
+		int x;
+		int y;
+		int xField;
+		int yField;
+
+		public DATAMONGO788() {}
+
+		public DATAMONGO788(int x, int y) {
+			this.x = x;
+			this.xField = x;
+			this.y = y;
+			this.yField = y;
+		}
+	}
+
 }

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationUnitTests.java

@@ -15,32 +15,150 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+import static org.springframework.data.mongodb.core.DBObjectTestUtils.*;
+import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
+import static org.springframework.data.mongodb.core.query.Criteria.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import com.mongodb.DBObject;
 
 /**
  * Unit tests for {@link Aggregation}.
  * 
  * @author Oliver Gierke
+ * @author Thomas Darimont
  */
 public class AggregationUnitTests {
 
+	public @Rule ExpectedException exception = ExpectedException.none();
+
 	@Test(expected = IllegalArgumentException.class)
 	public void rejectsNullAggregationOperation() {
-		Aggregation.newAggregation((AggregationOperation[]) null);
+		newAggregation((AggregationOperation[]) null);
 	}
 
 	@Test(expected = IllegalArgumentException.class)
 	public void rejectsNullTypedAggregationOperation() {
-		Aggregation.newAggregation(String.class, (AggregationOperation[]) null);
+		newAggregation(String.class, (AggregationOperation[]) null);
 	}
 
 	@Test(expected = IllegalArgumentException.class)
 	public void rejectsNoAggregationOperation() {
-		Aggregation.newAggregation(new AggregationOperation[0]);
+		newAggregation(new AggregationOperation[0]);
 	}
 
 	@Test(expected = IllegalArgumentException.class)
 	public void rejectsNoTypedAggregationOperation() {
-		Aggregation.newAggregation(String.class, new AggregationOperation[0]);
+		newAggregation(String.class, new AggregationOperation[0]);
+	}
+
+	/**
+	 * @see DATAMONGO-753
+	 */
+	@Test
+	public void checkForCorrectFieldScopeTransfer() {
+
+		exception.expect(IllegalArgumentException.class);
+		exception.expectMessage("Invalid reference");
+		exception.expectMessage("'b'");
+
+		newAggregation( //
+				project("a", "b"), //
+				group("a").count().as("cnt"), // a was introduced to the context by the project operation
+				project("cnt", "b") // b was removed from the context by the group operation
+		).toDbObject("foo", Aggregation.DEFAULT_CONTEXT); // -> triggers IllegalArgumentException
+	}
+
+	/**
+	 * @see DATAMONGO-753
+	 */
+	@Test
+	public void unwindOperationShouldNotChangeAvailableFields() {
+
+		newAggregation( //
+				project("a", "b"), //
+				unwind("a"), //
+				project("a", "b") // b should still be available
+		).toDbObject("foo", Aggregation.DEFAULT_CONTEXT);
+	}
+
+	/**
+	 * @see DATAMONGO-753
+	 */
+	@Test
+	public void matchOperationShouldNotChangeAvailableFields() {
+
+		newAggregation( //
+				project("a", "b"), //
+				match(where("a").gte(1)), //
+				project("a", "b") // b should still be available
+		).toDbObject("foo", Aggregation.DEFAULT_CONTEXT);
+	}
+
+	/**
+	 * @see DATAMONGO-788
+	 */
+	@Test
+	public void referencesToGroupIdsShouldBeRenderedAsReferences() {
+
+		DBObject agg = newAggregation( //
+				project("a"), //
+				group("a").count().as("aCnt"), //
+				project("aCnt", "a") //
+		).toDbObject("foo", Aggregation.DEFAULT_CONTEXT);
+
+		@SuppressWarnings("unchecked")
+		DBObject secondProjection = ((List<DBObject>) agg.get("pipeline")).get(2);
+		DBObject fields = getAsDBObject(secondProjection, "$project");
+		assertThat(fields.get("aCnt"), is((Object) 1));
+		assertThat(fields.get("a"), is((Object) "$_id.a"));
+	}
+
+	/**
+	 * @see DATAMONGO-791
+	 */
+	@Test
+	public void allowAggregationOperationsToBePassedAsIterable() {
+
+		List<AggregationOperation> ops = new ArrayList<AggregationOperation>();
+		ops.add(project("a"));
+		ops.add(group("a").count().as("aCnt"));
+		ops.add(project("aCnt", "a"));
+
+		DBObject agg = newAggregation(ops).toDbObject("foo", Aggregation.DEFAULT_CONTEXT);
+
+		@SuppressWarnings("unchecked")
+		DBObject secondProjection = ((List<DBObject>) agg.get("pipeline")).get(2);
+		DBObject fields = getAsDBObject(secondProjection, "$project");
+		assertThat(fields.get("aCnt"), is((Object) 1));
+		assertThat(fields.get("a"), is((Object) "$_id.a"));
+	}
+
+	/**
+	 * @see DATAMONGO-791
+	 */
+	@Test
+	public void allowTypedAggregationOperationsToBePassedAsIterable() {
+
+		List<AggregationOperation> ops = new ArrayList<AggregationOperation>();
+		ops.add(project("a"));
+		ops.add(group("a").count().as("aCnt"));
+		ops.add(project("aCnt", "a"));
+
+		DBObject agg = newAggregation(DBObject.class, ops).toDbObject("foo", Aggregation.DEFAULT_CONTEXT);
+
+		@SuppressWarnings("unchecked")
+		DBObject secondProjection = ((List<DBObject>) agg.get("pipeline")).get(2);
+		DBObject fields = getAsDBObject(secondProjection, "$project");
+		assertThat(fields.get("aCnt"), is((Object) 1));
+		assertThat(fields.get("a"), is((Object) "$_id.a"));
 	}
 }

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/Data.java

@@ -0,0 +1,31 @@
+/*
+ * 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.Date;
+
+/**
+ * @author Thomas Darimont
+ */
+class Data {
+	public long primitiveLongValue;
+	public double primitiveDoubleValue;
+	public Double doubleValue;
+	public Date dateValue;
+	public String stringValue;
+
+	public DataItem item;
+}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/DataItem.java

@@ -0,0 +1,23 @@
+/*
+ * 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;
+
+/**
+ * @author Thomas Darimont
+ */
+class DataItem {
+	int primitiveIntValue;
+}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ExposedFieldsUnitTests.java

@@ -25,6 +25,7 @@ import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedFi
  * Unit tests for {@link ExposedFields}.
  * 
  * @author Oliver Gierke
+ * @author Thomas Darimont
  */
 public class ExposedFieldsUnitTests {
 

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/FieldsUnitTests.java

@@ -106,6 +106,34 @@ public class FieldsUnitTests {
 		fields("b", "a.b");
 	}
 
+	/**
+	 * @see DATAMONGO-774
+	 */
+	@Test
+	public void stripsLeadingDollarsFromName() {
+
+		assertThat(Fields.field("$name").getName(), is("name"));
+		assertThat(Fields.field("$$$$name").getName(), is("name"));
+	}
+
+	/**
+	 * @see DATAMONGO-774
+	 */
+	@Test(expected = IllegalArgumentException.class)
+	public void rejectsNameConsistingOfDollarOnly() {
+		Fields.field("$");
+	}
+
+	/**
+	 * @see DATAMONGO-774
+	 */
+	@Test
+	public void stripsLeadingDollarsFromTarget() {
+
+		assertThat(Fields.field("$target").getTarget(), is("target"));
+		assertThat(Fields.field("$$$$target").getTarget(), is("target"));
+	}
+
 	private static void verify(Field field, String name, String target) {
 
 		assertThat(field, is(notNullValue()));

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/GeoNearOperationUnitTests.java

@@ -19,7 +19,7 @@ import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.springframework.data.mongodb.core.DBObjectUtils;
+import org.springframework.data.mongodb.core.DBObjectTestUtils;
 import org.springframework.data.mongodb.core.query.NearQuery;
 
 import com.mongodb.DBObject;
@@ -38,7 +38,7 @@ public class GeoNearOperationUnitTests {
 		GeoNearOperation operation = new GeoNearOperation(query);
 		DBObject dbObject = operation.toDBObject(Aggregation.DEFAULT_CONTEXT);
 
-		DBObject nearClause = DBObjectUtils.getAsDBObject(dbObject, "$geoNear");
+		DBObject nearClause = DBObjectTestUtils.getAsDBObject(dbObject, "$geoNear");
 		assertThat(nearClause, is(query.toDBObject()));
 	}
 }

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/GroupOperationUnitTests.java

@@ -20,7 +20,7 @@ import static org.junit.Assert.*;
 import static org.springframework.data.mongodb.core.aggregation.Fields.*;
 
 import org.junit.Test;
-import org.springframework.data.mongodb.core.DBObjectUtils;
+import org.springframework.data.mongodb.core.DBObjectTestUtils;
 
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
@@ -37,6 +37,38 @@ public class GroupOperationUnitTests {
 		new GroupOperation((Fields) null);
 	}
 
+	/**
+	 * @see DATAMONGO-759
+	 */
+	@Test
+	public void groupOperationWithNoGroupIdFieldsShouldGenerateNullAsGroupId() {
+
+		GroupOperation operation = new GroupOperation(Fields.from());
+		ExposedFields fields = operation.getFields();
+		DBObject groupClause = extractDbObjectFromGroupOperation(operation);
+
+		assertThat(fields.exposesSingleFieldOnly(), is(true));
+		assertThat(fields.exposesNoFields(), is(false));
+		assertThat(groupClause.get(UNDERSCORE_ID), is(nullValue()));
+	}
+
+	/**
+	 * @see DATAMONGO-759
+	 */
+	@Test
+	public void groupOperationWithNoGroupIdFieldsButAdditionalFieldsShouldGenerateNullAsGroupId() {
+
+		GroupOperation operation = new GroupOperation(Fields.from()).count().as("cnt").last("foo").as("foo");
+		ExposedFields fields = operation.getFields();
+		DBObject groupClause = extractDbObjectFromGroupOperation(operation);
+
+		assertThat(fields.exposesSingleFieldOnly(), is(false));
+		assertThat(fields.exposesNoFields(), is(false));
+		assertThat(groupClause.get(UNDERSCORE_ID), is(nullValue()));
+		assertThat((BasicDBObject) groupClause.get("cnt"), is(new BasicDBObject("$sum", 1)));
+		assertThat((BasicDBObject) groupClause.get("foo"), is(new BasicDBObject("$last", "$foo")));
+	}
+
 	@Test
 	public void createsGroupOperationWithSingleField() {
 
@@ -53,7 +85,7 @@ public class GroupOperationUnitTests {
 		GroupOperation operation = new GroupOperation(fields("a").and("b", "c"));
 
 		DBObject groupClause = extractDbObjectFromGroupOperation(operation);
-		DBObject idClause = DBObjectUtils.getAsDBObject(groupClause, UNDERSCORE_ID);
+		DBObject idClause = DBObjectTestUtils.getAsDBObject(groupClause, UNDERSCORE_ID);
 
 		assertThat(idClause.get("a"), is((Object) "$a"));
 		assertThat(idClause.get("b"), is((Object) "$c"));
@@ -66,7 +98,7 @@ public class GroupOperationUnitTests {
 				.sum("e").as("e");
 
 		DBObject groupClause = extractDbObjectFromGroupOperation(groupOperation);
-		DBObject eOp = DBObjectUtils.getAsDBObject(groupClause, "e");
+		DBObject eOp = DBObjectTestUtils.getAsDBObject(groupClause, "e");
 		assertThat(eOp, is((DBObject) new BasicDBObject("$sum", "$e")));
 	}
 
@@ -77,7 +109,7 @@ public class GroupOperationUnitTests {
 				.sum("e").as("ee");
 
 		DBObject groupClause = extractDbObjectFromGroupOperation(groupOperation);
-		DBObject eOp = DBObjectUtils.getAsDBObject(groupClause, "ee");
+		DBObject eOp = DBObjectTestUtils.getAsDBObject(groupClause, "ee");
 		assertThat(eOp, is((DBObject) new BasicDBObject("$sum", "$e")));
 	}
 
@@ -88,7 +120,7 @@ public class GroupOperationUnitTests {
 				.count().as("count");
 
 		DBObject groupClause = extractDbObjectFromGroupOperation(groupOperation);
-		DBObject eOp = DBObjectUtils.getAsDBObject(groupClause, "count");
+		DBObject eOp = DBObjectTestUtils.getAsDBObject(groupClause, "count");
 		assertThat(eOp, is((DBObject) new BasicDBObject("$sum", 1)));
 	}
 
@@ -100,10 +132,10 @@ public class GroupOperationUnitTests {
 				.min("e").as("min"); //
 
 		DBObject groupClause = extractDbObjectFromGroupOperation(groupOperation);
-		DBObject sum = DBObjectUtils.getAsDBObject(groupClause, "sum");
+		DBObject sum = DBObjectTestUtils.getAsDBObject(groupClause, "sum");
 		assertThat(sum, is((DBObject) new BasicDBObject("$sum", "$e")));
 
-		DBObject min = DBObjectUtils.getAsDBObject(groupClause, "min");
+		DBObject min = DBObjectTestUtils.getAsDBObject(groupClause, "min");
 		assertThat(min, is((DBObject) new BasicDBObject("$min", "$e")));
 	}
 
@@ -113,7 +145,7 @@ public class GroupOperationUnitTests {
 		GroupOperation groupOperation = Aggregation.group("a", "b").push(1).as("x");
 
 		DBObject groupClause = extractDbObjectFromGroupOperation(groupOperation);
-		DBObject push = DBObjectUtils.getAsDBObject(groupClause, "x");
+		DBObject push = DBObjectTestUtils.getAsDBObject(groupClause, "x");
 
 		assertThat(push, is((DBObject) new BasicDBObject("$push", 1)));
 	}
@@ -124,7 +156,7 @@ public class GroupOperationUnitTests {
 		GroupOperation groupOperation = Aggregation.group("a", "b").push("ref").as("x");
 
 		DBObject groupClause = extractDbObjectFromGroupOperation(groupOperation);
-		DBObject push = DBObjectUtils.getAsDBObject(groupClause, "x");
+		DBObject push = DBObjectTestUtils.getAsDBObject(groupClause, "x");
 
 		assertThat(push, is((DBObject) new BasicDBObject("$push", "$ref")));
 	}
@@ -135,7 +167,7 @@ public class GroupOperationUnitTests {
 		GroupOperation groupOperation = Aggregation.group("a", "b").addToSet("ref").as("x");
 
 		DBObject groupClause = extractDbObjectFromGroupOperation(groupOperation);
-		DBObject push = DBObjectUtils.getAsDBObject(groupClause, "x");
+		DBObject push = DBObjectTestUtils.getAsDBObject(groupClause, "x");
 
 		assertThat(push, is((DBObject) new BasicDBObject("$addToSet", "$ref")));
 	}
@@ -146,14 +178,14 @@ public class GroupOperationUnitTests {
 		GroupOperation groupOperation = Aggregation.group("a", "b").addToSet(42).as("x");
 
 		DBObject groupClause = extractDbObjectFromGroupOperation(groupOperation);
-		DBObject push = DBObjectUtils.getAsDBObject(groupClause, "x");
+		DBObject push = DBObjectTestUtils.getAsDBObject(groupClause, "x");
 
 		assertThat(push, is((DBObject) new BasicDBObject("$addToSet", 42)));
 	}
 
 	private DBObject extractDbObjectFromGroupOperation(GroupOperation groupOperation) {
 		DBObject dbObject = groupOperation.toDBObject(Aggregation.DEFAULT_CONTEXT);
-		DBObject groupClause = DBObjectUtils.getAsDBObject(dbObject, "$group");
+		DBObject groupClause = DBObjectTestUtils.getAsDBObject(dbObject, "$group");
 		return groupClause;
 	}
 }

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ProjectionOperationUnitTests.java

@@ -17,20 +17,23 @@ package org.springframework.data.mongodb.core.aggregation;
 
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
+import static org.springframework.data.mongodb.util.DBObjectUtils.*;
 
 import java.util.Arrays;
 
 import org.junit.Test;
-import org.springframework.data.mongodb.core.DBObjectUtils;
+import org.springframework.data.mongodb.core.DBObjectTestUtils;
 import org.springframework.data.mongodb.core.aggregation.ProjectionOperation.ProjectionOperationBuilder;
 
 import com.mongodb.BasicDBList;
+import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
 
 /**
  * Unit tests for {@link ProjectionOperation}.
  * 
  * @author Oliver Gierke
+ * @author Thomas Darimont
  */
 public class ProjectionOperationUnitTests {
 
@@ -53,7 +56,7 @@ public class ProjectionOperationUnitTests {
 		operation = operation.and("prop").previousOperation();
 
 		DBObject dbObject = operation.toDBObject(Aggregation.DEFAULT_CONTEXT);
-		DBObject projectClause = DBObjectUtils.getAsDBObject(dbObject, PROJECT);
+		DBObject projectClause = DBObjectTestUtils.getAsDBObject(dbObject, PROJECT);
 		assertThat(projectClause.get("prop"), is((Object) Fields.UNDERSCORE_ID_REF));
 	}
 
@@ -63,9 +66,9 @@ public class ProjectionOperationUnitTests {
 		ProjectionOperation operation = new ProjectionOperation(Fields.fields("foo").and("bar", "foobar"));
 
 		DBObject dbObject = operation.toDBObject(Aggregation.DEFAULT_CONTEXT);
-		DBObject projectClause = DBObjectUtils.getAsDBObject(dbObject, PROJECT);
+		DBObject projectClause = DBObjectTestUtils.getAsDBObject(dbObject, PROJECT);
 
-		assertThat(projectClause.get("foo"), is((Object) "$foo"));
+		assertThat(projectClause.get("foo"), is((Object) 1));
 		assertThat(projectClause.get("bar"), is((Object) "$foobar"));
 	}
 
@@ -75,7 +78,7 @@ public class ProjectionOperationUnitTests {
 		ProjectionOperation operation = new ProjectionOperation();
 
 		DBObject dbObject = operation.and("foo").as("bar").toDBObject(Aggregation.DEFAULT_CONTEXT);
-		DBObject projectClause = DBObjectUtils.getAsDBObject(dbObject, PROJECT);
+		DBObject projectClause = DBObjectTestUtils.getAsDBObject(dbObject, PROJECT);
 
 		assertThat(projectClause.get("bar"), is((Object) "$foo"));
 	}
@@ -86,9 +89,9 @@ public class ProjectionOperationUnitTests {
 		ProjectionOperation operation = new ProjectionOperation();
 
 		DBObject dbObject = operation.and("foo").plus(41).as("bar").toDBObject(Aggregation.DEFAULT_CONTEXT);
-		DBObject projectClause = DBObjectUtils.getAsDBObject(dbObject, PROJECT);
-		DBObject barClause = DBObjectUtils.getAsDBObject(projectClause, "bar");
-		BasicDBList addClause = DBObjectUtils.getAsDBList(barClause, "$add");
+		DBObject projectClause = DBObjectTestUtils.getAsDBObject(dbObject, PROJECT);
+		DBObject barClause = DBObjectTestUtils.getAsDBObject(projectClause, "bar");
+		BasicDBList addClause = DBObjectTestUtils.getAsDBList(barClause, "$add");
 
 		assertThat(addClause, hasSize(2));
 		assertThat(addClause.get(0), is((Object) "$foo"));
@@ -100,7 +103,7 @@ public class ProjectionOperationUnitTests {
 		String fieldName = "a";
 		ProjectionOperationBuilder operation = new ProjectionOperation().and(fieldName).plus(1);
 		DBObject dbObject = operation.toDBObject(Aggregation.DEFAULT_CONTEXT);
-		DBObject projectClause = DBObjectUtils.getAsDBObject(dbObject, PROJECT);
+		DBObject projectClause = DBObjectTestUtils.getAsDBObject(dbObject, PROJECT);
 		DBObject oper = exctractOperation(fieldName, projectClause);
 
 		assertThat(oper.containsField(ADD), is(true));
@@ -114,7 +117,7 @@ public class ProjectionOperationUnitTests {
 		String fieldAlias = "b";
 		ProjectionOperation operation = new ProjectionOperation().and(fieldName).plus(1).as(fieldAlias);
 		DBObject dbObject = operation.toDBObject(Aggregation.DEFAULT_CONTEXT);
-		DBObject projectClause = DBObjectUtils.getAsDBObject(dbObject, PROJECT);
+		DBObject projectClause = DBObjectTestUtils.getAsDBObject(dbObject, PROJECT);
 
 		DBObject oper = exctractOperation(fieldAlias, projectClause);
 		assertThat(oper.containsField(ADD), is(true));
@@ -128,7 +131,7 @@ public class ProjectionOperationUnitTests {
 		String fieldAlias = "b";
 		ProjectionOperation operation = new ProjectionOperation().and(fieldName).minus(1).as(fieldAlias);
 		DBObject dbObject = operation.toDBObject(Aggregation.DEFAULT_CONTEXT);
-		DBObject projectClause = DBObjectUtils.getAsDBObject(dbObject, PROJECT);
+		DBObject projectClause = DBObjectTestUtils.getAsDBObject(dbObject, PROJECT);
 		DBObject oper = exctractOperation(fieldAlias, projectClause);
 
 		assertThat(oper.containsField(SUBTRACT), is(true));
@@ -142,7 +145,7 @@ public class ProjectionOperationUnitTests {
 		String fieldAlias = "b";
 		ProjectionOperation operation = new ProjectionOperation().and(fieldName).multiply(1).as(fieldAlias);
 		DBObject dbObject = operation.toDBObject(Aggregation.DEFAULT_CONTEXT);
-		DBObject projectClause = DBObjectUtils.getAsDBObject(dbObject, PROJECT);
+		DBObject projectClause = DBObjectTestUtils.getAsDBObject(dbObject, PROJECT);
 		DBObject oper = exctractOperation(fieldAlias, projectClause);
 
 		assertThat(oper.containsField(MULTIPLY), is(true));
@@ -156,7 +159,7 @@ public class ProjectionOperationUnitTests {
 		String fieldAlias = "b";
 		ProjectionOperation operation = new ProjectionOperation().and(fieldName).divide(1).as(fieldAlias);
 		DBObject dbObject = operation.toDBObject(Aggregation.DEFAULT_CONTEXT);
-		DBObject projectClause = DBObjectUtils.getAsDBObject(dbObject, PROJECT);
+		DBObject projectClause = DBObjectTestUtils.getAsDBObject(dbObject, PROJECT);
 		DBObject oper = exctractOperation(fieldAlias, projectClause);
 
 		assertThat(oper.containsField(DIVIDE), is(true));
@@ -176,19 +179,103 @@ public class ProjectionOperationUnitTests {
 		String fieldAlias = "b";
 		ProjectionOperation operation = new ProjectionOperation().and(fieldName).mod(3).as(fieldAlias);
 		DBObject dbObject = operation.toDBObject(Aggregation.DEFAULT_CONTEXT);
-		DBObject projectClause = DBObjectUtils.getAsDBObject(dbObject, PROJECT);
+		DBObject projectClause = DBObjectTestUtils.getAsDBObject(dbObject, PROJECT);
 		DBObject oper = exctractOperation(fieldAlias, projectClause);
 
 		assertThat(oper.containsField(MOD), is(true));
 		assertThat(oper.get(MOD), is((Object) Arrays.<Object> asList("$a", 3)));
 	}
 
+	/**
+	 * @see DATAMONGO-758
+	 */
+	@Test(expected = IllegalArgumentException.class)
+	public void excludeShouldThrowExceptionForFieldsOtherThanUnderscoreId() {
+
+		new ProjectionOperation().andExclude("foo");
+	}
+
+	/**
+	 * @see DATAMONGO-758
+	 */
+	@Test
+	public void excludeShouldAllowExclusionOfUnderscoreId() {
+
+		ProjectionOperation projectionOp = new ProjectionOperation().andExclude(Fields.UNDERSCORE_ID);
+		DBObject dbObject = projectionOp.toDBObject(Aggregation.DEFAULT_CONTEXT);
+		DBObject projectClause = DBObjectTestUtils.getAsDBObject(dbObject, PROJECT);
+		assertThat((Integer) projectClause.get(Fields.UNDERSCORE_ID), is(0));
+	}
+
+	/**
+	 * @see DATAMONGO-757
+	 */
+	@Test
+	public void usesImplictAndExplicitFieldAliasAndIncludeExclude() {
+
+		ProjectionOperation operation = Aggregation.project("foo").and("foobar").as("bar").andInclude("inc1", "inc2")
+				.andExclude("_id");
+
+		DBObject dbObject = operation.toDBObject(Aggregation.DEFAULT_CONTEXT);
+		DBObject projectClause = DBObjectTestUtils.getAsDBObject(dbObject, PROJECT);
+
+		assertThat(projectClause.get("foo"), is((Object) 1)); // implicit
+		assertThat(projectClause.get("bar"), is((Object) "$foobar")); // explicit
+		assertThat(projectClause.get("inc1"), is((Object) 1)); // include shortcut
+		assertThat(projectClause.get("inc2"), is((Object) 1));
+		assertThat(projectClause.get("_id"), is((Object) 0));
+	}
+
 	@Test(expected = IllegalArgumentException.class)
 	public void arithmenticProjectionOperationModByZeroException() {
 
 		new ProjectionOperation().and("a").mod(0);
 	}
 
+	/**
+	 * @see DATAMONGO-769
+	 */
+	@Test
+	public void allowArithmeticOperationsWithFieldReferences() {
+
+		ProjectionOperation operation = Aggregation.project() //
+				.and("foo").plus("bar").as("fooPlusBar") //
+				.and("foo").minus("bar").as("fooMinusBar") //
+				.and("foo").multiply("bar").as("fooMultiplyBar") //
+				.and("foo").divide("bar").as("fooDivideBar") //
+				.and("foo").mod("bar").as("fooModBar");
+
+		DBObject dbObject = operation.toDBObject(Aggregation.DEFAULT_CONTEXT);
+		DBObject projectClause = DBObjectTestUtils.getAsDBObject(dbObject, PROJECT);
+
+		assertThat((BasicDBObject) projectClause.get("fooPlusBar"), //
+				is(new BasicDBObject("$add", dbList("$foo", "$bar"))));
+		assertThat((BasicDBObject) projectClause.get("fooMinusBar"), //
+				is(new BasicDBObject("$subtract", dbList("$foo", "$bar"))));
+		assertThat((BasicDBObject) projectClause.get("fooMultiplyBar"), //
+				is(new BasicDBObject("$multiply", dbList("$foo", "$bar"))));
+		assertThat((BasicDBObject) projectClause.get("fooDivideBar"), //
+				is(new BasicDBObject("$divide", dbList("$foo", "$bar"))));
+		assertThat((BasicDBObject) projectClause.get("fooModBar"), //
+				is(new BasicDBObject("$mod", dbList("$foo", "$bar"))));
+	}
+
+	/**
+	 * @see DATAMONGO-774
+	 */
+	@Test
+	public void projectionExpressions() {
+
+		ProjectionOperation operation = Aggregation.project() //
+				.andExpression("(netPrice + surCharge) * taxrate * [0]", 2).as("grossSalesPrice") //
+				.and("foo").as("bar"); //
+
+		DBObject dbObject = operation.toDBObject(Aggregation.DEFAULT_CONTEXT);
+		assertThat(
+				dbObject.toString(),
+				is("{ \"$project\" : { \"grossSalesPrice\" : { \"$multiply\" : [ { \"$add\" : [ \"$netPrice\" , \"$surCharge\"]} , \"$taxrate\" , 2]} , \"bar\" : \"$foo\"}}"));
+	}
+
 	private static DBObject exctractOperation(String field, DBObject fromProjectClause) {
 		return (DBObject) fromProjectClause.get(field);
 	}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SortOperationUnitTests.java

@@ -17,7 +17,7 @@ package org.springframework.data.mongodb.core.aggregation;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
-import static org.springframework.data.mongodb.core.DBObjectUtils.*;
+import static org.springframework.data.mongodb.core.DBObjectTestUtils.*;
 
 import org.junit.Test;
 import org.springframework.data.domain.Sort;

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SpelExpressionTransformerIntegrationTests.java

@@ -0,0 +1,81 @@
+/*
+ * 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.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mapping.model.MappingException;
+import org.springframework.data.mongodb.MongoDbFactory;
+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.convert.QueryMapper;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * Integration tests for {@link SpelExpressionTransformer}.
+ * 
+ * @see DATAMONGO-774
+ * @author Thomas Darimont
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("classpath:infrastructure.xml")
+public class SpelExpressionTransformerIntegrationTests {
+
+	@Autowired MongoDbFactory mongoDbFactory;
+
+	@Rule public ExpectedException exception = ExpectedException.none();
+
+	SpelExpressionTransformer transformer;
+	DbRefResolver dbRefResolver;
+
+	@Before
+	public void setUp() {
+		this.transformer = new SpelExpressionTransformer();
+		this.dbRefResolver = new DefaultDbRefResolver(mongoDbFactory);
+	}
+
+	@Test
+	public void shouldConvertCompoundExpressionToPropertyPath() {
+
+		MappingMongoConverter converter = new MappingMongoConverter(dbRefResolver, new MongoMappingContext());
+		TypeBasedAggregationOperationContext ctxt = new TypeBasedAggregationOperationContext(Data.class,
+				new MongoMappingContext(), new QueryMapper(converter));
+		assertThat(transformer.transform("item.primitiveIntValue", ctxt, new Object[0]).toString(),
+				is("$item.primitiveIntValue"));
+	}
+
+	@Test
+	public void shouldThrowExceptionIfNestedPropertyCannotBeFound() {
+
+		exception.expect(MappingException.class);
+		exception.expectMessage("value2");
+
+		MappingMongoConverter converter = new MappingMongoConverter(dbRefResolver, new MongoMappingContext());
+		TypeBasedAggregationOperationContext ctxt = new TypeBasedAggregationOperationContext(Data.class,
+				new MongoMappingContext(), new QueryMapper(converter));
+		assertThat(transformer.transform("item.value2", ctxt, new Object[0]).toString(), is("$item.value2"));
+	}
+}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SpelExpressionTransformerUnitTests.java

@@ -0,0 +1,192 @@
+/*
+ * 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.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * Unit tests for {@link SpelExpressionTransformer}.
+ * 
+ * @see DATAMONGO-774
+ * @author Thomas Darimont
+ * @author Oliver Gierke
+ */
+public class SpelExpressionTransformerUnitTests {
+
+	SpelExpressionTransformer transformer = new SpelExpressionTransformer();
+
+	Data data;
+
+	@Before
+	public void setup() {
+
+		this.data = new Data();
+		this.data.primitiveLongValue = 42;
+		this.data.primitiveDoubleValue = 1.2345;
+		this.data.doubleValue = 23.0;
+		this.data.item = new DataItem();
+		this.data.item.primitiveIntValue = 21;
+	}
+
+	@Test
+	public void shouldRenderConstantExpression() {
+
+		assertThat(transform("1"), is("1"));
+		assertThat(transform("-1"), is("-1"));
+		assertThat(transform("1.0"), is("1.0"));
+		assertThat(transform("-1.0"), is("-1.0"));
+		assertThat(transform("null"), is(nullValue()));
+	}
+
+	@Test
+	public void shouldSupportKnownOperands() {
+
+		assertThat(transform("a + b"), is("{ \"$add\" : [ \"$a\" , \"$b\"]}"));
+		assertThat(transform("a - b"), is("{ \"$subtract\" : [ \"$a\" , \"$b\"]}"));
+		assertThat(transform("a * b"), is("{ \"$multiply\" : [ \"$a\" , \"$b\"]}"));
+		assertThat(transform("a / b"), is("{ \"$divide\" : [ \"$a\" , \"$b\"]}"));
+		assertThat(transform("a % b"), is("{ \"$mod\" : [ \"$a\" , \"$b\"]}"));
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void shouldThrowExceptionOnUnknownOperand() {
+		transform("a ^ 1");
+	}
+
+	@Test
+	public void shouldRenderSumExpression() {
+		assertThat(transform("a + 1"), is("{ \"$add\" : [ \"$a\" , 1]}"));
+	}
+
+	@Test
+	public void shouldRenderFormula() {
+
+		assertThat(
+				transform("(netPrice + surCharge) * taxrate + 42"),
+				is("{ \"$add\" : [ { \"$multiply\" : [ { \"$add\" : [ \"$netPrice\" , \"$surCharge\"]} , \"$taxrate\"]} , 42]}"));
+	}
+
+	@Test
+	public void shouldRenderFormulaInCurlyBrackets() {
+
+		assertThat(
+				transform("{(netPrice + surCharge) * taxrate + 42}"),
+				is("{ \"$add\" : [ { \"$multiply\" : [ { \"$add\" : [ \"$netPrice\" , \"$surCharge\"]} , \"$taxrate\"]} , 42]}"));
+	}
+
+	@Test
+	public void shouldRenderFieldReference() {
+
+		assertThat(transform("foo"), is("$foo"));
+		assertThat(transform("$foo"), is("$foo"));
+	}
+
+	@Test
+	public void shouldRenderNestedFieldReference() {
+
+		assertThat(transform("foo.bar"), is("$foo.bar"));
+		assertThat(transform("$foo.bar"), is("$foo.bar"));
+	}
+
+	@Test
+	@Ignore
+	public void shouldRenderNestedIndexedFieldReference() {
+
+		// TODO add support for rendering nested indexed field references
+		assertThat(transform("foo[3].bar"), is("$foo[3].bar"));
+	}
+
+	@Test
+	public void shouldRenderConsecutiveOperation() {
+		assertThat(transform("1 + 1 + 1"), is("{ \"$add\" : [ 1 , 1 , 1]}"));
+	}
+
+	@Test
+	public void shouldRenderComplexExpression0() {
+
+		assertThat(transform("-(1 + q)"), is("{ \"$multiply\" : [ -1 , { \"$add\" : [ 1 , \"$q\"]}]}"));
+	}
+
+	@Test
+	public void shouldRenderComplexExpression1() {
+
+		assertThat(transform("1 + (q + 1) / (q - 1)"),
+				is("{ \"$add\" : [ 1 , { \"$divide\" : [ { \"$add\" : [ \"$q\" , 1]} , { \"$subtract\" : [ \"$q\" , 1]}]}]}"));
+	}
+
+	@Test
+	public void shouldRenderComplexExpression2() {
+
+		assertThat(
+				transform("(q + 1 + 4 - 5) / (q + 1 + 3 + 4)"),
+				is("{ \"$divide\" : [ { \"$subtract\" : [ { \"$add\" : [ \"$q\" , 1 , 4]} , 5]} , { \"$add\" : [ \"$q\" , 1 , 3 , 4]}]}"));
+	}
+
+	@Test
+	public void shouldRenderBinaryExpressionWithMixedSignsCorrectly() {
+
+		assertThat(transform("-4 + 1"), is("{ \"$add\" : [ -4 , 1]}"));
+		assertThat(transform("1 + -4"), is("{ \"$add\" : [ 1 , -4]}"));
+	}
+
+	@Test
+	public void shouldRenderConsecutiveOperationsInComplexExpression() {
+
+		assertThat(transform("1 + 1 + (1 + 1 + 1) / q"),
+				is("{ \"$add\" : [ 1 , 1 , { \"$divide\" : [ { \"$add\" : [ 1 , 1 , 1]} , \"$q\"]}]}"));
+	}
+
+	@Test
+	public void shouldRenderParameterExpressionResults() {
+		assertThat(transform("[0] + [1] + [2]", 1, 2, 3), is("{ \"$add\" : [ 1 , 2 , 3]}"));
+	}
+
+	@Test
+	public void shouldRenderNestedParameterExpressionResults() {
+
+		assertThat(transform("[0].primitiveLongValue + [0].primitiveDoubleValue + [0].doubleValue.longValue()", data),
+				is("{ \"$add\" : [ 42 , 1.2345 , 23]}"));
+	}
+
+	@Test
+	public void shouldRenderNestedParameterExpressionResultsInNestedExpressions() {
+
+		assertThat(
+				transform("((1 + [0].primitiveLongValue) + [0].primitiveDoubleValue) * [0].doubleValue.longValue()", data),
+				is("{ \"$multiply\" : [ { \"$add\" : [ 1 , 42 , 1.2345]} , 23]}"));
+	}
+
+	@Test
+	public void shouldRenderStringFunctions() {
+
+		assertThat(transform("concat(a, b)"), is("{ \"$concat\" : [ \"$a\" , \"$b\"]}"));
+		assertThat(transform("substr(a, 1, 2)"), is("{ \"$substr\" : [ \"$a\" , 1 , 2]}"));
+		assertThat(transform("strcasecmp(a, b)"), is("{ \"$strcasecmp\" : [ \"$a\" , \"$b\"]}"));
+		assertThat(transform("toLower(a)"), is("{ \"$toLower\" : [ \"$a\"]}"));
+		assertThat(transform("toUpper(a)"), is("{ \"$toUpper\" : [ \"$a\"]}"));
+		assertThat(transform("toUpper(toLower(a))"), is("{ \"$toUpper\" : [ { \"$toLower\" : [ \"$a\"]}]}"));
+	}
+
+	private String transform(String expression, Object... params) {
+		Object result = transformer.transform(expression, Aggregation.DEFAULT_CONTEXT, params);
+		return result == null ? null : result.toString();
+	}
+}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/TypeBasedAggregationOperationContextUnitTests.java

@@ -23,8 +23,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
-import org.springframework.data.mapping.PropertyReferenceException;
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mapping.model.MappingException;
+import org.springframework.data.mongodb.core.convert.DbRefResolver;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
@@ -41,13 +41,13 @@ public class TypeBasedAggregationOperationContextUnitTests {
 	MappingMongoConverter converter;
 	QueryMapper mapper;
 
-	@Mock MongoDbFactory dbFactory;
+	@Mock DbRefResolver dbRefResolver;
 
 	@Before
 	public void setUp() {
 
 		this.context = new MongoMappingContext();
-		this.converter = new MappingMongoConverter(dbFactory, context);
+		this.converter = new MappingMongoConverter(dbRefResolver, context);
 		this.mapper = new QueryMapper(converter);
 	}
 
@@ -56,7 +56,7 @@ public class TypeBasedAggregationOperationContextUnitTests {
 		assertThat(getContext(Foo.class).getReference("bar"), is(notNullValue()));
 	}
 
-	@Test(expected = PropertyReferenceException.class)
+	@Test(expected = MappingException.class)
 	public void rejectsInvalidFieldReference() {
 		getContext(Foo.class).getReference("foo");
 	}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/CustomConversionsUnitTests.java

@@ -12,6 +12,7 @@ import java.util.UUID;
 
 import org.bson.types.Binary;
 import org.bson.types.ObjectId;
+import org.joda.time.DateTime;
 import org.junit.Test;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.convert.support.DefaultConversionService;
@@ -100,7 +101,6 @@ public class CustomConversionsUnitTests {
 	public void populatesConversionServiceCorrectly() {
 
 		GenericConversionService conversionService = new DefaultConversionService();
-		assertThat(conversionService.canConvert(String.class, UUID.class), is(false));
 
 		CustomConversions conversions = new CustomConversions(Arrays.asList(StringToFormatConverter.INSTANCE));
 		conversions.registerConvertersIn(conversionService);
@@ -172,6 +172,17 @@ public class CustomConversionsUnitTests {
 		assertThat(conversions.hasCustomReadTarget(String.class, URL.class), is(true));
 	}
 
+	/**
+	 * @see DATAMONGO-795
+	 */
+	@Test
+	@SuppressWarnings("rawtypes")
+	public void favorsCustomConverterForIndeterminedTargetType() {
+
+		CustomConversions conversions = new CustomConversions(Arrays.asList(DateTimeToStringConverter.INSTANCE));
+		assertThat(conversions.getCustomWriteTarget(DateTime.class, null), is(equalTo((Class) String.class)));
+	}
+
 	enum FormatToStringConverter implements Converter<Format, String> {
 		INSTANCE;
 
@@ -207,4 +218,13 @@ public class CustomConversionsUnitTests {
 			return 0;
 		}
 	}
+
+	enum DateTimeToStringConverter implements Converter<DateTime, String> {
+		INSTANCE;
+
+		@Override
+		public String convert(DateTime source) {
+			return "";
+		}
+	}
 }

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/CustomConvertersUnitTests.java

@@ -48,12 +48,9 @@ public class CustomConvertersUnitTests {
 
 	MappingMongoConverter converter;
 
-	@Mock
-	BarToDBObjectConverter barToDBObjectConverter;
-	@Mock
-	DBObjectToBarConverter dbObjectToBarConverter;
-	@Mock
-	MongoDbFactory mongoDbFactory;
+	@Mock BarToDBObjectConverter barToDBObjectConverter;
+	@Mock DBObjectToBarConverter dbObjectToBarConverter;
+	@Mock MongoDbFactory mongoDbFactory;
 
 	MongoMappingContext context;
 	MongoPersistentEntity<Foo> fooEntity;
@@ -73,7 +70,7 @@ public class CustomConvertersUnitTests {
 		context.setSimpleTypeHolder(conversions.getSimpleTypeHolder());
 		context.initialize();
 
-		converter = new MappingMongoConverter(mongoDbFactory, context);
+		converter = new MappingMongoConverter(new DefaultDbRefResolver(mongoDbFactory), context);
 		converter.setCustomConversions(conversions);
 		converter.afterPropertiesSet();
 	}
@@ -121,14 +118,12 @@ public class CustomConvertersUnitTests {
 	}
 
 	public static class Foo {
-		@Id
-		public String id;
+		@Id public String id;
 		public Bar bar;
 	}
 
 	public static class Bar {
-		@Id
-		public String id;
+		@Id public String id;
 		public String foo;
 	}
 

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DBObjectAccessorUnitTests.java

@@ -0,0 +1,94 @@
+/*
+ * 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 static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+import org.springframework.data.mongodb.core.DBObjectTestUtils;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+
+import com.mongodb.BasicDBList;
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
+/**
+ * Unit tests for {@link DbObjectAccessor}.
+ * 
+ * @see DATAMONGO-766
+ * @author Oliver Gierke
+ */
+public class DBObjectAccessorUnitTests {
+
+	MongoMappingContext context = new MongoMappingContext();
+	MongoPersistentEntity<?> projectingTypeEntity = context.getPersistentEntity(ProjectingType.class);
+	MongoPersistentProperty fooProperty = projectingTypeEntity.getPersistentProperty("foo");
+
+	@Test
+	public void putsNestedFieldCorrectly() {
+
+		DBObject dbObject = new BasicDBObject();
+
+		DBObjectAccessor accessor = new DBObjectAccessor(dbObject);
+		accessor.put(fooProperty, "FooBar");
+
+		DBObject aDbObject = DBObjectTestUtils.getAsDBObject(dbObject, "a");
+		assertThat(aDbObject.get("b"), is((Object) "FooBar"));
+	}
+
+	@Test
+	public void getsNestedFieldCorrectly() {
+
+		DBObject source = new BasicDBObject("a", new BasicDBObject("b", "FooBar"));
+
+		DBObjectAccessor accessor = new DBObjectAccessor(source);
+		assertThat(accessor.get(fooProperty), is((Object) "FooBar"));
+	}
+
+	@Test
+	public void returnsNullForNonExistingFieldPath() {
+
+		DBObjectAccessor accessor = new DBObjectAccessor(new BasicDBObject());
+		assertThat(accessor.get(fooProperty), is(nullValue()));
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void rejectsNonBasicDBObjects() {
+		new DBObjectAccessor(new BasicDBList());
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void rejectsNullDBObject() {
+		new DBObjectAccessor(null);
+	}
+
+	static class ProjectingType {
+
+		String name;
+		@Field("a.b") String foo;
+		NestedType a;
+	}
+
+	static class NestedType {
+		String b;
+		String c;
+	}
+
+}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DataMongo273Tests.java

@@ -25,7 +25,6 @@ import java.util.Map;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 
 import com.mongodb.BasicDBList;
@@ -43,10 +42,10 @@ public class DataMongo273Tests {
 	MappingMongoConverter converter;
 
 	@Before
-	public void setupMongoConv() {
+	public void setupMongoConverter() {
 
 		MongoMappingContext mappingContext = new MongoMappingContext();
-		MongoDbFactory factory = mock(MongoDbFactory.class);
+		DbRefResolver factory = mock(DbRefResolver.class);
 
 		converter = new MappingMongoConverter(factory, mappingContext);
 		converter.afterPropertiesSet();

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DbRefMappingMongoConverterUnitTests.java

@@ -0,0 +1,390 @@
+/*
+ * 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 static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+import static org.mockito.Matchers.*;
+import static org.mockito.Mockito.*;
+import static org.springframework.data.mongodb.core.convert.LazyLoadingTestUtils.*;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.mapping.PropertyPath;
+import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.core.MongoExceptionTranslator;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverterUnitTests.Person;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.util.SerializationUtils;
+
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+import com.mongodb.DBRef;
+
+/**
+ * @author Oliver Gierke
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class DbRefMappingMongoConverterUnitTests {
+
+	MappingMongoConverter converter;
+	MongoMappingContext mappingContext;
+
+	@Mock MongoDbFactory dbFactory;
+
+	@Before
+	public void setUp() {
+
+		when(dbFactory.getExceptionTranslator()).thenReturn(new MongoExceptionTranslator());
+
+		this.mappingContext = new MongoMappingContext();
+		this.converter = new MappingMongoConverter(new DefaultDbRefResolver(dbFactory), mappingContext);
+	}
+
+	/**
+	 * @see DATAMONGO-347
+	 */
+	@Test
+	public void createsSimpleDBRefCorrectly() {
+
+		Person person = new Person();
+		person.id = "foo";
+
+		DBRef dbRef = converter.toDBRef(person, null);
+		assertThat(dbRef.getId(), is((Object) "foo"));
+		assertThat(dbRef.getRef(), is("person"));
+	}
+
+	/**
+	 * @see DATAMONGO-657
+	 */
+	@Test
+	public void convertDocumentWithMapDBRef() {
+
+		MapDBRef mapDBRef = new MapDBRef();
+
+		MapDBRefVal val = new MapDBRefVal();
+		val.id = BigInteger.ONE;
+
+		Map<String, MapDBRefVal> mapVal = new HashMap<String, MapDBRefVal>();
+		mapVal.put("test", val);
+
+		mapDBRef.map = mapVal;
+
+		BasicDBObject dbObject = new BasicDBObject();
+		converter.write(mapDBRef, dbObject);
+
+		DBObject map = (DBObject) dbObject.get("map");
+
+		assertThat(map.get("test"), instanceOf(DBRef.class));
+
+		DBObject mapValDBObject = new BasicDBObject();
+		mapValDBObject.put("_id", BigInteger.ONE);
+
+		DBRef dbRef = mock(DBRef.class);
+		when(dbRef.fetch()).thenReturn(mapValDBObject);
+
+		((DBObject) dbObject.get("map")).put("test", dbRef);
+
+		MapDBRef read = converter.read(MapDBRef.class, dbObject);
+
+		assertThat(read.map.get("test").id, is(BigInteger.ONE));
+	}
+
+	/**
+	 * @see DATAMONGO-347
+	 */
+	@Test
+	public void createsDBRefWithClientSpecCorrectly() {
+
+		PropertyPath path = PropertyPath.from("person", PersonClient.class);
+		MongoPersistentProperty property = mappingContext.getPersistentPropertyPath(path).getLeafProperty();
+
+		Person person = new Person();
+		person.id = "foo";
+
+		DBRef dbRef = converter.toDBRef(person, property);
+		assertThat(dbRef.getId(), is((Object) "foo"));
+		assertThat(dbRef.getRef(), is("person"));
+	}
+
+	/**
+	 * @see DATAMONGO-348
+	 */
+	@Test
+	public void lazyLoadingProxyForLazyDbRefOnInterface() {
+
+		String id = "42";
+		String value = "bubu";
+		MappingMongoConverter converterSpy = spy(converter);
+		doReturn(new BasicDBObject("_id", id).append("value", value)).when(converterSpy).readRef((DBRef) any());
+
+		BasicDBObject dbo = new BasicDBObject();
+		ClassWithLazyDbRefs lazyDbRefs = new ClassWithLazyDbRefs();
+		lazyDbRefs.dbRefToInterface = new LinkedList<LazyDbRefTarget>(Arrays.asList(new LazyDbRefTarget("1")));
+		converterSpy.write(lazyDbRefs, dbo);
+
+		ClassWithLazyDbRefs result = converterSpy.read(ClassWithLazyDbRefs.class, dbo);
+
+		assertProxyIsResolved(result.dbRefToInterface, false);
+		assertThat(result.dbRefToInterface.get(0).getId(), is(id));
+		assertProxyIsResolved(result.dbRefToInterface, true);
+		assertThat(result.dbRefToInterface.get(0).getValue(), is(value));
+	}
+
+	/**
+	 * @see DATAMONGO-348
+	 */
+	@Test
+	public void lazyLoadingProxyForLazyDbRefOnConcreteCollection() {
+
+		String id = "42";
+		String value = "bubu";
+		MappingMongoConverter converterSpy = spy(converter);
+		doReturn(new BasicDBObject("_id", id).append("value", value)).when(converterSpy).readRef((DBRef) any());
+
+		BasicDBObject dbo = new BasicDBObject();
+		ClassWithLazyDbRefs lazyDbRefs = new ClassWithLazyDbRefs();
+		lazyDbRefs.dbRefToConcreteCollection = new ArrayList<LazyDbRefTarget>(Arrays.asList(new LazyDbRefTarget(id, value)));
+		converterSpy.write(lazyDbRefs, dbo);
+
+		ClassWithLazyDbRefs result = converterSpy.read(ClassWithLazyDbRefs.class, dbo);
+
+		assertProxyIsResolved(result.dbRefToConcreteCollection, false);
+		assertThat(result.dbRefToConcreteCollection.get(0).getId(), is(id));
+		assertProxyIsResolved(result.dbRefToConcreteCollection, true);
+		assertThat(result.dbRefToConcreteCollection.get(0).getValue(), is(value));
+	}
+
+	/**
+	 * @see DATAMONGO-348
+	 */
+	@Test
+	public void lazyLoadingProxyForLazyDbRefOnConcreteType() {
+
+		String id = "42";
+		String value = "bubu";
+		MappingMongoConverter converterSpy = spy(converter);
+		doReturn(new BasicDBObject("_id", id).append("value", value)).when(converterSpy).readRef((DBRef) any());
+
+		BasicDBObject dbo = new BasicDBObject();
+		ClassWithLazyDbRefs lazyDbRefs = new ClassWithLazyDbRefs();
+		lazyDbRefs.dbRefToConcreteType = new LazyDbRefTarget(id, value);
+		converterSpy.write(lazyDbRefs, dbo);
+
+		ClassWithLazyDbRefs result = converterSpy.read(ClassWithLazyDbRefs.class, dbo);
+
+		assertProxyIsResolved(result.dbRefToConcreteType, false);
+		assertThat(result.dbRefToConcreteType.getId(), is(id));
+		assertProxyIsResolved(result.dbRefToConcreteType, true);
+		assertThat(result.dbRefToConcreteType.getValue(), is(value));
+	}
+
+	/**
+	 * @see DATAMONGO-348
+	 */
+	@Test
+	public void lazyLoadingProxyForLazyDbRefOnConcreteTypeWithPersistenceConstructor() {
+
+		String id = "42";
+		String value = "bubu";
+		MappingMongoConverter converterSpy = spy(converter);
+		doReturn(new BasicDBObject("_id", id).append("value", value)).when(converterSpy).readRef((DBRef) any());
+
+		BasicDBObject dbo = new BasicDBObject();
+		ClassWithLazyDbRefs lazyDbRefs = new ClassWithLazyDbRefs();
+		lazyDbRefs.dbRefToConcreteTypeWithPersistenceConstructor = new LazyDbRefTargetWithPeristenceConstructor(
+				(Object) id, (Object) value);
+		converterSpy.write(lazyDbRefs, dbo);
+
+		ClassWithLazyDbRefs result = converterSpy.read(ClassWithLazyDbRefs.class, dbo);
+
+		assertProxyIsResolved(result.dbRefToConcreteTypeWithPersistenceConstructor, false);
+		assertThat(result.dbRefToConcreteTypeWithPersistenceConstructor.getId(), is(id));
+		assertProxyIsResolved(result.dbRefToConcreteTypeWithPersistenceConstructor, true);
+		assertThat(result.dbRefToConcreteTypeWithPersistenceConstructor.getValue(), is(value));
+	}
+
+	/**
+	 * @see DATAMONGO-348
+	 */
+	@Test
+	public void lazyLoadingProxyForLazyDbRefOnConcreteTypeWithPersistenceConstructorButWithoutDefaultConstructor() {
+
+		String id = "42";
+		String value = "bubu";
+		MappingMongoConverter converterSpy = spy(converter);
+		doReturn(new BasicDBObject("_id", id).append("value", value)).when(converterSpy).readRef((DBRef) any());
+
+		BasicDBObject dbo = new BasicDBObject();
+		ClassWithLazyDbRefs lazyDbRefs = new ClassWithLazyDbRefs();
+		lazyDbRefs.dbRefToConcreteTypeWithPersistenceConstructorWithoutDefaultConstructor = new LazyDbRefTargetWithPeristenceConstructorWithoutDefaultConstructor(
+				(Object) id, (Object) value);
+		converterSpy.write(lazyDbRefs, dbo);
+
+		ClassWithLazyDbRefs result = converterSpy.read(ClassWithLazyDbRefs.class, dbo);
+
+		assertProxyIsResolved(result.dbRefToConcreteTypeWithPersistenceConstructorWithoutDefaultConstructor, false);
+		assertThat(result.dbRefToConcreteTypeWithPersistenceConstructorWithoutDefaultConstructor.getId(), is(id));
+		assertProxyIsResolved(result.dbRefToConcreteTypeWithPersistenceConstructorWithoutDefaultConstructor, true);
+		assertThat(result.dbRefToConcreteTypeWithPersistenceConstructorWithoutDefaultConstructor.getValue(), is(value));
+	}
+
+	/**
+	 * @see DATAMONGO-348
+	 */
+	@Test
+	public void lazyLoadingProxyForSerializableLazyDbRefOnConcreteType() {
+
+		String id = "42";
+		String value = "bubu";
+		MappingMongoConverter converterSpy = spy(converter);
+		doReturn(new BasicDBObject("_id", id).append("value", value)).when(converterSpy).readRef((DBRef) any());
+
+		BasicDBObject dbo = new BasicDBObject();
+		SerializableClassWithLazyDbRefs lazyDbRefs = new SerializableClassWithLazyDbRefs();
+		lazyDbRefs.dbRefToSerializableTarget = new SerializableLazyDbRefTarget(id, value);
+		converterSpy.write(lazyDbRefs, dbo);
+
+		SerializableClassWithLazyDbRefs result = converterSpy.read(SerializableClassWithLazyDbRefs.class, dbo);
+
+		SerializableClassWithLazyDbRefs deserializedResult = (SerializableClassWithLazyDbRefs) transport(result);
+
+		assertThat(deserializedResult.dbRefToSerializableTarget.getId(), is(id));
+		assertProxyIsResolved(deserializedResult.dbRefToSerializableTarget, true);
+		assertThat(deserializedResult.dbRefToSerializableTarget.getValue(), is(value));
+	}
+
+	private Object transport(Object result) {
+		return SerializationUtils.deserialize(SerializationUtils.serialize(result));
+	}
+
+	class MapDBRef {
+		@org.springframework.data.mongodb.core.mapping.DBRef Map<String, MapDBRefVal> map;
+	}
+
+	class MapDBRefVal {
+		BigInteger id;
+	}
+
+	class PersonClient {
+		@org.springframework.data.mongodb.core.mapping.DBRef Person person;
+	}
+
+	static class ClassWithLazyDbRefs {
+
+		@Id String id;
+		@org.springframework.data.mongodb.core.mapping.DBRef(lazy = true) List<LazyDbRefTarget> dbRefToInterface;
+		@org.springframework.data.mongodb.core.mapping.DBRef(lazy = true) ArrayList<LazyDbRefTarget> dbRefToConcreteCollection;
+		@org.springframework.data.mongodb.core.mapping.DBRef(lazy = true) LazyDbRefTarget dbRefToConcreteType;
+		@org.springframework.data.mongodb.core.mapping.DBRef(lazy = true) LazyDbRefTargetWithPeristenceConstructor dbRefToConcreteTypeWithPersistenceConstructor;
+		@org.springframework.data.mongodb.core.mapping.DBRef(lazy = true) LazyDbRefTargetWithPeristenceConstructorWithoutDefaultConstructor dbRefToConcreteTypeWithPersistenceConstructorWithoutDefaultConstructor;
+	}
+
+	static class SerializableClassWithLazyDbRefs implements Serializable {
+
+		private static final long serialVersionUID = 1L;
+
+		@org.springframework.data.mongodb.core.mapping.DBRef(lazy = true) SerializableLazyDbRefTarget dbRefToSerializableTarget;
+	}
+
+	static class LazyDbRefTarget implements Serializable {
+
+		private static final long serialVersionUID = 1L;
+
+		@Id String id;
+		String value;
+
+		public LazyDbRefTarget() {
+			this(null);
+		}
+
+		public LazyDbRefTarget(String id) {
+			this(id, null);
+		}
+
+		public LazyDbRefTarget(String id, String value) {
+			this.id = id;
+			this.value = value;
+		}
+
+		public String getId() {
+			return id;
+		}
+
+		public String getValue() {
+			return value;
+		}
+	}
+
+	static class LazyDbRefTargetWithPeristenceConstructor extends LazyDbRefTarget {
+
+		boolean persistenceConstructorCalled;
+
+		public LazyDbRefTargetWithPeristenceConstructor() {}
+
+		@PersistenceConstructor
+		public LazyDbRefTargetWithPeristenceConstructor(String id, String value) {
+			super(id, value);
+			this.persistenceConstructorCalled = true;
+		}
+
+		public LazyDbRefTargetWithPeristenceConstructor(Object id, Object value) {
+			super(id.toString(), value.toString());
+		}
+	}
+
+	static class LazyDbRefTargetWithPeristenceConstructorWithoutDefaultConstructor extends LazyDbRefTarget {
+
+		boolean persistenceConstructorCalled;
+
+		@PersistenceConstructor
+		public LazyDbRefTargetWithPeristenceConstructorWithoutDefaultConstructor(String id, String value) {
+			super(id, value);
+			this.persistenceConstructorCalled = true;
+		}
+
+		public LazyDbRefTargetWithPeristenceConstructorWithoutDefaultConstructor(Object id, Object value) {
+			super(id.toString(), value.toString());
+		}
+	}
+
+	static class SerializableLazyDbRefTarget extends LazyDbRefTarget implements Serializable {
+
+		public SerializableLazyDbRefTarget() {}
+
+		public SerializableLazyDbRefTarget(String id, String value) {
+			super(id, value);
+		}
+
+		private static final long serialVersionUID = 1L;
+	}
+}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DefaultMongoTypeMapperUnitTests.java

@@ -26,7 +26,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.data.convert.ConfigurableTypeInformationMapper;
 import org.springframework.data.convert.SimpleTypeInformationMapper;
-import org.springframework.data.mongodb.core.DBObjectUtils;
+import org.springframework.data.mongodb.core.DBObjectTestUtils;
 import org.springframework.data.util.TypeInformation;
 
 import com.mongodb.BasicDBList;
@@ -119,8 +119,8 @@ public class DefaultMongoTypeMapperUnitTests {
 		typeMapper = new DefaultMongoTypeMapper();
 		typeMapper.writeTypeRestrictions(result, Collections.<Class<?>> singleton(String.class));
 
-		DBObject typeInfo = DBObjectUtils.getAsDBObject(result, DefaultMongoTypeMapper.DEFAULT_TYPE_KEY);
-		List<Object> aliases = DBObjectUtils.getAsDBList(typeInfo, "$in");
+		DBObject typeInfo = DBObjectTestUtils.getAsDBObject(result, DefaultMongoTypeMapper.DEFAULT_TYPE_KEY);
+		List<Object> aliases = DBObjectTestUtils.getAsDBList(typeInfo, "$in");
 		assertThat(aliases, hasSize(1));
 		assertThat(aliases.get(0), is((Object) String.class.getName()));
 	}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/LazyLoadingTestUtils.java

@@ -0,0 +1,50 @@
+/*
+ * 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 static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import org.springframework.aop.framework.Advised;
+import org.springframework.cglib.proxy.Factory;
+import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver.LazyLoadingInterceptor;
+
+/**
+ * Utility class to test proxy handling for lazy loading.
+ * 
+ * @author Oliver Gierke
+ */
+public class LazyLoadingTestUtils {
+
+	/**
+	 * Asserts that the given repository is resolved (expected is {@literal true}) and the value is non-{@literal null} or
+	 * unresolved (expected is {@literal false}) and the value is {@literal null}.
+	 * 
+	 * @param target
+	 * @param expected
+	 */
+	public static void assertProxyIsResolved(Object target, boolean expected) {
+
+		LazyLoadingInterceptor interceptor = extractInterceptor(target);
+		assertThat(interceptor.isResolved(), is(expected));
+		assertThat(interceptor.getResult(), is(expected ? notNullValue() : nullValue()));
+	}
+
+	private static LazyLoadingInterceptor extractInterceptor(Object proxy) {
+		return (LazyLoadingInterceptor) (proxy instanceof Advised ? ((Advised) proxy).getAdvisors()[0].getAdvice()
+				: ((Factory) proxy).getCallback(0));
+	}
+}