DATAMONGO-955 - After release cleanups.

PartTreeMongoQuery now explicitly check the presence of a manually defined field spec on the query method and creates a new Query if so.

Original pull request: #188.

CONTRIBUTING.MD

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

README.md

@@ -1,6 +1,6 @@
 # Spring Data MongoDB
 
-The primary goal of the [Spring Data](http://www.springsource.org/spring-data) project is to make it easier to build Spring-powered applications that use new data access technologies such as non-relational databases, map-reduce frameworks, and cloud based data services.
+The primary goal of the [Spring Data](http://projects.spring.io/spring-data) project is to make it easier to build Spring-powered applications that use new data access technologies such as non-relational databases, map-reduce frameworks, and cloud based data services.
 
 The Spring Data MongoDB project aims to provide a familiar and consistent Spring-based programming model for new datastores while retaining store-specific features and capabilities. The Spring Data MongoDB project provides integration with the MongoDB document database. Key functional areas of Spring Data MongoDB are a POJO centric model for interacting with a MongoDB DBCollection and easily writing a repository style data access layer.
 
@@ -8,12 +8,12 @@ The Spring Data MongoDB project aims to provide a familiar and consistent Spring
 
 For a comprehensive treatment of all the Spring Data MongoDB features, please refer to:
 
-* the [User Guide](http://static.springsource.org/spring-data/data-mongodb/docs/current/reference/html/) 
-* the [JavaDocs](http://static.springsource.org/spring-data/data-mongodb/docs/current/api/) have extensive comments in them as well.
-* the home page of [Spring Data MongoDB](http://www.springsource.org/spring-data/mongodb) contains links to articles and other resources.
-* for more detailed questions, use the [forum](http://forum.springsource.org/forumdisplay.php?f=80). 
+* the [User Guide](http://docs.spring.io/spring-data/mongodb/docs/current/reference/html/)
+* the [JavaDocs](http://docs.spring.io/spring-data/mongodb/docs/current/api/) have extensive comments in them as well.
+* the home page of [Spring Data MongoDB](http://projects.spring.io/spring-data-mongodb) contains links to articles and other resources.
+* for more detailed questions, use the [forum](http://forum.spring.io/forum/spring-projects/data/nosql).
 
-If you are new to Spring as well as to Spring Data, look for information about [Spring projects](http://www.springsource.org/projects). 
+If you are new to Spring as well as to Spring Data, look for information about [Spring projects](http://projects.spring.io/).
 
 
 ## Quick Start
@@ -26,7 +26,7 @@ Add the Maven dependency:
 <dependency>
   <groupId>org.springframework.data</groupId>
   <artifactId>spring-data-mongodb</artifactId>
-  <version>1.3.2.RELEASE</version>
+  <version>1.4.2.RELEASE</version>
 </dependency>
 ```
 
@@ -36,13 +36,13 @@ 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.4.0.BUILD-SNAPSHOT</version>
+  <version>1.5.0.BUILD-SNAPSHOT</version>
 </dependency>
 
 <repository>
   <id>spring-libs-snapshot</id>
   <name>Spring Snapshot Repository</name>
-  <url>http://repo.springsource.org/libs-snapshot</url>
+  <url>http://repo.spring.io/libs-snapshot</url>
 </repository>
 ```
 
@@ -53,7 +53,7 @@ MongoTemplate is the central support class for Mongo database operations. It pro
 * Basic POJO mapping support to and from BSON
 * Convenience methods to interact with the store (insert object, update objects) and MongoDB specific ones (geo-spatial operations, upserts, map-reduce etc.)
 * Connection affinity callback
-* Exception translation into Spring's [technology agnostic DAO exception hierarchy](http://static.springsource.org/spring/docs/3.0.x/spring-framework-reference/html/dao.html#dao-exceptions).
+* Exception translation into Spring's [technology agnostic DAO exception hierarchy](http://docs.spring.io/spring/docs/current/spring-framework-reference/html/dao.html#dao-exceptions).
 
 ### Spring Data repositories
 
@@ -81,7 +81,7 @@ class ApplicationConfig extends AbstractMongoConfiguration {
 
   @Override
   public Mongo mongo() throws Exception {
-    return new Mongo();
+    return new MongoClient();
   }
 
   @Override
@@ -94,9 +94,9 @@ class ApplicationConfig extends AbstractMongoConfiguration {
 This sets up a connection to a local MongoDB instance and enables the detection of Spring Data repositories (through `@EnableMongoRepositories`). The same configuration would look like this in XML:
 
 ```xml
-<bean id="template" class="org.springframework.data.document.mongodb.MongoTemplate">
+<bean id="template" class="org.springframework.data.mongodb.core.MongoTemplate">
   <constructor-arg>
-    <bean class="com.mongodb.Mongo">
+    <bean class="com.mongodb.MongoClient">
        <constructor-arg value="localhost" />
        <constructor-arg value="27017" />
     </bean>
@@ -139,9 +139,9 @@ public class MyService {
 
 Here are some ways for you to get involved in the community:
 
-* Get involved with the Spring community on the Spring Community Forums.  Please help out on the [forum](http://forum.springsource.org/forumdisplay.php?f=80) by responding to questions and joining the debate.
+* Get involved with the Spring community on the Spring Community Forums.  Please help out on the [forum](http://forum.spring.io/forum/spring-projects/data/nosql) by responding to questions and joining the debate.
 * Create [JIRA](https://jira.springframework.org/browse/DATADOC) tickets for bugs and new features and comment and vote on the ones that you are interested in.  
 * Github is for social coding: if you want to write code, we encourage contributions through pull requests from [forks of this repository](http://help.github.com/forking/). If you want to contribute code this way, please reference a JIRA ticket as well covering the specific issue you are addressing.
-* Watch for upcoming articles on Spring by [subscribing](http://www.springsource.org/node/feed) to springframework.org
+* Watch for upcoming articles on Spring by [subscribing](http://spring.io/blog) to spring.io.
 
 Before we accept a non-trivial patch or pull request we will need you to sign the [contributor's agreement](https://support.springsource.com/spring_committer_signup).  Signing the contributor's agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do.  Active contributors might be asked to join the core team, and given the ability to merge pull requests.

pom.xml

@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
 	
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-mongodb-parent</artifactId>
-	<version>1.4.0.M1</version>
+	<version>1.4.4.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data MongoDB</name>
 	<description>MongoDB support for Spring Data</description>
-	<url>http://www.springsource.org/spring-data/mongodb</url>
+	<url>http://projects.spring.io/spring-data-mongodb</url>
 
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>1.3.0.M1</version>
+		<version>1.3.4.BUILD-SNAPSHOT</version>
 		<relativePath>../spring-data-build/parent/pom.xml</relativePath>
 	</parent>
 	
@@ -29,8 +29,9 @@
 	<properties>
 		<project.type>multi</project.type>
 		<dist.id>spring-data-mongodb</dist.id>
-		<springdata.commons>1.7.0.M1</springdata.commons>
-		<mongo>2.11.3</mongo>
+		<springdata.commons>1.7.4.BUILD-SNAPSHOT</springdata.commons>
+		<mongo>2.11.4</mongo>
+		<mongo-osgi>${mongo}</mongo-osgi>
 	</properties>
 	
 	<developers>
@@ -89,8 +90,29 @@
 			</roles>
 			<timezone>+1</timezone>
 		</developer>
+		<developer>
+			<id>cstrobl</id>
+			<name>Christoph Strobl</name>
+			<email>cstrobl at gopivotal.com</email>
+			<organization>Pivotal</organization>
+			<organizationUrl>http://www.gopivotal.com</organizationUrl>
+			<roles>
+				<role>Developer</role>
+			</roles>
+			<timezone>+1</timezone>
+		</developer>
 	</developers>
 
+	<profiles>
+		<profile>
+			<id>mongo-next</id>
+			<properties>
+				<mongo>2.12.0</mongo>
+				<mongo-osgi>2.12.0</mongo-osgi>
+			</properties>
+		</profile>
+	</profiles>
+
 	<dependencies>
 		<!-- MongoDB -->
 		<dependency>
@@ -102,9 +124,20 @@
 	
 	<repositories>
 		<repository>
-			<id>spring-libs-milestone</id>
-			<url>http://repo.springsource.org/libs-milestone-local</url>
+			<id>spring-libs-snapshopt</id>
+			<url>http://repo.spring.io/libs-snapshot</url>
 		</repository>
-	</repositories>
+	<repository>
+      <id>spring-libs-snapshot</id>
+      <url>http://repo.spring.io/libs-snapshot</url>
+    </repository>
+  </repositories>
+	
+	<pluginRepositories>
+		<pluginRepository>
+			<id>spring-plugins-release</id>
+			<url>http://repo.spring.io/plugins-release</url>
+		</pluginRepository>
+	</pluginRepositories>
 
 </project>

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

@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.4.0.M1</version>
+		<version>1.4.4.BUILD-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
 	<artifactId>spring-data-mongodb-cross-store</artifactId>
-	<name>Spring Data MongoDB - Cross-Store Persistence Support</name>
+	<name>Spring Data MongoDB - Cross-Store Support</name>
 	
 	<properties>
 		<jpa>1.0.0.Final</jpa>
@@ -24,7 +24,6 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
-			<version>${spring}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>commons-logging</groupId>
@@ -35,24 +34,21 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-tx</artifactId>
-			<version>${spring}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-aspects</artifactId>
-			<version>${spring}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-orm</artifactId>
-			<version>${spring}</version>
 		</dependency>
 
 		<!-- Spring Data -->
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-mongodb</artifactId>
-			<version>1.4.0.M1</version>
+			<version>1.4.4.BUILD-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
@@ -60,17 +56,13 @@
 			<artifactId>aspectjrt</artifactId>
 			<version>${aspectj}</version>
 		</dependency>
-		<dependency>
-			<groupId>cglib</groupId>
-			<artifactId>cglib</artifactId>
-			<version>2.2</version>
-		</dependency>
 
 		<!-- JPA -->
 		<dependency>
 			<groupId>org.hibernate.javax.persistence</groupId>
 			<artifactId>hibernate-jpa-2.0-api</artifactId>
 			<version>${jpa}</version>
+			<optional>true</optional>
 		</dependency>
 
 		<!-- For Tests -->

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2013 the original author or authors.
+ * Copyright 2011-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,17 +41,13 @@ import com.mongodb.MongoException;
 public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 
 	private static final String ENTITY_CLASS = "_entity_class";
-
 	private static final String ENTITY_ID = "_entity_id";
-
 	private static final String ENTITY_FIELD_NAME = "_entity_field_name";
-
 	private static final String ENTITY_FIELD_CLASS = "_entity_field_class";
 
 	protected final Logger log = LoggerFactory.getLogger(getClass());
 
 	private MongoTemplate mongoTemplate;
-
 	private EntityManagerFactory entityManagerFactory;
 
 	public void setMongoTemplate(MongoTemplate mongoTemplate) {
@@ -113,12 +109,14 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 	 * @see org.springframework.data.crossstore.ChangeSetPersister#getPersistentId(org.springframework.data.crossstore.ChangeSetBacked, org.springframework.data.crossstore.ChangeSet)
 	 */
 	public Object getPersistentId(ChangeSetBacked entity, ChangeSet cs) throws DataAccessException {
+
 		log.debug("getPersistentId called on " + entity);
+
 		if (entityManagerFactory == null) {
 			throw new DataAccessResourceFailureException("EntityManagerFactory cannot be null");
 		}
-		Object o = entityManagerFactory.getPersistenceUnitUtil().getIdentifier(entity);
-		return o;
+
+		return entityManagerFactory.getPersistenceUnitUtil().getIdentifier(entity);
 	}
 
 	/*

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

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

spring-data-mongodb-distribution/pom.xml

@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.4.0.M1</version>
+		<version>1.4.4.BUILD-SNAPSHOT</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.4.0.M1</version>
+		<version>1.4.4.BUILD-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-mongodb-log4j/template.mf

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

spring-data-mongodb/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.4.0.M1</version>
+		<version>1.4.4.BUILD-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -26,22 +26,18 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-tx</artifactId>
-			<version>${spring}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<version>${spring}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
-			<version>${spring}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
-			<version>${spring}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>commons-logging</groupId>
@@ -52,7 +48,6 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-expression</artifactId>
-			<version>${spring}</version>
 		</dependency>
 
 		<!--  Spring Data -->
@@ -142,6 +137,13 @@
 			<scope>test</scope>
 		</dependency>
 		
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jul-to-slf4j</artifactId>
+			<version>${slf4j}</version>
+			<scope>test</scope>
+		</dependency>
+		
 	</dependencies>
 	
 	<build>
@@ -150,7 +152,7 @@
 			<plugin>
 				<groupId>com.mysema.maven</groupId>
 				<artifactId>apt-maven-plugin</artifactId>
-				<version>1.0.8</version>
+				<version>${apt}</version>
 				<dependencies>
 					<dependency>
 						<groupId>com.mysema.querydsl</groupId>

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

@@ -28,6 +28,7 @@ import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.data.annotation.Persistent;
 import org.springframework.data.authentication.UserCredentials;
 import org.springframework.data.mapping.context.MappingContextIsNewStrategyFactory;
+import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
 import org.springframework.data.mongodb.core.convert.CustomConversions;
@@ -101,7 +102,7 @@ public abstract class AbstractMongoConfiguration {
 	 * @throws Exception
 	 */
 	@Bean
-	public SimpleMongoDbFactory mongoDbFactory() throws Exception {
+	public MongoDbFactory mongoDbFactory() throws Exception {
 		return new SimpleMongoDbFactory(mongo(), getDatabaseName(), getUserCredentials(), getAuthenticationDatabaseName());
 	}
 
@@ -115,7 +116,9 @@ public abstract class AbstractMongoConfiguration {
 	 *         entities.
 	 */
 	protected String getMappingBasePackage() {
-		return getClass().getPackage().getName();
+
+		Package mappingBasePackage = getClass().getPackage();
+		return mappingBasePackage == null ? null : mappingBasePackage.getName();
 	}
 
 	/**

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,6 +57,7 @@ class GridFsTemplateParser extends AbstractBeanDefinitionParser {
 
 		String converterRef = element.getAttribute("converter-ref");
 		String dbFactoryRef = element.getAttribute("db-factory-ref");
+		String bucket = element.getAttribute("bucket");
 
 		BeanDefinitionBuilder gridFsTemplateBuilder = BeanDefinitionBuilder.genericBeanDefinition(GridFsTemplate.class);
 
@@ -72,6 +73,10 @@ class GridFsTemplateParser extends AbstractBeanDefinitionParser {
 			gridFsTemplateBuilder.addConstructorArgReference(BeanNames.DEFAULT_CONVERTER_BEAN_NAME);
 		}
 
+		if (StringUtils.hasText(bucket)) {
+			gridFsTemplateBuilder.addConstructorArgValue(bucket);
+		}
+
 		return (AbstractBeanDefinition) helper.getComponentIdButFallback(gridFsTemplateBuilder, BeanNames.GRID_FS_TEMPLATE)
 				.getBeanDefinition();
 	}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2013 the original author or authors.
+ * Copyright 2011-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -71,11 +71,12 @@ import org.w3c.dom.Element;
  * @author Oliver Gierke
  * @author Maciej Walkowiak
  * @author Thomas Darimont
+ * @author Christoph Strobl
  */
 public class MappingMongoConverterParser implements BeanDefinitionParser {
 
 	private static final String BASE_PACKAGE = "base-package";
-	private static final boolean jsr303Present = ClassUtils.isPresent("javax.validation.Validator",
+	private static final boolean JSR_303_PRESENT = ClassUtils.isPresent("javax.validation.Validator",
 			MappingMongoConverterParser.class.getClassLoader());
 
 	/* (non-Javadoc)
@@ -83,8 +84,11 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 	 */
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 
-		BeanDefinitionRegistry registry = parserContext.getRegistry();
+		if (parserContext.isNested()) {
+			parserContext.getReaderContext().error("Mongo Converter must not be defined as nested bean.", element);
+		}
 
+		BeanDefinitionRegistry registry = parserContext.getRegistry();
 		String id = element.getAttribute(AbstractBeanDefinitionParser.ID_ATTRIBUTE);
 		id = StringUtils.hasText(id) ? id : "mappingConverter";
 
@@ -166,7 +170,7 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 
 	private RuntimeBeanReference getValidator(Object source, ParserContext parserContext) {
 
-		if (!jsr303Present) {
+		if (!JSR_303_PRESENT) {
 			return null;
 		}
 
@@ -195,7 +199,8 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 		BeanDefinitionBuilder mappingContextBuilder = BeanDefinitionBuilder
 				.genericBeanDefinition(MongoMappingContext.class);
 
-		Set<String> classesToAdd = getInititalEntityClasses(element, mappingContextBuilder);
+		Set<String> classesToAdd = getInititalEntityClasses(element);
+
 		if (classesToAdd != null) {
 			mappingContextBuilder.addPropertyValue("initialEntitySet", classesToAdd);
 		}
@@ -262,7 +267,7 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 		return null;
 	}
 
-	private static Set<String> getInititalEntityClasses(Element element, BeanDefinitionBuilder builder) {
+	private static Set<String> getInititalEntityClasses(Element element) {
 
 		String basePackage = element.getAttribute(BASE_PACKAGE);
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,17 +15,24 @@
  */
 package org.springframework.data.mongodb.config;
 
+import static org.springframework.beans.factory.config.BeanDefinition.*;
+import static org.springframework.data.mongodb.config.BeanNames.*;
+
 import java.lang.annotation.Annotation;
 
 import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.support.RootBeanDefinition;
 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.config.ParsingUtils;
 import org.springframework.data.mapping.context.MappingContextIsNewStrategyFactory;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.event.AuditingEventListener;
 import org.springframework.data.support.IsNewStrategyFactory;
 import org.springframework.util.Assert;
@@ -57,7 +64,7 @@ class MongoAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
 		Assert.notNull(annotationMetadata, "AnnotationMetadata must not be null!");
 		Assert.notNull(registry, "BeanDefinitionRegistry must not be null!");
 
-		registerIsNewStrategyFactoryIfNecessary(registry);
+		defaultDependenciesIfNecessary(registry, annotationMetadata);
 		super.registerBeanDefinitions(annotationMetadata, registry);
 	}
 
@@ -92,14 +99,33 @@ class MongoAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
 	}
 
 	/**
-	 * @param registry, the {@link BeanDefinitionRegistry} to use to register an {@link IsNewStrategyFactory} to.
+	 * Register default bean definitions for a {@link MongoMappingContext} and an {@link IsNewStrategyFactory} in case we
+	 * don't find beans with the assumed names in the registry.
+	 * 
+	 * @param registry the {@link BeanDefinitionRegistry} to use to register the components into.
+	 * @param source the source which the registered components shall be registered with
 	 */
-	private void registerIsNewStrategyFactoryIfNecessary(BeanDefinitionRegistry registry) {
+	private void defaultDependenciesIfNecessary(BeanDefinitionRegistry registry, Object source) {
 
-		if (!registry.containsBeanDefinition(BeanNames.IS_NEW_STRATEGY_FACTORY)) {
-			registry.registerBeanDefinition(BeanNames.IS_NEW_STRATEGY_FACTORY,
-					BeanDefinitionBuilder.rootBeanDefinition(MappingContextIsNewStrategyFactory.class)
-							.addConstructorArgReference(BeanNames.MAPPING_CONTEXT).getBeanDefinition());
+		if (!registry.containsBeanDefinition(MAPPING_CONTEXT)) {
+
+			RootBeanDefinition definition = new RootBeanDefinition(MongoMappingContext.class);
+			definition.setRole(ROLE_INFRASTRUCTURE);
+			definition.setSource(source);
+
+			registry.registerBeanDefinition(MAPPING_CONTEXT, definition);
+		}
+
+		if (!registry.containsBeanDefinition(IS_NEW_STRATEGY_FACTORY)) {
+
+			BeanDefinitionBuilder builder = BeanDefinitionBuilder
+					.rootBeanDefinition(MappingContextIsNewStrategyFactory.class);
+			builder.addConstructorArgReference(MAPPING_CONTEXT);
+
+			AbstractBeanDefinition definition = ParsingUtils.getSourceBeanDefinition(builder, source);
+			definition.setRole(ROLE_INFRASTRUCTURE);
+
+			registry.registerBeanDefinition(IS_NEW_STRATEGY_FACTORY, definition);
 		}
 	}
 }

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

@@ -16,12 +16,14 @@
 package org.springframework.data.mongodb.config;
 
 import java.beans.PropertyEditorSupport;
+import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.HashSet;
 import java.util.Set;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 import com.mongodb.ServerAddress;
@@ -35,6 +37,11 @@ import com.mongodb.ServerAddress;
  */
 public class ServerAddressPropertyEditor extends PropertyEditorSupport {
 
+	/**
+	 * A port is a number without a leading 0 at the end of the address that is proceeded by just a single :.
+	 */
+	private static final String HOST_PORT_SPLIT_PATTERN = "(?<!:):(?=[123456789]\\d*$)";
+	private static final String COULD_NOT_PARSE_ADDRESS_MESSAGE = "Could not parse address {} '{}'. Check your replica set configuration!";
 	private static final Logger LOG = LoggerFactory.getLogger(ServerAddressPropertyEditor.class);
 
 	/*
@@ -77,22 +84,53 @@ public class ServerAddressPropertyEditor extends PropertyEditorSupport {
 	 */
 	private ServerAddress parseServerAddress(String source) {
 
-		String[] hostAndPort = StringUtils.delimitedListToStringArray(source.trim(), ":");
+		if (!StringUtils.hasText(source)) {
+			LOG.warn(COULD_NOT_PARSE_ADDRESS_MESSAGE, "source", source);
+			return null;
+		}
 
-		if (!StringUtils.hasText(source) || hostAndPort.length > 2) {
-			LOG.warn("Could not parse address source '{}'. Check your replica set configuration!", source);
+		String[] hostAndPort = extractHostAddressAndPort(source.trim());
+
+		if (hostAndPort.length > 2) {
+			LOG.warn(COULD_NOT_PARSE_ADDRESS_MESSAGE, "source", source);
 			return null;
 		}
 
 		try {
-			return hostAndPort.length == 1 ? new ServerAddress(hostAndPort[0]) : new ServerAddress(hostAndPort[0],
-					Integer.parseInt(hostAndPort[1]));
+			InetAddress hostAddress = InetAddress.getByName(hostAndPort[0]);
+			Integer port = hostAndPort.length == 1 ? null : Integer.parseInt(hostAndPort[1]);
+
+			return port == null ? new ServerAddress(hostAddress) : new ServerAddress(hostAddress, port);
 		} catch (UnknownHostException e) {
-			LOG.warn("Could not parse host '{}'. Check your replica set configuration!", hostAndPort[0]);
+			LOG.warn(COULD_NOT_PARSE_ADDRESS_MESSAGE, "host", hostAndPort[0]);
 		} catch (NumberFormatException e) {
-			LOG.warn("Could not parse port '{}'. Check your replica set configuration!", hostAndPort[1]);
+			LOG.warn(COULD_NOT_PARSE_ADDRESS_MESSAGE, "port", hostAndPort[1]);
 		}
 
 		return null;
 	}
+
+	/**
+	 * Extract the host and port from the given {@link String}.
+	 * 
+	 * @param addressAndPortSource must not be {@literal null}.
+	 * @return
+	 */
+	private String[] extractHostAddressAndPort(String addressAndPortSource) {
+
+		Assert.notNull(addressAndPortSource, "Address and port source must not be null!");
+
+		String[] hostAndPort = addressAndPortSource.split(HOST_PORT_SPLIT_PATTERN);
+		String hostAddress = hostAndPort[0];
+
+		if (isHostAddressInIPv6BracketNotation(hostAddress)) {
+			hostAndPort[0] = hostAddress.substring(1, hostAddress.length() - 1);
+		}
+
+		return hostAndPort;
+	}
+
+	private boolean isHostAddressInIPv6BracketNotation(String hostAddress) {
+		return hostAddress.startsWith("[") && hostAddress.endsWith("]");
+	}
 }

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

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

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

@@ -60,6 +60,11 @@ public class MongoExceptionTranslator implements PersistenceExceptionTranslator
 			return new DataAccessResourceFailureException(ex.getMessage(), ex);
 		}
 
+		// Driver 2.12 throws this to indicate connection problems. String comparison to avoid hard dependency
+		if (ex.getClass().getName().equals("com.mongodb.MongoServerSelectionException")) {
+			return new DataAccessResourceFailureException(ex.getMessage(), ex);
+		}
+
 		if (ex instanceof MongoInternalException) {
 			return new InvalidDataAccessResourceUsageException(ex.getMessage(), ex);
 		}

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

@@ -1,6 +1,6 @@
 /*
- * Copyright 2010-2013 the original author or authors.
- *
+ * Copyright 2011-2014 the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -468,10 +468,32 @@ public interface MongoOperations {
 	 */
 	<T> T findOne(Query query, Class<T> entityClass, String collectionName);
 
+	/**
+	 * Determine result of given {@link Query} contains at least one element.
+	 * 
+	 * @param query the {@link Query} class that specifies the criteria used to find a record.
+	 * @param collectionName name of the collection to check for objects.
+	 * @return
+	 */
 	boolean exists(Query query, String collectionName);
 
+	/**
+	 * Determine result of given {@link Query} contains at least one element.
+	 * 
+	 * @param query the {@link Query} class that specifies the criteria used to find a record.
+	 * @param entityClass the parameterized type.
+	 * @return
+	 */
 	boolean exists(Query query, Class<?> entityClass);
 
+	/**
+	 * Determine result of given {@link Query} contains at least one element.
+	 * 
+	 * @param query the {@link Query} class that specifies the criteria used to find a record.
+	 * @param entityClass the parameterized type.
+	 * @param collectionName name of the collection to check for objects.
+	 * @return
+	 */
 	boolean exists(Query query, Class<?> entityClass, String collectionName);
 
 	/**
@@ -529,12 +551,58 @@ public interface MongoOperations {
 	 */
 	<T> T findById(Object id, Class<T> entityClass, String collectionName);
 
+	/**
+	 * Triggers <a href="http://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify<a/>
+	 * to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query}.
+	 * 
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
+	 *          fields specification.
+	 * @param update the {@link Update} to apply on matching documents.
+	 * @param entityClass the parameterized type.
+	 * @return
+	 */
 	<T> T findAndModify(Query query, Update update, Class<T> entityClass);
 
+	/**
+	 * Triggers <a href="http://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify<a/>
+	 * to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query}.
+	 * 
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
+	 *          fields specification.
+	 * @param update the {@link Update} to apply on matching documents.
+	 * @param entityClass the parameterized type.
+	 * @param collectionName the collection to query.
+	 * @return
+	 */
 	<T> T findAndModify(Query query, Update update, Class<T> entityClass, String collectionName);
 
+	/**
+	 * Triggers <a href="http://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify<a/>
+	 * to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query} taking
+	 * {@link FindAndModifyOptions} into account.
+	 * 
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
+	 *          fields specification.
+	 * @param update the {@link Update} to apply on matching documents.
+	 * @param options the {@link FindAndModifyOptions} holding additional information.
+	 * @param entityClass the parameterized type.
+	 * @return
+	 */
 	<T> T findAndModify(Query query, Update update, FindAndModifyOptions options, Class<T> entityClass);
 
+	/**
+	 * Triggers <a href="http://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify<a/>
+	 * to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query} taking
+	 * {@link FindAndModifyOptions} into account.
+	 * 
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
+	 *          fields specification.
+	 * @param update the {@link Update} to apply on matching documents.
+	 * @param options the {@link FindAndModifyOptions} holding additional information.
+	 * @param entityClass the parameterized type.
+	 * @param collectionName the collection to query.
+	 * @return
+	 */
 	<T> T findAndModify(Query query, Update update, FindAndModifyOptions options, Class<T> entityClass,
 			String collectionName);
 
@@ -598,9 +666,9 @@ public interface MongoOperations {
 	 * <p/>
 	 * If you object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
 	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
-	 * property type will be handled by Spring's BeanWrapper class that leverages Spring 3.0's new Type Conversion API.
-	 * See <a href="http://static.springsource.org/spring/docs/3.0.x/reference/validation.html#core-convert">Spring 3 Type
-	 * Conversion"</a> for more details.
+	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See <a
+	 * href="http://docs.spring.io/spring/docs/current/spring-framework-reference/html/validation.html#core-convert"
+	 * >Spring's Type Conversion"</a> for more details.
 	 * <p/>
 	 * <p/>
 	 * Insert is used to initially store the object into the database. To update an existing object use the save method.
@@ -655,9 +723,9 @@ public interface MongoOperations {
 	 * <p/>
 	 * If you object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
 	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
-	 * property type will be handled by Spring's BeanWrapper class that leverages Spring 3.0's new Type Conversion API.
-	 * See <a href="http://static.springsource.org/spring/docs/3.0.x/reference/validation.html#core-convert">Spring 3 Type
-	 * Conversion"</a> for more details.
+	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See <a
+	 * href="http://docs.spring.io/spring/docs/current/spring-framework-reference/html/validation.html#core-convert"
+	 * >Spring's Type Conversion"</a> for more details.
 	 * 
 	 * @param objectToSave the object to store in the collection
 	 */
@@ -672,9 +740,9 @@ public interface MongoOperations {
 	 * <p/>
 	 * If you object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
 	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
-	 * property type will be handled by Spring's BeanWrapper class that leverages Spring 3.0's new Type Cobnversion API.
-	 * See <a href="http://static.springsource.org/spring/docs/3.0.x/reference/validation.html#core-convert">Spring 3 Type
-	 * Conversion"</a> for more details.
+	 * property type will be handled by Spring's BeanWrapper class that leverages Type Cobnversion API. See <a
+	 * http://docs.spring.io/spring/docs/current/spring-framework-reference/html/validation.html#core-convert">Spring's
+	 * Type Conversion"</a> for more details.
 	 * 
 	 * @param objectToSave the object to store in the collection
 	 * @param collectionName name of the collection to store the object in
@@ -814,6 +882,14 @@ public interface MongoOperations {
 	 */
 	void remove(Query query, Class<?> entityClass);
 
+	/**
+	 * Remove all documents that match the provided query document criteria from the the collection used to store the
+	 * entityClass. The Class parameter is also used to help convert the Id of the object if it is present in the query.
+	 * 
+	 * @param query
+	 * @param entityClass
+	 * @param collectionName
+	 */
 	void remove(Query query, Class<?> entityClass, String collectionName);
 
 	/**

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 the original author or authors.
+ * Copyright 2010-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,27 +30,28 @@ import com.mongodb.MongoOptions;
  * @author Mike Saavedra
  * @author Thomas Darimont
  */
+@SuppressWarnings("deprecation")
 public class MongoOptionsFactoryBean implements FactoryBean<MongoOptions>, InitializingBean {
 
-	@SuppressWarnings("deprecation")//
-	private final MongoOptions MONGO_OPTIONS = new MongoOptions();
+	private static final MongoOptions DEFAULT_MONGO_OPTIONS = new MongoOptions();
 
-	private int connectionsPerHost = MONGO_OPTIONS.connectionsPerHost;
-
-	private int threadsAllowedToBlockForConnectionMultiplier = MONGO_OPTIONS.threadsAllowedToBlockForConnectionMultiplier;
-	private int maxWaitTime = MONGO_OPTIONS.maxWaitTime;
-	private int connectTimeout = MONGO_OPTIONS.connectTimeout;
-	private int socketTimeout = MONGO_OPTIONS.socketTimeout;
-	private boolean socketKeepAlive = MONGO_OPTIONS.socketKeepAlive;
-	private boolean autoConnectRetry = MONGO_OPTIONS.autoConnectRetry;
-	private long maxAutoConnectRetryTime = MONGO_OPTIONS.maxAutoConnectRetryTime;
-	private int writeNumber;
-	private int writeTimeout;
-	private boolean writeFsync;
-	@SuppressWarnings("deprecation") private boolean slaveOk = MONGO_OPTIONS.slaveOk;
+	private int connectionsPerHost = DEFAULT_MONGO_OPTIONS.connectionsPerHost;
+	private int threadsAllowedToBlockForConnectionMultiplier = DEFAULT_MONGO_OPTIONS.threadsAllowedToBlockForConnectionMultiplier;
+	private int maxWaitTime = DEFAULT_MONGO_OPTIONS.maxWaitTime;
+	private int connectTimeout = DEFAULT_MONGO_OPTIONS.connectTimeout;
+	private int socketTimeout = DEFAULT_MONGO_OPTIONS.socketTimeout;
+	private boolean socketKeepAlive = DEFAULT_MONGO_OPTIONS.socketKeepAlive;
+	private boolean autoConnectRetry = DEFAULT_MONGO_OPTIONS.autoConnectRetry;
+	private long maxAutoConnectRetryTime = DEFAULT_MONGO_OPTIONS.maxAutoConnectRetryTime;
+	private int writeNumber = DEFAULT_MONGO_OPTIONS.w;
+	private int writeTimeout = DEFAULT_MONGO_OPTIONS.wtimeout;
+	private boolean writeFsync = DEFAULT_MONGO_OPTIONS.fsync;
+	private boolean slaveOk = DEFAULT_MONGO_OPTIONS.slaveOk;
 	private boolean ssl;
 	private SSLSocketFactory sslSocketFactory;
 
+	private MongoOptions options;
+
 	/**
 	 * Configures the maximum number of connections allowed per host until we will block.
 	 * 
@@ -197,24 +198,28 @@ public class MongoOptionsFactoryBean implements FactoryBean<MongoOptions>, Initi
 	 * (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;
-		MONGO_OPTIONS.connectTimeout = connectTimeout;
-		MONGO_OPTIONS.socketTimeout = socketTimeout;
-		MONGO_OPTIONS.socketKeepAlive = socketKeepAlive;
-		MONGO_OPTIONS.autoConnectRetry = autoConnectRetry;
-		MONGO_OPTIONS.maxAutoConnectRetryTime = maxAutoConnectRetryTime;
-		MONGO_OPTIONS.slaveOk = slaveOk;
-		MONGO_OPTIONS.w = writeNumber;
-		MONGO_OPTIONS.wtimeout = writeTimeout;
-		MONGO_OPTIONS.fsync = writeFsync;
+		MongoOptions options = new MongoOptions();
+
+		options.connectionsPerHost = connectionsPerHost;
+		options.threadsAllowedToBlockForConnectionMultiplier = threadsAllowedToBlockForConnectionMultiplier;
+		options.maxWaitTime = maxWaitTime;
+		options.connectTimeout = connectTimeout;
+		options.socketTimeout = socketTimeout;
+		options.socketKeepAlive = socketKeepAlive;
+		options.autoConnectRetry = autoConnectRetry;
+		options.maxAutoConnectRetryTime = maxAutoConnectRetryTime;
+		options.slaveOk = slaveOk;
+		options.w = writeNumber;
+		options.wtimeout = writeTimeout;
+		options.fsync = writeFsync;
+
 		if (ssl) {
-			MONGO_OPTIONS.setSocketFactory(sslSocketFactory != null ? sslSocketFactory : SSLSocketFactory.getDefault());
+			options.setSocketFactory(sslSocketFactory != null ? sslSocketFactory : SSLSocketFactory.getDefault());
 		}
+
+		this.options = options;
 	}
 
 	/*
@@ -222,7 +227,7 @@ public class MongoOptionsFactoryBean implements FactoryBean<MongoOptions>, Initi
 	 * @see org.springframework.beans.factory.FactoryBean#getObject()
 	 */
 	public MongoOptions getObject() {
-		return MONGO_OPTIONS;
+		return this.options;
 	}
 
 	/*

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 the original author or authors.
+ * Copyright 2010-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -127,6 +127,7 @@ import com.mongodb.util.JSONParseException;
  * @author Sebastian Herold
  * @author Thomas Darimont
  * @author Chuong Ngo
+ * @author Christoph Strobl
  */
 public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 
@@ -351,7 +352,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	}
 
 	public void executeQuery(Query query, String collectionName, DocumentCallbackHandler dch) {
-		executeQuery(query, collectionName, dch, new QueryCursorPreparer(query));
+		executeQuery(query, collectionName, dch, new QueryCursorPreparer(query, null));
 	}
 
 	/**
@@ -369,12 +370,12 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 
 		Assert.notNull(query);
 
-		DBObject queryObject = query.getQueryObject();
+		DBObject queryObject = queryMapper.getMappedObject(query.getQueryObject(), null);
 		DBObject sortObject = query.getSortObject();
 		DBObject fieldsObject = query.getFieldsObject();
 
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug(String.format("Executing query: %s sort: %s fields: %s in collection: $s",
+			LOGGER.debug(String.format("Executing query: %s sort: %s fields: %s in collection: %s",
 					serializeToJsonSafely(queryObject), sortObject, fieldsObject, collectionName));
 		}
 
@@ -529,7 +530,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		}
 
 		return doFind(collectionName, query.getQueryObject(), query.getFieldsObject(), entityClass,
-				new QueryCursorPreparer(query));
+				new QueryCursorPreparer(query, entityClass));
 	}
 
 	public <T> T findById(Object id, Class<T> entityClass) {
@@ -611,8 +612,8 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 
 	public <T> T findAndModify(Query query, Update update, FindAndModifyOptions options, Class<T> entityClass,
 			String collectionName) {
-		return doFindAndModify(collectionName, query.getQueryObject(), query.getFieldsObject(), query.getSortObject(),
-				entityClass, update, options);
+		return doFindAndModify(collectionName, query.getQueryObject(), query.getFieldsObject(),
+				getMappedSortObject(query, entityClass), entityClass, update, options);
 	}
 
 	// Find methods that take a Query to express the query and that return a single object that is also removed from the
@@ -623,8 +624,9 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	}
 
 	public <T> T findAndRemove(Query query, Class<T> entityClass, String collectionName) {
-		return doFindAndRemove(collectionName, query.getQueryObject(), query.getFieldsObject(), query.getSortObject(),
-				entityClass);
+
+		return doFindAndRemove(collectionName, query.getQueryObject(), query.getFieldsObject(),
+				getMappedSortObject(query, entityClass), entityClass);
 	}
 
 	public long count(Query query, Class<?> entityClass) {
@@ -996,6 +998,8 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 
 				MongoPersistentEntity<?> entity = entityClass == null ? null : getPersistentEntity(entityClass);
 
+				increaseVersionForUpdateIfNecessary(entity, update);
+
 				DBObject queryObj = query == null ? new BasicDBObject() : queryMapper.getMappedObject(query.getQueryObject(),
 						entity);
 				DBObject updateObj = update == null ? new BasicDBObject() : updateMapper.getMappedObject(
@@ -1013,7 +1017,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 						: collection.update(queryObj, updateObj, upsert, multi, writeConcernToUse);
 
 				if (entity != null && entity.hasVersionProperty() && !multi) {
-					if (writeResult.getN() == 0) {
+					if (writeResult.getN() == 0 && dbObjectContainsVersionProperty(queryObj, entity)) {
 						throw new OptimisticLockingFailureException("Optimistic lock exception on saving entity: "
 								+ updateObj.toMap().toString() + " to collection " + collectionName);
 					}
@@ -1025,6 +1029,25 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		});
 	}
 
+	private void increaseVersionForUpdateIfNecessary(MongoPersistentEntity<?> persistentEntity, Update update) {
+
+		if (persistentEntity != null && persistentEntity.hasVersionProperty()) {
+			String versionFieldName = persistentEntity.getVersionProperty().getFieldName();
+			if (!update.modifies(versionFieldName)) {
+				update.inc(versionFieldName, 1L);
+			}
+		}
+	}
+
+	private boolean dbObjectContainsVersionProperty(DBObject dbObject, MongoPersistentEntity<?> persistentEntity) {
+
+		if (persistentEntity == null || !persistentEntity.hasVersionProperty()) {
+			return false;
+		}
+
+		return dbObject.containsField(persistentEntity.getVersionProperty().getFieldName());
+	}
+
 	public void remove(Object object) {
 
 		if (object == null) {
@@ -1167,6 +1190,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 
 	public <T> MapReduceResults<T> mapReduce(Query query, String inputCollectionName, String mapFunction,
 			String reduceFunction, MapReduceOptions mapReduceOptions, Class<T> entityClass) {
+
 		String mapFunc = replaceWithResourceIfNecessary(mapFunction);
 		String reduceFunc = replaceWithResourceIfNecessary(reduceFunction);
 		DBCollection inputCollection = getCollection(inputCollectionName);
@@ -1191,12 +1215,12 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		MapReduceOutput mapReduceOutput = new MapReduceOutput(inputCollection, commandObject, commandResult);
 		List<T> mappedResults = new ArrayList<T>();
 		DbObjectCallback<T> callback = new ReadDbObjectCallback<T>(mongoConverter, entityClass);
+
 		for (DBObject dbObject : mapReduceOutput.results()) {
 			mappedResults.add(callback.doWith(dbObject));
 		}
 
-		MapReduceResults<T> mapReduceResult = new MapReduceResults<T>(mappedResults, commandResult);
-		return mapReduceResult;
+		return new MapReduceResults<T>(mappedResults, commandResult);
 	}
 
 	public <T> GroupByResults<T> group(String inputCollectionName, GroupBy groupBy, Class<T> entityClass) {
@@ -1250,15 +1274,14 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 
 		@SuppressWarnings("unchecked")
 		Iterable<DBObject> resultSet = (Iterable<DBObject>) commandResult.get("retval");
-
 		List<T> mappedResults = new ArrayList<T>();
 		DbObjectCallback<T> callback = new ReadDbObjectCallback<T>(mongoConverter, entityClass);
+
 		for (DBObject dbObject : resultSet) {
 			mappedResults.add(callback.doWith(dbObject));
 		}
-		GroupByResults<T> groupByResult = new GroupByResults<T>(mappedResults, commandResult);
-		return groupByResult;
 
+		return new GroupByResults<T>(mappedResults, commandResult);
 	}
 
 	@Override
@@ -1348,13 +1371,13 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 						"Can not use skip or field specification with map reduce operations");
 			}
 			if (query.getQueryObject() != null) {
-				copyMapReduceOptions.put("query", query.getQueryObject());
+				copyMapReduceOptions.put("query", queryMapper.getMappedObject(query.getQueryObject(), null));
 			}
 			if (query.getLimit() > 0) {
 				copyMapReduceOptions.put("limit", query.getLimit());
 			}
 			if (query.getSortObject() != null) {
-				copyMapReduceOptions.put("sort", query.getSortObject());
+				copyMapReduceOptions.put("sort", queryMapper.getMappedObject(query.getSortObject(), null));
 			}
 		}
 		return copyMapReduceOptions;
@@ -1551,8 +1574,10 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 
 		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(entityClass);
 
-		DBObject mappedUpdate = queryMapper.getMappedObject(update.getUpdateObject(), entity);
+		increaseVersionForUpdateIfNecessary(entity, update);
+
 		DBObject mappedQuery = queryMapper.getMappedObject(query, entity);
+		DBObject mappedUpdate = updateMapper.getMappedObject(update.getUpdateObject(), entity);
 
 		if (LOGGER.isDebugEnabled()) {
 			LOGGER.debug("findAndModify using query: " + mappedQuery + " fields: " + fields + " sort: " + sort
@@ -1834,6 +1859,16 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		return converter;
 	}
 
+	private DBObject getMappedSortObject(Query query, Class<?> type) {
+
+		if (query == null || query.getSortObject() == null) {
+			return null;
+		}
+
+		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(type);
+		return queryMapper.getMappedObject(query.getSortObject(), entity);
+	}
+
 	// Callback implementations
 
 	/**
@@ -2027,9 +2062,12 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	class QueryCursorPreparer implements CursorPreparer {
 
 		private final Query query;
+		private final Class<?> type;
+
+		public QueryCursorPreparer(Query query, Class<?> type) {
 
-		public QueryCursorPreparer(Query query) {
 			this.query = query;
+			this.type = type;
 		}
 
 		/*
@@ -2057,7 +2095,8 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 					cursorToUse = cursorToUse.limit(query.getLimit());
 				}
 				if (query.getSortObject() != null) {
-					cursorToUse = cursorToUse.sort(query.getSortObject());
+					DBObject sortDbo = type != null ? getMappedSortObject(query, type) : query.getSortObject();
+					cursorToUse = cursorToUse.sort(sortDbo);
 				}
 				if (StringUtils.hasText(query.getHint())) {
 					cursorToUse = cursorToUse.hint(query.getHint());

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -248,7 +248,7 @@ public class Aggregation {
 
 			if (operation instanceof FieldsExposingAggregationOperation) {
 				FieldsExposingAggregationOperation exposedFieldsOperation = (FieldsExposingAggregationOperation) operation;
-				context = new ExposedFieldsAggregationOperationContext(exposedFieldsOperation.getFields());
+				context = new ExposedFieldsAggregationOperationContext(exposedFieldsOperation.getFields(), rootContext);
 			}
 		}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ import org.springframework.util.CompositeIterator;
  * @author Thomas Darimont
  * @since 1.3
  */
-public class ExposedFields implements Iterable<ExposedField> {
+public final class ExposedFields implements Iterable<ExposedField> {
 
 	private static final List<ExposedField> NO_FIELDS = Collections.emptyList();
 	private static final ExposedFields EMPTY = new ExposedFields(NO_FIELDS, NO_FIELDS);
@@ -268,14 +268,21 @@ public class ExposedFields implements Iterable<ExposedField> {
 			return field.isAliased();
 		}
 
+		/**
+		 * @return the synthetic
+		 */
+		public boolean isSynthetic() {
+			return synthetic;
+		}
+
 		/**
 		 * Returns whether the field can be referred to using the given name.
 		 * 
-		 * @param input
+		 * @param name
 		 * @return
 		 */
-		public boolean canBeReferredToBy(String input) {
-			return getTarget().equals(input);
+		public boolean canBeReferredToBy(String name) {
+			return getName().equals(name) || getTarget().equals(name);
 		}
 
 		/*
@@ -340,14 +347,8 @@ public class ExposedFields implements Iterable<ExposedField> {
 		public FieldReference(ExposedField field) {
 
 			Assert.notNull(field, "ExposedField must not be null!");
-			this.field = field;
-		}
 
-		/**
-		 * @return
-		 */
-		public boolean isSynthetic() {
-			return field.synthetic;
+			this.field = field;
 		}
 
 		/**
@@ -361,6 +362,16 @@ public class ExposedFields implements Iterable<ExposedField> {
 			return field.synthetic ? target : String.format("%s.%s", Fields.UNDERSCORE_ID, target);
 		}
 
+		/**
+		 * Returns the referenve value for the given field reference. Will return 1 for a synthetic, unaliased field or the
+		 * raw rendering of the reference otherwise.
+		 * 
+		 * @return
+		 */
+		public Object getReferenceValue() {
+			return field.synthetic && !field.isAliased() ? 1 : toString();
+		}
+
 		/*
 		 * (non-Javadoc)
 		 * @see java.lang.Object#toString()

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,16 +32,22 @@ import com.mongodb.DBObject;
 class ExposedFieldsAggregationOperationContext implements AggregationOperationContext {
 
 	private final ExposedFields exposedFields;
+	private final AggregationOperationContext rootContext;
 
 	/**
-	 * Creates a new {@link ExposedFieldsAggregationOperationContext} from the given {@link ExposedFields}.
+	 * Creates a new {@link ExposedFieldsAggregationOperationContext} from the given {@link ExposedFields}. Uses the given
+	 * {@link AggregationOperationContext} to perform a mapping to mongo types if necessary.
 	 * 
 	 * @param exposedFields must not be {@literal null}.
+	 * @param rootContext must not be {@literal null}.
 	 */
-	public ExposedFieldsAggregationOperationContext(ExposedFields exposedFields) {
+	public ExposedFieldsAggregationOperationContext(ExposedFields exposedFields, AggregationOperationContext rootContext) {
 
 		Assert.notNull(exposedFields, "ExposedFields must not be null!");
+		Assert.notNull(rootContext, "RootContext must not be null!");
+
 		this.exposedFields = exposedFields;
+		this.rootContext = rootContext;
 	}
 
 	/* 
@@ -50,7 +56,7 @@ class ExposedFieldsAggregationOperationContext implements AggregationOperationCo
 	 */
 	@Override
 	public DBObject getMappedObject(DBObject dbObject) {
-		return dbObject;
+		return rootContext.getMappedObject(dbObject);
 	}
 
 	/* 
@@ -59,7 +65,7 @@ class ExposedFieldsAggregationOperationContext implements AggregationOperationCo
 	 */
 	@Override
 	public FieldReference getReference(Field field) {
-		return getReference(field.getTarget());
+		return getReference(field, field.getTarget());
 	}
 
 	/* 
@@ -68,11 +74,42 @@ class ExposedFieldsAggregationOperationContext implements AggregationOperationCo
 	 */
 	@Override
 	public FieldReference getReference(String name) {
+		return getReference(null, name);
+	}
 
-		ExposedField field = exposedFields.getField(name);
+	/**
+	 * Returns a {@link FieldReference} to the given {@link Field} with the given {@code name}.
+	 * 
+	 * @param field may be {@literal null}
+	 * @param name must not be {@literal null}
+	 * @return
+	 */
+	private FieldReference getReference(Field field, String name) {
 
-		if (field != null) {
-			return new FieldReference(field);
+		Assert.notNull(name, "Name must not be null!");
+
+		ExposedField exposedField = exposedFields.getField(name);
+
+		if (exposedField != null) {
+
+			if (field != null) {
+				// we return a FieldReference to the given field directly to make sure that we reference the proper alias here.
+				return new FieldReference(new ExposedField(field, exposedField.isSynthetic()));
+			}
+
+			return new FieldReference(exposedField);
+		}
+
+		if (name.contains(".")) {
+
+			// for nested field references we only check that the root field exists.
+			ExposedField rootField = exposedFields.getField(name.split("\\.")[0]);
+
+			if (rootField != null) {
+
+				// We have to synthetic to true, in order to render the field-name as is.
+				return new FieldReference(new ExposedField(name, true));
+			}
 		}
 
 		throw new IllegalArgumentException(String.format("Invalid reference '%s'!", name));

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,13 +32,13 @@ import org.springframework.util.StringUtils;
  * @author Oliver Gierke
  * @since 1.3
  */
-public class Fields implements Iterable<Field> {
+public final class Fields implements Iterable<Field> {
 
 	private static final String AMBIGUOUS_EXCEPTION = "Found two fields both using '%s' as name: %s and %s! Please "
 			+ "customize your field definitions to get to unique field names!";
 
-	public static String UNDERSCORE_ID = "_id";
-	public static String UNDERSCORE_ID_REF = "$_id";
+	public static final String UNDERSCORE_ID = "_id";
+	public static final String UNDERSCORE_ID_REF = "$_id";
 
 	private final List<Field> fields;
 
@@ -203,7 +203,7 @@ public class Fields implements Iterable<Field> {
 			Assert.hasText(nameToSet, "AggregationField name must not be null or empty!");
 
 			if (target == null && name.contains(".")) {
-				this.name = nameToSet.substring(nameToSet.indexOf(".") + 1);
+				this.name = nameToSet.substring(nameToSet.indexOf('.') + 1);
 				this.target = nameToSet;
 			} else {
 				this.name = nameToSet;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -99,7 +99,7 @@ public class GroupOperation implements FieldsExposingAggregationOperation {
 	 * 
 	 * @author Thomas Darimont
 	 */
-	public class GroupOperationBuilder {
+	public static final class GroupOperationBuilder {
 
 		private final GroupOperation groupOperation;
 		private final Operation operation;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ import java.util.Collections;
 import java.util.List;
 
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
-import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
 import org.springframework.data.mongodb.core.aggregation.ProjectionOperation.ProjectionOperationBuilder.FieldProjection;
 import org.springframework.util.Assert;
 
@@ -253,7 +252,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		public ExpressionProjectionOperationBuilder(Object value, ProjectionOperation operation, Object[] parameters) {
 
 			super(value, operation);
-			this.params = parameters;
+			this.params = parameters.clone();
 		}
 
 		/*
@@ -263,7 +262,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		@Override
 		public ProjectionOperation as(String alias) {
 
-			Field expressionField = Fields.field(alias, "expr");
+			Field expressionField = Fields.field(alias, alias);
 			return this.operation.and(new ExpressionProjection(expressionField, this.value.toString(), params));
 		}
 
@@ -295,7 +294,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 				Assert.notNull(parameters, "Parameters must not be null!");
 
 				this.expression = expression;
-				this.params = parameters;
+				this.params = parameters.clone();
 			}
 
 			/* 
@@ -317,6 +316,9 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 	 */
 	public static class ProjectionOperationBuilder extends AbstractProjectionOperationBuilder {
 
+		private static final String NUMBER_NOT_NULL = "Number must not be null!";
+		private static final String FIELD_REFERENCE_NOT_NULL = "Field reference must not be null!";
+
 		private final String name;
 		private final ProjectionOperation operation;
 		private final OperationProjection previousProjection;
@@ -383,7 +385,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		 */
 		public ProjectionOperationBuilder plus(Number number) {
 
-			Assert.notNull(number, "Number must not be null!");
+			Assert.notNull(number, NUMBER_NOT_NULL);
 			return project("add", number);
 		}
 
@@ -420,7 +422,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		 */
 		public ProjectionOperationBuilder minus(String fieldReference) {
 
-			Assert.notNull(fieldReference, "Field reference must not be null!");
+			Assert.notNull(fieldReference, FIELD_REFERENCE_NOT_NULL);
 			return project("subtract", Fields.field(fieldReference));
 		}
 
@@ -432,7 +434,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		 */
 		public ProjectionOperationBuilder multiply(Number number) {
 
-			Assert.notNull(number, "Number must not be null!");
+			Assert.notNull(number, NUMBER_NOT_NULL);
 			return project("multiply", number);
 		}
 
@@ -445,7 +447,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		 */
 		public ProjectionOperationBuilder multiply(String fieldReference) {
 
-			Assert.notNull(fieldReference, "Field reference must not be null!");
+			Assert.notNull(fieldReference, FIELD_REFERENCE_NOT_NULL);
 			return project("multiply", Fields.field(fieldReference));
 		}
 
@@ -457,7 +459,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		 */
 		public ProjectionOperationBuilder divide(Number number) {
 
-			Assert.notNull(number, "Number must not be null!");
+			Assert.notNull(number, FIELD_REFERENCE_NOT_NULL);
 			Assert.isTrue(Math.abs(number.intValue()) != 0, "Number must not be zero!");
 			return project("divide", number);
 		}
@@ -471,7 +473,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		 */
 		public ProjectionOperationBuilder divide(String fieldReference) {
 
-			Assert.notNull(fieldReference, "Field reference must not be null!");
+			Assert.notNull(fieldReference, FIELD_REFERENCE_NOT_NULL);
 			return project("divide", Fields.field(fieldReference));
 		}
 
@@ -484,7 +486,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		 */
 		public ProjectionOperationBuilder mod(Number number) {
 
-			Assert.notNull(number, "Number must not be null!");
+			Assert.notNull(number, NUMBER_NOT_NULL);
 			Assert.isTrue(Math.abs(number.intValue()) != 0, "Number must not be zero!");
 			return project("mod", number);
 		}
@@ -498,7 +500,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		 */
 		public ProjectionOperationBuilder mod(String fieldReference) {
 
-			Assert.notNull(fieldReference, "Field reference must not be null!");
+			Assert.notNull(fieldReference, FIELD_REFERENCE_NOT_NULL);
 			return project("mod", Fields.field(fieldReference));
 		}
 
@@ -626,8 +628,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 				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();
+					return context.getReference(field).getReferenceValue();
 
 				} else if (Boolean.FALSE.equals(value)) {
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -495,7 +495,7 @@ class SpelExpressionTransformer implements AggregationExpressionTransformer {
 
 			if (currentNode.hasfirstChildNotOfType(Indexer.class)) {
 				// we have a property path expression like: foo.bar -> render as reference
-				return context.getFieldReference().toString();
+				return context.addToPreviousOrReturn(context.getFieldReference().toString());
 			}
 
 			return context.addToPreviousOrReturn(currentNode.getValue());

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

@@ -88,14 +88,16 @@ public class TypeBasedAggregationOperationContext implements AggregationOperatio
 	 */
 	@Override
 	public FieldReference getReference(String name) {
-
-		PersistentPropertyPath<MongoPersistentProperty> propertyPath = mappingContext.getPersistentPropertyPath(name, type);
-
-		return getReferenceFor(field(propertyPath.getLeafProperty().getName(),
-				propertyPath.toDotPath(MongoPersistentProperty.PropertyToFieldNameConverter.INSTANCE)));
+		return getReferenceFor(field(name));
 	}
 
 	private FieldReference getReferenceFor(Field field) {
-		return new FieldReference(new ExposedField(field, true));
+
+		PersistentPropertyPath<MongoPersistentProperty> propertyPath = mappingContext.getPersistentPropertyPath(
+				field.getTarget(), type);
+		Field mappedField = field(propertyPath.getLeafProperty().getName(),
+				propertyPath.toDotPath(MongoPersistentProperty.PropertyToFieldNameConverter.INSTANCE));
+
+		return new FieldReference(new ExposedField(mappedField, true));
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2013 the original author or authors.
+ * Copyright 2011-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,13 +17,14 @@ package org.springframework.data.mongodb.core.convert;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -56,6 +57,7 @@ import org.springframework.util.Assert;
  * .
  * 
  * @author Oliver Gierke
+ * @author Thomas Darimont
  */
 public class CustomConversions {
 
@@ -67,7 +69,7 @@ public class CustomConversions {
 	private final Set<ConvertiblePair> writingPairs;
 	private final Set<Class<?>> customSimpleTypes;
 	private final SimpleTypeHolder simpleTypeHolder;
-	private final Map<Class<?>, HashMap<Class<?>, CacheValue>> cache;
+	private final ConcurrentMap<ConvertiblePair, CacheValue> customReadTargetTypes;
 
 	private final List<Object> converters;
 
@@ -90,24 +92,30 @@ public class CustomConversions {
 		this.readingPairs = new LinkedHashSet<ConvertiblePair>();
 		this.writingPairs = new LinkedHashSet<ConvertiblePair>();
 		this.customSimpleTypes = new HashSet<Class<?>>();
-		this.cache = new HashMap<Class<?>, HashMap<Class<?>, CacheValue>>();
+		this.customReadTargetTypes = new ConcurrentHashMap<GenericConverter.ConvertiblePair, 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);
-		this.converters.add(BigIntegerToStringConverter.INSTANCE);
-		this.converters.add(StringToBigIntegerConverter.INSTANCE);
-		this.converters.add(URLToStringConverter.INSTANCE);
-		this.converters.add(StringToURLConverter.INSTANCE);
-		this.converters.add(DBObjectToStringConverter.INSTANCE);
-		this.converters.addAll(JodaTimeConverters.getConvertersToRegister());
+		List<Object> toRegister = new ArrayList<Object>();
 
-		for (Object c : this.converters) {
+		toRegister.addAll(converters);
+		toRegister.add(CustomToStringConverter.INSTANCE);
+		toRegister.add(BigDecimalToStringConverter.INSTANCE);
+		toRegister.add(StringToBigDecimalConverter.INSTANCE);
+		toRegister.add(BigIntegerToStringConverter.INSTANCE);
+		toRegister.add(StringToBigIntegerConverter.INSTANCE);
+		toRegister.add(URLToStringConverter.INSTANCE);
+		toRegister.add(StringToURLConverter.INSTANCE);
+		toRegister.add(DBObjectToStringConverter.INSTANCE);
+		toRegister.addAll(JodaTimeConverters.getConvertersToRegister());
+
+		// Add user provided converters to make sure they can override the defaults
+
+		for (Object c : toRegister) {
 			registerConversion(c);
 		}
 
+		Collections.reverse(toRegister);
+
+		this.converters = Collections.unmodifiableList(toRegister);
 		this.simpleTypeHolder = new SimpleTypeHolder(customSimpleTypes, MongoSimpleTypes.HOLDER);
 	}
 
@@ -195,25 +203,25 @@ public class CustomConversions {
 	 * 
 	 * @param pair
 	 */
-	private void register(ConverterRegistration context) {
+	private void register(ConverterRegistration converterRegistration) {
 
-		ConvertiblePair pair = context.getConvertiblePair();
+		ConvertiblePair pair = converterRegistration.getConvertiblePair();
 
-		if (context.isReading()) {
+		if (converterRegistration.isReading()) {
 
 			readingPairs.add(pair);
 
-			if (LOG.isWarnEnabled() && !context.isSimpleSourceType()) {
+			if (LOG.isWarnEnabled() && !converterRegistration.isSimpleSourceType()) {
 				LOG.warn(String.format(READ_CONVERTER_NOT_SIMPLE, pair.getSourceType(), pair.getTargetType()));
 			}
 		}
 
-		if (context.isWriting()) {
+		if (converterRegistration.isWriting()) {
 
 			writingPairs.add(pair);
 			customSimpleTypes.add(pair.getSourceType());
 
-			if (LOG.isWarnEnabled() && !context.isSimpleTargetType()) {
+			if (LOG.isWarnEnabled() && !converterRegistration.isSimpleTargetType()) {
 				LOG.warn(String.format(WRITE_CONVERTER_NOT_SIMPLE, pair.getSourceType(), pair.getTargetType()));
 			}
 		}
@@ -223,11 +231,11 @@ public class CustomConversions {
 	 * Returns the target type to convert to in case we have a custom conversion registered to convert the given source
 	 * type into a Mongo native one.
 	 * 
-	 * @param source must not be {@literal null}
+	 * @param sourceType must not be {@literal null}
 	 * @return
 	 */
-	public Class<?> getCustomWriteTarget(Class<?> source) {
-		return getCustomWriteTarget(source, null);
+	public Class<?> getCustomWriteTarget(Class<?> sourceType) {
+		return getCustomWriteTarget(sourceType, null);
 	}
 
 	/**
@@ -235,72 +243,78 @@ public class CustomConversions {
 	 * oth the given expected type though. If {@code expectedTargetType} is {@literal null} we will simply return the
 	 * first target type matching or {@literal null} if no conversion can be found.
 	 * 
-	 * @param source must not be {@literal null}
-	 * @param expectedTargetType
+	 * @param sourceType must not be {@literal null}
+	 * @param requestedTargetType
 	 * @return
 	 */
-	public Class<?> getCustomWriteTarget(Class<?> source, Class<?> expectedTargetType) {
+	public Class<?> getCustomWriteTarget(Class<?> sourceType, Class<?> requestedTargetType) {
 
-		Assert.notNull(source);
-		return getCustomTarget(source, expectedTargetType, writingPairs);
+		Assert.notNull(sourceType);
+
+		return getCustomTarget(sourceType, requestedTargetType, writingPairs);
 	}
 
 	/**
 	 * Returns whether we have a custom conversion registered to write into a Mongo native type. The returned type might
-	 * be a subclass oth the given expected type though.
+	 * be a subclass of the given expected type though.
 	 * 
-	 * @param source must not be {@literal null}
+	 * @param sourceType must not be {@literal null}
 	 * @return
 	 */
-	public boolean hasCustomWriteTarget(Class<?> source) {
-		return hasCustomWriteTarget(source, null);
+	public boolean hasCustomWriteTarget(Class<?> sourceType) {
+
+		Assert.notNull(sourceType);
+		return hasCustomWriteTarget(sourceType, null);
 	}
 
 	/**
 	 * Returns whether we have a custom conversion registered to write an object of the given source type into an object
 	 * of the given Mongo native target type.
 	 * 
-	 * @param source must not be {@literal null}.
-	 * @param expectedTargetType
+	 * @param sourceType must not be {@literal null}.
+	 * @param requestedTargetType
 	 * @return
 	 */
-	public boolean hasCustomWriteTarget(Class<?> source, Class<?> expectedTargetType) {
-		return getCustomWriteTarget(source, expectedTargetType) != null;
+	public boolean hasCustomWriteTarget(Class<?> sourceType, Class<?> requestedTargetType) {
+
+		Assert.notNull(sourceType);
+		return getCustomWriteTarget(sourceType, requestedTargetType) != null;
 	}
 
 	/**
 	 * Returns whether we have a custom conversion registered to read the given source into the given target type.
 	 * 
-	 * @param source must not be {@literal null}
-	 * @param expectedTargetType must not be {@literal null}
+	 * @param sourceType must not be {@literal null}
+	 * @param requestedTargetType must not be {@literal null}
 	 * @return
 	 */
-	public boolean hasCustomReadTarget(Class<?> source, Class<?> expectedTargetType) {
+	public boolean hasCustomReadTarget(Class<?> sourceType, Class<?> requestedTargetType) {
 
-		Assert.notNull(source);
-		Assert.notNull(expectedTargetType);
+		Assert.notNull(sourceType);
+		Assert.notNull(requestedTargetType);
 
-		return getCustomReadTarget(source, expectedTargetType) != null;
+		return getCustomReadTarget(sourceType, requestedTargetType) != null;
 	}
 
 	/**
 	 * Inspects the given {@link ConvertiblePair} for ones that have a source compatible type as source. Additionally
-	 * checks assignabilty of the target type if one is given.
+	 * checks assignability of the target type if one is given.
 	 * 
-	 * @param source must not be {@literal null}
-	 * @param expectedTargetType
-	 * @param pairs must not be {@literal null}
+	 * @param sourceType must not be {@literal null}.
+	 * @param requestedTargetType can be {@literal null}.
+	 * @param pairs must not be {@literal null}.
 	 * @return
 	 */
-	private static Class<?> getCustomTarget(Class<?> source, Class<?> expectedTargetType, Iterable<ConvertiblePair> pairs) {
+	private static Class<?> getCustomTarget(Class<?> sourceType, Class<?> requestedTargetType,
+			Iterable<ConvertiblePair> pairs) {
 
-		Assert.notNull(source);
+		Assert.notNull(sourceType);
 		Assert.notNull(pairs);
 
 		for (ConvertiblePair typePair : pairs) {
-			if (typePair.getSourceType().isAssignableFrom(source)) {
+			if (typePair.getSourceType().isAssignableFrom(sourceType)) {
 				Class<?> targetType = typePair.getTargetType();
-				if (expectedTargetType == null || targetType.isAssignableFrom(expectedTargetType)) {
+				if (requestedTargetType == null || targetType.isAssignableFrom(requestedTargetType)) {
 					return targetType;
 				}
 			}
@@ -309,27 +323,33 @@ public class CustomConversions {
 		return null;
 	}
 
-	private Class<?> getCustomReadTarget(Class<?> source, Class<?> expectedTargetType) {
+	/**
+	 * Returns the actual target type for the given {@code sourceType} and {@code requestedTargetType}. Note that the
+	 * returned {@link Class} could be an assignable type to the given {@code requestedTargetType}.
+	 * 
+	 * @param sourceType must not be {@literal null}.
+	 * @param requestedTargetType can be {@literal null}.
+	 * @return
+	 */
+	private Class<?> getCustomReadTarget(Class<?> sourceType, Class<?> requestedTargetType) {
 
-		Class<?> type = expectedTargetType == null ? PlaceholderType.class : expectedTargetType;
+		Assert.notNull(sourceType);
 
-		Map<Class<?>, CacheValue> map;
-		CacheValue toReturn;
-
-		if ((map = cache.get(source)) == null || (toReturn = map.get(type)) == null) {
-
-			Class<?> target = getCustomTarget(source, type, readingPairs);
-
-			if (cache.get(source) == null) {
-				cache.put(source, new HashMap<Class<?>, CacheValue>());
-			}
-
-			Map<Class<?>, CacheValue> value = cache.get(source);
-			toReturn = target == null ? CacheValue.NULL : new CacheValue(target);
-			value.put(type, toReturn);
+		if (requestedTargetType == null) {
+			return null;
 		}
 
-		return toReturn.clazz;
+		ConvertiblePair lookupKey = new ConvertiblePair(sourceType, requestedTargetType);
+		CacheValue readTargetTypeValue = customReadTargetTypes.get(lookupKey);
+
+		if (readTargetTypeValue != null) {
+			return readTargetTypeValue.getType();
+		}
+
+		readTargetTypeValue = CacheValue.of(getCustomTarget(sourceType, requestedTargetType, readingPairs));
+		CacheValue cacheValue = customReadTargetTypes.putIfAbsent(lookupKey, readTargetTypeValue);
+
+		return cacheValue != null ? cacheValue.getType() : readTargetTypeValue.getType();
 	}
 
 	@WritingConverter
@@ -338,8 +358,10 @@ public class CustomConversions {
 		INSTANCE;
 
 		public Set<ConvertiblePair> getConvertibleTypes() {
+
 			ConvertiblePair localeToString = new ConvertiblePair(Locale.class, String.class);
 			ConvertiblePair booleanToString = new ConvertiblePair(Character.class, String.class);
+
 			return new HashSet<ConvertiblePair>(Arrays.asList(localeToString, booleanToString));
 		}
 
@@ -348,29 +370,29 @@ public class CustomConversions {
 		}
 	}
 
-	/**
-	 * Placeholder type to allow registering not-found values in the converter cache.
-	 * 
-	 * @author Patryk Wasik
-	 * @author Oliver Gierke
-	 */
-	private static class PlaceholderType {
-
-	}
-
 	/**
 	 * Wrapper to safely store {@literal null} values in the type cache.
 	 * 
 	 * @author Patryk Wasik
 	 * @author Oliver Gierke
+	 * @author Thomas Darimont
 	 */
 	private static class CacheValue {
 
-		public static final CacheValue NULL = new CacheValue(null);
-		private final Class<?> clazz;
+		private static final CacheValue ABSENT = new CacheValue(null);
 
-		public CacheValue(Class<?> clazz) {
-			this.clazz = clazz;
+		private final Class<?> type;
+
+		public CacheValue(Class<?> type) {
+			this.type = type;
+		}
+
+		public Class<?> getType() {
+			return type;
+		}
+
+		static CacheValue of(Class<?> type) {
+			return type == null ? ABSENT : new CacheValue(type);
 		}
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 the original author or authors.
+ * Copyright 2012-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,18 +31,30 @@ import com.mongodb.DBObject;
  */
 class DBObjectPropertyAccessor extends MapAccessor {
 
-	static MapAccessor INSTANCE = new DBObjectPropertyAccessor();
+	static final MapAccessor INSTANCE = new DBObjectPropertyAccessor();
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.context.expression.MapAccessor#getSpecificTargetClasses()
+	 */
 	@Override
 	public Class<?>[] getSpecificTargetClasses() {
 		return new Class[] { DBObject.class };
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.context.expression.MapAccessor#canRead(org.springframework.expression.EvaluationContext, java.lang.Object, java.lang.String)
+	 */
 	@Override
 	public boolean canRead(EvaluationContext context, Object target, String name) {
 		return true;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.context.expression.MapAccessor#read(org.springframework.expression.EvaluationContext, java.lang.Object, java.lang.String)
+	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public TypedValue read(EvaluationContext context, Object target, String name) {
@@ -52,4 +64,4 @@ class DBObjectPropertyAccessor extends MapAccessor {
 		Object value = source.get(name);
 		return value == null ? TypedValue.NULL : new TypedValue(value);
 	}
-}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,15 +24,22 @@ import com.mongodb.DBRef;
  * Used to resolve associations annotated with {@link org.springframework.data.mongodb.core.mapping.DBRef}.
  * 
  * @author Thomas Darimont
+ * @author Oliver Gierke
+ * @since 1.4
  */
 public interface DbRefResolver {
 
 	/**
+	 * Resolves the given {@link DBRef} into an object of the given {@link MongoPersistentProperty}'s type. The method
+	 * might return a proxy object for the {@link DBRef} or resolve it immediately. In both cases the
+	 * {@link DbRefResolverCallback} will be used to obtain the actual backing object.
+	 * 
 	 * @param property will never be {@literal null}.
+	 * @param dbref the {@link DBRef} to resolve.
 	 * @param callback will never be {@literal null}.
 	 * @return
 	 */
-	Object resolveDbRef(MongoPersistentProperty property, DbRefResolverCallback callback);
+	Object resolveDbRef(MongoPersistentProperty property, DBRef dbref, DbRefResolverCallback callback);
 
 	/**
 	 * Creates a {@link DBRef} instance for the given {@link org.springframework.data.mongodb.core.mapping.DBRef}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
+import static org.springframework.util.ReflectionUtils.*;
+
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
@@ -26,11 +28,11 @@ import org.aopalliance.intercept.MethodInvocation;
 import org.objenesis.Objenesis;
 import org.objenesis.ObjenesisStd;
 import org.springframework.aop.framework.ProxyFactory;
+import org.springframework.beans.BeanUtils;
 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;
@@ -51,10 +53,10 @@ import com.mongodb.DBRef;
  * 
  * @author Thomas Darimont
  * @author Oliver Gierke
+ * @since 1.4
  */
 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;
@@ -78,13 +80,13 @@ public class DefaultDbRefResolver implements DbRefResolver {
 	 * @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) {
+	public Object resolveDbRef(MongoPersistentProperty property, DBRef dbref, 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 createLazyLoadingProxy(property, dbref, callback);
 		}
 
 		return callback.resolve(property);
@@ -109,10 +111,11 @@ public class DefaultDbRefResolver implements DbRefResolver {
 	 * eventually resolve the value of the property.
 	 * 
 	 * @param property must not be {@literal null}.
+	 * @param dbref can be {@literal null}.
 	 * @param callback must not be {@literal null}.
 	 * @return
 	 */
-	private Object createLazyLoadingProxy(MongoPersistentProperty property, DbRefResolverCallback callback) {
+	private Object createLazyLoadingProxy(MongoPersistentProperty property, DBRef dbref, DbRefResolverCallback callback) {
 
 		ProxyFactory proxyFactory = new ProxyFactory();
 		Class<?> propertyType = property.getType();
@@ -121,7 +124,9 @@ public class DefaultDbRefResolver implements DbRefResolver {
 			proxyFactory.addInterface(type);
 		}
 
-		LazyLoadingInterceptor interceptor = new LazyLoadingInterceptor(property, exceptionTranslator, callback);
+		LazyLoadingInterceptor interceptor = new LazyLoadingInterceptor(property, dbref, exceptionTranslator, callback);
+
+		proxyFactory.addInterface(LazyLoadingProxy.class);
 
 		if (propertyType.isInterface()) {
 			proxyFactory.addInterface(propertyType);
@@ -132,7 +137,7 @@ public class DefaultDbRefResolver implements DbRefResolver {
 		proxyFactory.setProxyTargetClass(true);
 		proxyFactory.setTargetClass(propertyType);
 
-		if (IS_SPRING_4_OR_BETTER || !OBJENESIS_PRESENT) {
+		if (!OBJENESIS_PRESENT) {
 			proxyFactory.addAdvice(interceptor);
 			return proxyFactory.getProxy();
 		}
@@ -141,7 +146,9 @@ public class DefaultDbRefResolver implements DbRefResolver {
 	}
 
 	/**
-	 * @param property
+	 * Returns whether the property shall be resolved lazily.
+	 * 
+	 * @param property must not be {@literal null}.
 	 * @return
 	 */
 	private boolean isLazyDbRef(MongoPersistentProperty property) {
@@ -154,31 +161,46 @@ public class DefaultDbRefResolver implements DbRefResolver {
 	 * guaranteed to be performed only once.
 	 * 
 	 * @author Thomas Darimont
+	 * @author Oliver Gierke
 	 */
 	static class LazyLoadingInterceptor implements MethodInterceptor, org.springframework.cglib.proxy.MethodInterceptor,
 			Serializable {
 
+		private static final Method INITIALIZE_METHOD, TO_DBREF_METHOD;
+
 		private final DbRefResolverCallback callback;
 		private final MongoPersistentProperty property;
 		private final PersistenceExceptionTranslator exceptionTranslator;
 
 		private volatile boolean resolved;
 		private Object result;
+		private DBRef dbref;
+
+		static {
+			try {
+				INITIALIZE_METHOD = LazyLoadingProxy.class.getMethod("initialize");
+				TO_DBREF_METHOD = LazyLoadingProxy.class.getMethod("toDBRef");
+			} catch (Exception e) {
+				throw new RuntimeException(e);
+			}
+		}
 
 		/**
 		 * Creates a new {@link LazyLoadingInterceptor} for the given {@link MongoPersistentProperty},
 		 * {@link PersistenceExceptionTranslator} and {@link DbRefResolverCallback}.
 		 * 
 		 * @param property must not be {@literal null}.
+		 * @param dbref can be {@literal null}.
 		 * @param callback must not be {@literal null}.
 		 */
-		public LazyLoadingInterceptor(MongoPersistentProperty property, PersistenceExceptionTranslator exceptionTranslator,
-				DbRefResolverCallback callback) {
+		public LazyLoadingInterceptor(MongoPersistentProperty property, DBRef dbref,
+				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.dbref = dbref;
 			this.callback = callback;
 			this.exceptionTranslator = exceptionTranslator;
 			this.property = property;
@@ -199,9 +221,95 @@ public class DefaultDbRefResolver implements DbRefResolver {
 		 */
 		@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);
+
+			if (INITIALIZE_METHOD.equals(method)) {
+				return ensureResolved();
+			}
+
+			if (TO_DBREF_METHOD.equals(method)) {
+				return this.dbref;
+			}
+
+			if (isObjectMethod(method) && Object.class.equals(method.getDeclaringClass())) {
+
+				if (ReflectionUtils.isToStringMethod(method)) {
+					return proxyToString(proxy);
+				}
+
+				if (ReflectionUtils.isEqualsMethod(method)) {
+					return proxyEquals(proxy, args[0]);
+				}
+
+				if (ReflectionUtils.isHashCodeMethod(method)) {
+					return proxyHashCode(proxy);
+				}
+			}
+
+			Object target = ensureResolved();
+
+			if (target == null) {
+				return null;
+			}
+
+			return method.invoke(target, args);
 		}
 
+		/**
+		 * Returns a to string representation for the given {@code proxy}.
+		 * 
+		 * @param proxy
+		 * @return
+		 */
+		private String proxyToString(Object proxy) {
+
+			StringBuilder description = new StringBuilder();
+			if (dbref != null) {
+				description.append(dbref.getRef());
+				description.append(":");
+				description.append(dbref.getId());
+			} else {
+				description.append(System.identityHashCode(proxy));
+			}
+			description.append("$").append(LazyLoadingProxy.class.getSimpleName());
+
+			return description.toString();
+		}
+
+		/**
+		 * Returns the hashcode for the given {@code proxy}.
+		 * 
+		 * @param proxy
+		 * @return
+		 */
+		private int proxyHashCode(Object proxy) {
+			return proxyToString(proxy).hashCode();
+		}
+
+		/**
+		 * Performs an equality check for the given {@code proxy}.
+		 * 
+		 * @param proxy
+		 * @param that
+		 * @return
+		 */
+		private boolean proxyEquals(Object proxy, Object that) {
+
+			if (!(that instanceof LazyLoadingProxy)) {
+				return false;
+			}
+
+			if (that == proxy) {
+				return true;
+			}
+
+			return proxyToString(proxy).equals(that.toString());
+		}
+
+		/**
+		 * Will trigger the resolution if the proxy is not resolved already or return a previously resolved result.
+		 * 
+		 * @return
+		 */
 		private Object ensureResolved() {
 
 			if (!resolved) {
@@ -212,16 +320,28 @@ public class DefaultDbRefResolver implements DbRefResolver {
 			return this.result;
 		}
 
+		/**
+		 * Callback method for serialization.
+		 * 
+		 * @param out
+		 * @throws IOException
+		 */
 		private void writeObject(ObjectOutputStream out) throws IOException {
 
 			ensureResolved();
 			out.writeObject(this.result);
 		}
 
+		/**
+		 * Callback method for deserialization.
+		 * 
+		 * @param in
+		 * @throws IOException
+		 */
 		private void readObject(ObjectInputStream in) throws IOException {
 
 			try {
-				this.resolved = true; // Object is guaranteed to be resolved after serializations
+				this.resolved = true;
 				this.result = in.readObject();
 			} catch (ClassNotFoundException e) {
 				throw new LazyLoadingException("Could not deserialize result", e);
@@ -229,6 +349,8 @@ public class DefaultDbRefResolver implements DbRefResolver {
 		}
 
 		/**
+		 * Resolves the proxy into its backing object.
+		 * 
 		 * @return
 		 */
 		private synchronized Object resolve() {
@@ -248,24 +370,30 @@ public class DefaultDbRefResolver implements DbRefResolver {
 
 			return result;
 		}
-
-		public boolean isResolved() {
-			return resolved;
-		}
-
-		public Object getResult() {
-			return result;
-		}
 	}
 
 	/**
-	 * Static class to accomodate optional dependency on Objenesis.
+	 * Static class to accommodate optional dependency on Objenesis.
 	 * 
 	 * @author Oliver Gierke
+	 * @author Thomas Darimont
+	 * @since 1.4
 	 */
 	private static class ObjenesisProxyEnhancer {
 
-		private static final Objenesis OBJENESIS = new ObjenesisStd(true);
+		private static final boolean IS_SPRING_4_OR_BETTER = ClassUtils.isPresent(
+				"org.springframework.core.DefaultParameterNameDiscoverer", null);
+
+		private static final InstanceCreatorStrategy INSTANCE_CREATOR;
+
+		static {
+
+			if (IS_SPRING_4_OR_BETTER) {
+				INSTANCE_CREATOR = new Spring4ObjenesisInstanceCreatorStrategy();
+			} else {
+				INSTANCE_CREATOR = new DefaultObjenesisInstanceCreatorStrategy();
+			}
+		}
 
 		public static Object enhanceAndGet(ProxyFactory proxyFactory, Class<?> type,
 				org.springframework.cglib.proxy.MethodInterceptor interceptor) {
@@ -273,10 +401,79 @@ public class DefaultDbRefResolver implements DbRefResolver {
 			Enhancer enhancer = new Enhancer();
 			enhancer.setSuperclass(type);
 			enhancer.setCallbackType(org.springframework.cglib.proxy.MethodInterceptor.class);
+			enhancer.setInterfaces(new Class[] { LazyLoadingProxy.class });
 
-			Factory factory = (Factory) OBJENESIS.newInstance(enhancer.createClass());
+			Factory factory = (Factory) INSTANCE_CREATOR.newInstance(enhancer.createClass());
 			factory.setCallbacks(new Callback[] { interceptor });
 			return factory;
 		}
+
+		/**
+		 * Strategy for constructing new instances of a given {@link Class}.
+		 * 
+		 * @author Thomas Darimont
+		 */
+		interface InstanceCreatorStrategy {
+			Object newInstance(Class<?> clazz);
+		}
+
+		/**
+		 * An {@link InstanceCreatorStrategy} that uses Objenesis from the classpath.
+		 * 
+		 * @author Thomas Darimont
+		 */
+		private static class DefaultObjenesisInstanceCreatorStrategy implements InstanceCreatorStrategy {
+
+			private static final Objenesis OBJENESIS = new ObjenesisStd(true);
+
+			/*
+			 * (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.convert.DefaultDbRefResolver.ObjenesisProxyEnhancer.InstanceCreatorStrategy#newInstance(java.lang.Class)
+			 */
+			@Override
+			public Object newInstance(Class<?> clazz) {
+				return OBJENESIS.newInstance(clazz);
+			}
+		}
+
+		/**
+		 * An {@link InstanceCreatorStrategy} that uses a repackaged version of Objenesis from Spring 4.
+		 * 
+		 * @author Thomas Darimont
+		 */
+		private static class Spring4ObjenesisInstanceCreatorStrategy implements InstanceCreatorStrategy {
+
+			private static final String SPRING4_OBJENESIS_CLASS_NAME = "org.springframework.objenesis.ObjenesisStd";
+			private static final Object OBJENESIS;
+			private static final Method NEW_INSTANCE_METHOD;
+
+			static {
+
+				try {
+					Class<?> objenesisClass = ClassUtils.forName(SPRING4_OBJENESIS_CLASS_NAME,
+							ObjenesisProxyEnhancer.class.getClassLoader());
+
+					OBJENESIS = BeanUtils.instantiateClass(objenesisClass.getConstructor(boolean.class), true);
+					NEW_INSTANCE_METHOD = objenesisClass.getMethod("newInstance", Class.class);
+
+				} catch (Exception e) {
+					throw new RuntimeException("Could not setup Objenesis infrastructure with Spring 4 ", e);
+				}
+			}
+
+			/*
+			 * (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.convert.DefaultDbRefResolver.ObjenesisProxyEnhancer.InstanceCreatorStrategy#newInstance(java.lang.Class)
+			 */
+			@Override
+			public Object newInstance(Class<?> clazz) {
+
+				try {
+					return NEW_INSTANCE_METHOD.invoke(OBJENESIS, clazz);
+				} catch (Exception e) {
+					throw new RuntimeException("Could not created instance for " + clazz, e);
+				}
+			}
+		}
 	}
 }

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

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.convert;
+
+import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver.LazyLoadingInterceptor;
+
+import com.mongodb.DBRef;
+
+/**
+ * Allows direct interaction with the underlying {@link LazyLoadingInterceptor}.
+ * 
+ * @author Thomas Darimont
+ * @since 1.5
+ */
+public interface LazyLoadingProxy {
+
+	/**
+	 * Initializes the proxy and returns the wrapped value.
+	 * 
+	 * @return
+	 * @since 1.5
+	 */
+	Object initialize();
+
+	/**
+	 * Returns the {@link DBRef} represented by this {@link LazyLoadingProxy}, may be null.
+	 * 
+	 * @return
+	 * @since 1.5
+	 */
+	DBRef toDBRef();
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2013 by the original author(s).
+ * Copyright 2011-2014 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.
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.EnumMap;
+import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -71,10 +73,11 @@ import com.mongodb.DBRef;
  * @author Jon Brisbin
  * @author Patrik Wasik
  * @author Thomas Darimont
+ * @author Christoph Strobl
  */
 public class MappingMongoConverter extends AbstractMongoConverter implements ApplicationContextAware {
 
-	protected static final Logger log = LoggerFactory.getLogger(MappingMongoConverter.class);
+	protected static final Logger LOGGER = LoggerFactory.getLogger(MappingMongoConverter.class);
 
 	protected final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
 	protected final SpelExpressionParser spelExpressionParser = new SpelExpressionParser();
@@ -273,9 +276,11 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		entity.doWithAssociations(new AssociationHandler<MongoPersistentProperty>() {
 			public void doWithAssociation(Association<MongoPersistentProperty> association) {
 
-				MongoPersistentProperty inverseProp = association.getInverse();
+				MongoPersistentProperty property = association.getInverse();
 
-				Object obj = dbRefResolver.resolveDbRef(inverseProp, new DbRefResolverCallback() {
+				Object value = dbo.get(property.getName());
+				DBRef dbref = value instanceof DBRef ? (DBRef) value : null;
+				Object obj = dbRefResolver.resolveDbRef(property, dbref, new DbRefResolverCallback() {
 
 					@Override
 					public Object resolve(MongoPersistentProperty property) {
@@ -283,7 +288,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 					}
 				});
 
-				wrapper.setProperty(inverseProp, obj);
+				wrapper.setProperty(property, obj);
 			}
 		});
 
@@ -303,7 +308,12 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			Assert.isTrue(annotation != null, "The referenced property has to be mapped with @DBRef!");
 		}
 
-		return createDBRef(object, annotation);
+		// @see DATAMONGO-913
+		if (object instanceof LazyLoadingProxy) {
+			return ((LazyLoadingProxy) object).toDBRef();
+		}
+
+		return createDBRef(object, referingProperty);
 	}
 
 	/**
@@ -400,6 +410,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 				Object propertyObj = wrapper.getProperty(prop, prop.getType(), fieldAccessOnly);
 
 				if (null != propertyObj) {
+
 					if (!conversions.isSimpleType(propertyObj.getClass())) {
 						writePropertyInternal(propertyObj, dbo, prop);
 					} else {
@@ -446,13 +457,32 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		}
 
 		if (prop.isDbReference()) {
-			DBRef dbRefObj = createDBRef(obj, prop.getDBRef());
+
+			DBRef dbRefObj = null;
+
+			/*
+			 * If we already have a LazyLoadingProxy, we use it's cached DBRef value instead of 
+			 * unnecessarily initializing it only to convert it to a DBRef a few instructions later.
+			 */
+			if (obj instanceof LazyLoadingProxy) {
+				dbRefObj = ((LazyLoadingProxy) obj).toDBRef();
+			}
+
+			dbRefObj = dbRefObj != null ? dbRefObj : createDBRef(obj, prop);
+
 			if (null != dbRefObj) {
 				accessor.put(prop, dbRefObj);
 				return;
 			}
 		}
 
+		/*
+		 * If we have a LazyLoadingProxy we make sure it is initialized first.
+		 */
+		if (obj instanceof LazyLoadingProxy) {
+			obj = ((LazyLoadingProxy) obj).initialize();
+		}
+
 		// Lookup potential custom target type
 		Class<?> basicTargetType = conversions.getCustomWriteTarget(obj.getClass(), null);
 
@@ -515,7 +545,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 				continue;
 			}
 
-			DBRef dbRef = createDBRef(element, property.getDBRef());
+			DBRef dbRef = createDBRef(element, property);
 			dbList.add(dbRef);
 		}
 
@@ -548,7 +578,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			if (conversions.isSimpleType(key.getClass())) {
 
 				String simpleKey = potentiallyEscapeMapKey(key.toString());
-				dbObject.put(simpleKey, value != null ? createDBRef(value, property.getDBRef()) : null);
+				dbObject.put(simpleKey, value != null ? createDBRef(value, property) : null);
 
 			} else {
 				throw new MappingException("Cannot use a complex object as a key value.");
@@ -668,7 +698,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	 */
 	protected void addCustomTypeKeyIfNecessary(TypeInformation<?> type, Object value, DBObject dbObject) {
 
-		TypeInformation<?> actualType = type != null ? type.getActualType() : type;
+		TypeInformation<?> actualType = type != null ? type.getActualType() : null;
 		Class<?> reference = actualType == null ? Object.class : actualType.getType();
 
 		boolean notTheSameClass = !value.getClass().equals(reference);
@@ -741,7 +771,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		return target.isAssignableFrom(value.getClass()) ? value : conversionService.convert(value, target);
 	}
 
-	protected DBRef createDBRef(Object target, org.springframework.data.mongodb.core.mapping.DBRef dbref) {
+	protected DBRef createDBRef(Object target, MongoPersistentProperty property) {
 
 		Assert.notNull(target);
 
@@ -750,6 +780,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		}
 
 		MongoPersistentEntity<?> targetEntity = mappingContext.getPersistentEntity(target.getClass());
+		targetEntity = targetEntity == null ? targetEntity = mappingContext.getPersistentEntity(property) : targetEntity;
 
 		if (null == targetEntity) {
 			throw new MappingException("No mapping metadata found for " + target.getClass());
@@ -761,14 +792,21 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			throw new MappingException("No id property found on class " + targetEntity.getType());
 		}
 
-		BeanWrapper<MongoPersistentEntity<Object>, Object> wrapper = BeanWrapper.create(target, conversionService);
-		Object id = wrapper.getProperty(idProperty, Object.class, useFieldAccessOnly);
+		Object id = null;
+
+		if (target.getClass().equals(idProperty.getType())) {
+			id = target;
+		} else {
+			BeanWrapper<MongoPersistentEntity<Object>, Object> wrapper = BeanWrapper.create(target, conversionService);
+			id = wrapper.getProperty(idProperty, Object.class, useFieldAccessOnly);
+		}
 
 		if (null == id) {
 			throw new MappingException("Cannot create a reference to an object with a NULL id.");
 		}
 
-		return dbRefResolver.createDbRef(dbref, targetEntity, idMapper.convertId(id));
+		return dbRefResolver.createDbRef(property == null ? null : property.getDBRef(), targetEntity,
+				idMapper.convertId(id));
 	}
 
 	protected Object getValueInternal(MongoPersistentProperty prop, DBObject dbo, SpELExpressionEvaluator eval,
@@ -785,7 +823,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	 * @param sourceValue must not be {@literal null}.
 	 * @return the converted {@link Collection} or array, will never be {@literal null}.
 	 */
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "null" })
 	private Object readCollectionOrArray(TypeInformation<?> targetType, BasicDBList sourceValue, Object parent) {
 
 		Assert.notNull(targetType);
@@ -798,11 +836,20 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 
 		collectionType = Collection.class.isAssignableFrom(collectionType) ? collectionType : List.class;
 
-		Collection<Object> items = targetType.getType().isArray() ? new ArrayList<Object>() : CollectionFactory
-				.createCollection(collectionType, sourceValue.size());
 		TypeInformation<?> componentType = targetType.getComponentType();
 		Class<?> rawComponentType = componentType == null ? null : componentType.getType();
 
+		Collection<Object> items;
+
+		if (targetType.getType().isArray()) {
+			items = new ArrayList<Object>();
+		} else if (EnumSet.class.isAssignableFrom(collectionType)) {
+			Assert.notNull(rawComponentType, "Component type must not be null for enum sets!");
+			items = EnumSet.noneOf(rawComponentType.asSubclass(Enum.class));
+		} else {
+			items = CollectionFactory.createCollection(collectionType, sourceValue.size());
+		}
+
 		for (int i = 0; i < sourceValue.size(); i++) {
 
 			Object dbObjItem = sourceValue.get(i);
@@ -827,31 +874,43 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	 * @param dbObject
 	 * @return
 	 */
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "null", "rawtypes" })
 	protected Map<Object, Object> readMap(TypeInformation<?> type, DBObject dbObject, Object parent) {
 
 		Assert.notNull(dbObject);
 
 		Class<?> mapType = typeMapper.readType(dbObject, type).getType();
-		Map<Object, Object> map = CollectionFactory.createMap(mapType, dbObject.keySet().size());
+
+		TypeInformation<?> keyType = type.getComponentType();
+		Class<?> rawKeyType = keyType == null ? null : keyType.getType();
+
+		TypeInformation<?> valueType = type.getMapValueType();
+		Class<?> rawValueType = valueType == null ? null : valueType.getType();
+
+		Map<Object, Object> map;
+
+		if (EnumMap.class.isAssignableFrom(mapType)) {
+			Assert.notNull(keyType, "Key type must nut be null for enum maps!");
+			map = new EnumMap(rawKeyType.asSubclass(Enum.class));
+		} else {
+			map = CollectionFactory.createMap(mapType, dbObject.keySet().size());
+		}
+
 		Map<String, Object> sourceMap = dbObject.toMap();
 
 		for (Entry<String, Object> entry : sourceMap.entrySet()) {
+
 			if (typeMapper.isTypeKey(entry.getKey())) {
 				continue;
 			}
 
 			Object key = potentiallyUnescapeMapKey(entry.getKey());
 
-			TypeInformation<?> keyTypeInformation = type.getComponentType();
-			if (keyTypeInformation != null) {
-				Class<?> keyType = keyTypeInformation.getType();
-				key = conversionService.convert(key, keyType);
+			if (rawKeyType != null) {
+				key = conversionService.convert(key, rawKeyType);
 			}
 
 			Object value = entry.getValue();
-			TypeInformation<?> valueType = type.getMapValueType();
-			Class<?> rawValueType = valueType == null ? null : valueType.getType();
 
 			if (value instanceof DBObject) {
 				map.put(key, read(valueType, (DBObject) value, parent));
@@ -902,15 +961,17 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			return getPotentiallyConvertedSimpleWrite(obj);
 		}
 
+		TypeInformation<?> typeHint = typeInformation == null ? ClassTypeInformation.OBJECT : typeInformation;
+
 		if (obj instanceof BasicDBList) {
-			return maybeConvertList((BasicDBList) obj);
+			return maybeConvertList((BasicDBList) obj, typeHint);
 		}
 
 		if (obj instanceof DBObject) {
 			DBObject newValueDbo = new BasicDBObject();
 			for (String vk : ((DBObject) obj).keySet()) {
 				Object o = ((DBObject) obj).get(vk);
-				newValueDbo.put(vk, convertToMongoType(o));
+				newValueDbo.put(vk, convertToMongoType(o, typeHint));
 			}
 			return newValueDbo;
 		}
@@ -918,17 +979,17 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		if (obj instanceof Map) {
 			DBObject result = new BasicDBObject();
 			for (Map.Entry<Object, Object> entry : ((Map<Object, Object>) obj).entrySet()) {
-				result.put(entry.getKey().toString(), convertToMongoType(entry.getValue()));
+				result.put(entry.getKey().toString(), convertToMongoType(entry.getValue(), typeHint));
 			}
 			return result;
 		}
 
 		if (obj.getClass().isArray()) {
-			return maybeConvertList(Arrays.asList((Object[]) obj));
+			return maybeConvertList(Arrays.asList((Object[]) obj), typeHint);
 		}
 
 		if (obj instanceof Collection) {
-			return maybeConvertList((Collection<?>) obj);
+			return maybeConvertList((Collection<?>) obj, typeHint);
 		}
 
 		DBObject newDbo = new BasicDBObject();
@@ -941,11 +1002,13 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		return !obj.getClass().equals(typeInformation.getType()) ? newDbo : removeTypeInfoRecursively(newDbo);
 	}
 
-	public BasicDBList maybeConvertList(Iterable<?> source) {
+	public BasicDBList maybeConvertList(Iterable<?> source, TypeInformation<?> typeInformation) {
+
 		BasicDBList newDbl = new BasicDBList();
 		for (Object element : source) {
-			newDbl.add(convertToMongoType(element));
+			newDbl.add(convertToMongoType(element, typeInformation));
 		}
+
 		return newDbl;
 	}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2013 the original author or authors.
+ * Copyright 2011-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,19 +17,26 @@ package org.springframework.data.mongodb.core.convert;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map.Entry;
 import java.util.Set;
 
 import org.bson.types.ObjectId;
 import org.springframework.core.convert.ConversionException;
 import org.springframework.core.convert.ConversionService;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.data.mapping.Association;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.PropertyPath;
 import org.springframework.data.mapping.PropertyReferenceException;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.context.PersistentPropertyPath;
+import org.springframework.data.mapping.model.MappingException;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty.PropertyToFieldNameConverter;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.util.Assert;
 
@@ -44,6 +51,8 @@ import com.mongodb.DBRef;
  * @author Jon Brisbin
  * @author Oliver Gierke
  * @author Patryk Wasik
+ * @author Thomas Darimont
+ * @author Christoph Strobl
  */
 public class QueryMapper {
 
@@ -101,22 +110,48 @@ public class QueryMapper {
 				continue;
 			}
 
-			Field field = entity == null ? new Field(key) : new MetadataBackedField(key, entity, mappingContext);
+			Field field = createPropertyField(entity, key, mappingContext);
+			Entry<String, Object> entry = getMappedObjectForField(field, query.get(key));
 
-			Object rawValue = query.get(key);
-			String newKey = field.getMappedKey();
-
-			if (isNestedKeyword(rawValue) && !field.isIdField()) {
-				Keyword keyword = new Keyword((DBObject) rawValue);
-				result.put(newKey, getMappedKeyword(field, keyword));
-			} else {
-				result.put(newKey, getMappedValue(field, rawValue));
-			}
+			result.put(entry.getKey(), entry.getValue());
 		}
 
 		return result;
 	}
 
+	/**
+	 * Extracts the mapped object value for given field out of rawValue taking nested {@link Keyword}s into account
+	 * 
+	 * @param field
+	 * @param rawValue
+	 * @return
+	 */
+	protected Entry<String, Object> getMappedObjectForField(Field field, Object rawValue) {
+
+		String key = field.getMappedKey();
+		Object value;
+
+		if (isNestedKeyword(rawValue) && !field.isIdField()) {
+			Keyword keyword = new Keyword((DBObject) rawValue);
+			value = getMappedKeyword(field, keyword);
+		} else {
+			value = getMappedValue(field, rawValue);
+		}
+
+		return createMapEntry(key, value);
+	}
+
+	/**
+	 * @param entity
+	 * @param key
+	 * @param mappingContext
+	 * @return
+	 */
+	protected Field createPropertyField(MongoPersistentEntity<?> entity, String key,
+			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
+		return entity == null ? new Field(key) : new MetadataBackedField(key, entity, mappingContext);
+	}
+
 	/**
 	 * Returns the given {@link DBObject} representing a keyword by mapping the keyword's value.
 	 * 
@@ -124,7 +159,7 @@ public class QueryMapper {
 	 * @param entity
 	 * @return
 	 */
-	private DBObject getMappedKeyword(Keyword keyword, MongoPersistentEntity<?> entity) {
+	protected DBObject getMappedKeyword(Keyword keyword, MongoPersistentEntity<?> entity) {
 
 		// $or/$nor
 		if (keyword.isOrOrNor() || keyword.hasIterableValue()) {
@@ -133,7 +168,7 @@ public class QueryMapper {
 			BasicDBList newConditions = new BasicDBList();
 
 			for (Object condition : conditions) {
-				newConditions.add(condition instanceof DBObject ? getMappedObject((DBObject) condition, entity)
+				newConditions.add(isDBObject(condition) ? getMappedObject((DBObject) condition, entity)
 						: convertSimpleOrDBObject(condition, entity));
 			}
 
@@ -150,13 +185,13 @@ public class QueryMapper {
 	 * @param keyword
 	 * @return
 	 */
-	private DBObject getMappedKeyword(Field property, Keyword keyword) {
+	protected DBObject getMappedKeyword(Field property, Keyword keyword) {
 
 		boolean needsAssociationConversion = property.isAssociation() && !keyword.isExists();
 		Object value = keyword.getValue();
 
-		Object convertedValue = needsAssociationConversion ? convertAssociation(value, property.getProperty())
-				: getMappedValue(property.with(keyword.getKey()), value);
+		Object convertedValue = needsAssociationConversion ? convertAssociation(value, property) : getMappedValue(
+				property.with(keyword.getKey()), value);
 
 		return new BasicDBObject(keyword.key, convertedValue);
 	}
@@ -170,26 +205,28 @@ public class QueryMapper {
 	 * @param newKey the key the value will be bound to eventually
 	 * @return
 	 */
-	private Object getMappedValue(Field documentField, Object value) {
+	protected Object getMappedValue(Field documentField, Object value) {
 
 		if (documentField.isIdField()) {
 
-			if (value instanceof DBObject) {
+			if (isDBObject(value)) {
 				DBObject valueDbo = (DBObject) value;
+				DBObject resultDbo = new BasicDBObject(valueDbo.toMap());
+
 				if (valueDbo.containsField("$in") || valueDbo.containsField("$nin")) {
 					String inKey = valueDbo.containsField("$in") ? "$in" : "$nin";
 					List<Object> ids = new ArrayList<Object>();
 					for (Object id : (Iterable<?>) valueDbo.get(inKey)) {
 						ids.add(convertId(id));
 					}
-					valueDbo.put(inKey, ids.toArray(new Object[ids.size()]));
+					resultDbo.put(inKey, ids.toArray(new Object[ids.size()]));
 				} else if (valueDbo.containsField("$ne")) {
-					valueDbo.put("$ne", convertId(valueDbo.get("$ne")));
+					resultDbo.put("$ne", convertId(valueDbo.get("$ne")));
 				} else {
-					return getMappedObject((DBObject) value, null);
+					return getMappedObject(resultDbo, null);
 				}
 
-				return valueDbo;
+				return resultDbo;
 
 			} else {
 				return convertId(value);
@@ -200,13 +237,46 @@ public class QueryMapper {
 			return getMappedKeyword(new Keyword((DBObject) value), null);
 		}
 
-		if (documentField.isAssociation()) {
-			return convertAssociation(value, documentField.getProperty());
+		if (isAssociationConversionNecessary(documentField, value)) {
+			return convertAssociation(value, documentField);
 		}
 
 		return convertSimpleOrDBObject(value, documentField.getPropertyEntity());
 	}
 
+	/**
+	 * Returns whether the given {@link Field} represents an association reference that together with the given value
+	 * requires conversion to a {@link org.springframework.data.mongodb.core.mapping.DBRef} object. We check whether the
+	 * type of the given value is compatible with the type of the given document field in order to deal with potential
+	 * query field exclusions, since MongoDB uses the {@code int} {@literal 0} as an indicator for an excluded field.
+	 * 
+	 * @param documentField must not be {@literal null}.
+	 * @param value
+	 * @return
+	 */
+	protected boolean isAssociationConversionNecessary(Field documentField, Object value) {
+
+		Assert.notNull(documentField, "Document field must not be null!");
+
+		if (value == null) {
+			return false;
+		}
+
+		if (!documentField.isAssociation()) {
+			return false;
+		}
+
+		Class<? extends Object> type = value.getClass();
+		MongoPersistentProperty property = documentField.getProperty();
+
+		if (property.getActualType().isAssignableFrom(type)) {
+			return true;
+		}
+
+		MongoPersistentEntity<?> entity = documentField.getPropertyEntity();
+		return entity.hasIdProperty() && entity.getIdProperty().getActualType().isAssignableFrom(type);
+	}
+
 	/**
 	 * Retriggers mapping if the given source is a {@link DBObject} or simply invokes the
 	 * 
@@ -214,13 +284,13 @@ public class QueryMapper {
 	 * @param entity
 	 * @return
 	 */
-	private Object convertSimpleOrDBObject(Object source, MongoPersistentEntity<?> entity) {
+	protected Object convertSimpleOrDBObject(Object source, MongoPersistentEntity<?> entity) {
 
 		if (source instanceof BasicDBList) {
 			return delegateConvertToMongoType(source, entity);
 		}
 
-		if (source instanceof DBObject) {
+		if (isDBObject(source)) {
 			return getMappedObject((DBObject) source, entity);
 		}
 
@@ -236,7 +306,11 @@ public class QueryMapper {
 	 * @return the converted mongo type or null if source is null
 	 */
 	protected Object delegateConvertToMongoType(Object source, MongoPersistentEntity<?> entity) {
-		return converter.convertToMongoType(source);
+		return converter.convertToMongoType(source, entity == null ? null : entity.getTypeInformation());
+	}
+
+	protected Object convertAssociation(Object source, Field field) {
+		return convertAssociation(source, field.getProperty());
 	}
 
 	/**
@@ -246,16 +320,16 @@ public class QueryMapper {
 	 * @param property
 	 * @return
 	 */
-	private Object convertAssociation(Object source, MongoPersistentProperty property) {
+	protected Object convertAssociation(Object source, MongoPersistentProperty property) {
 
-		if (property == null || !property.isAssociation()) {
+		if (property == null || source == null || source instanceof DBRef || source instanceof DBObject) {
 			return source;
 		}
 
 		if (source instanceof Iterable) {
 			BasicDBList result = new BasicDBList();
 			for (Object element : (Iterable<?>) source) {
-				result.add(element instanceof DBRef ? element : converter.toDBRef(element, property));
+				result.add(createDbRefFor(element, property));
 			}
 			return result;
 		}
@@ -264,13 +338,55 @@ public class QueryMapper {
 			BasicDBObject result = new BasicDBObject();
 			DBObject dbObject = (DBObject) source;
 			for (String key : dbObject.keySet()) {
-				Object o = dbObject.get(key);
-				result.put(key, o instanceof DBRef ? o : converter.toDBRef(o, property));
+				result.put(key, createDbRefFor(dbObject.get(key), property));
 			}
 			return result;
 		}
 
-		return source == null || source instanceof DBRef ? source : converter.toDBRef(source, property);
+		return createDbRefFor(source, property);
+	}
+
+	/**
+	 * Checks whether the given value is a {@link DBObject}.
+	 * 
+	 * @param value can be {@literal null}.
+	 * @return
+	 */
+	protected final boolean isDBObject(Object value) {
+		return value instanceof DBObject;
+	}
+
+	/**
+	 * Creates a new {@link Entry} for the given {@link Field} with the given value.
+	 * 
+	 * @param field must not be {@literal null}.
+	 * @param value can be {@literal null}.
+	 * @return
+	 */
+	protected final Entry<String, Object> createMapEntry(Field field, Object value) {
+		return createMapEntry(field.getMappedKey(), value);
+	}
+
+	/**
+	 * Creates a new {@link Entry} with the given key and value.
+	 * 
+	 * @param key must not be {@literal null} or empty.
+	 * @param value can be {@literal null}
+	 * @return
+	 */
+	private Entry<String, Object> createMapEntry(String key, Object value) {
+
+		Assert.hasText(key, "Key must not be null or empty!");
+		return Collections.singletonMap(key, value).entrySet().iterator().next();
+	}
+
+	private DBRef createDbRefFor(Object source, MongoPersistentProperty property) {
+
+		if (source instanceof DBRef) {
+			return (DBRef) source;
+		}
+
+		return converter.toDBRef(source, property);
 	}
 
 	/**
@@ -328,7 +444,7 @@ public class QueryMapper {
 	 * 
 	 * @author Oliver Gierke
 	 */
-	private static class Keyword {
+	static class Keyword {
 
 		private static final String N_OR_PATTERN = "\\$.*or";
 
@@ -381,7 +497,7 @@ public class QueryMapper {
 	 * 
 	 * @author Oliver Gierke
 	 */
-	private static class Field {
+	protected static class Field {
 
 		private static final String ID_KEY = "_id";
 
@@ -418,7 +534,9 @@ public class QueryMapper {
 		}
 
 		/**
-		 * Returns the underlying {@link MongoPersistentProperty} backing the field.
+		 * Returns the underlying {@link MongoPersistentProperty} backing the field. For path traversals this will be the
+		 * property that represents the value to handle. This means it'll be the leaf property for plain paths or the
+		 * association property in case we refer to an association somewhere in the path.
 		 * 
 		 * @return
 		 */
@@ -452,18 +570,36 @@ public class QueryMapper {
 		public String getMappedKey() {
 			return isIdField() ? ID_KEY : name;
 		}
+
+		/**
+		 * Returns whether the field references an association in case it refers to a nested field.
+		 * 
+		 * @return
+		 */
+		public boolean containsAssociation() {
+			return false;
+		}
+
+		public Association<MongoPersistentProperty> getAssociation() {
+			return null;
+		}
 	}
 
 	/**
 	 * Extension of {@link DocumentField} to be backed with mapping metadata.
 	 * 
 	 * @author Oliver Gierke
+	 * @author Thomas Darimont
 	 */
-	private static class MetadataBackedField extends Field {
+	protected static class MetadataBackedField extends Field {
+
+		private static final String INVALID_ASSOCIATION_REFERENCE = "Invalid path reference %s! Associations can only be pointed to directly or via their id property!";
 
 		private final MongoPersistentEntity<?> entity;
 		private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
 		private final MongoPersistentProperty property;
+		private final PersistentPropertyPath<MongoPersistentProperty> path;
+		private final Association<MongoPersistentProperty> association;
 
 		/**
 		 * Creates a new {@link MetadataBackedField} with the given name, {@link MongoPersistentEntity} and
@@ -475,6 +611,21 @@ public class QueryMapper {
 		 */
 		public MetadataBackedField(String name, MongoPersistentEntity<?> entity,
 				MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> context) {
+			this(name, entity, context, null);
+		}
+
+		/**
+		 * Creates a new {@link MetadataBackedField} with the given name, {@link MongoPersistentEntity} and
+		 * {@link MappingContext} with the given {@link MongoPersistentProperty}.
+		 * 
+		 * @param name must not be {@literal null} or empty.
+		 * @param entity must not be {@literal null}.
+		 * @param context must not be {@literal null}.
+		 * @param property may be {@literal null}.
+		 */
+		public MetadataBackedField(String name, MongoPersistentEntity<?> entity,
+				MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> context,
+				MongoPersistentProperty property) {
 
 			super(name);
 
@@ -483,8 +634,9 @@ public class QueryMapper {
 			this.entity = entity;
 			this.mappingContext = context;
 
-			PersistentPropertyPath<MongoPersistentProperty> path = getPath(name);
-			this.property = path == null ? null : path.getLeafProperty();
+			this.path = getPath(name);
+			this.property = path == null ? property : path.getLeafProperty();
+			this.association = findAssociation();
 		}
 
 		/*
@@ -493,7 +645,7 @@ public class QueryMapper {
 		 */
 		@Override
 		public MetadataBackedField with(String name) {
-			return new MetadataBackedField(name, entity, mappingContext);
+			return new MetadataBackedField(name, entity, mappingContext, property);
 		}
 
 		/*
@@ -518,7 +670,7 @@ public class QueryMapper {
 		 */
 		@Override
 		public MongoPersistentProperty getProperty() {
-			return property;
+			return association == null ? property : association.getInverse();
 		}
 
 		/* 
@@ -537,9 +689,34 @@ public class QueryMapper {
 		 */
 		@Override
 		public boolean isAssociation() {
+			return association != null;
+		}
 
-			MongoPersistentProperty property = getProperty();
-			return property == null ? false : property.isAssociation();
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#getAssociation()
+		 */
+		@Override
+		public Association<MongoPersistentProperty> getAssociation() {
+			return association;
+		}
+
+		/**
+		 * Finds the association property in the {@link PersistentPropertyPath}.
+		 * 
+		 * @return
+		 */
+		private final Association<MongoPersistentProperty> findAssociation() {
+
+			if (this.path != null) {
+				for (MongoPersistentProperty p : this.path) {
+					if (p.isAssociation()) {
+						return p.getAssociation();
+					}
+				}
+			}
+
+			return null;
 		}
 
 		/*
@@ -548,19 +725,57 @@ public class QueryMapper {
 		 */
 		@Override
 		public String getMappedKey() {
-
-			PersistentPropertyPath<MongoPersistentProperty> path = getPath(name);
-			return path == null ? name : path.toDotPath(MongoPersistentProperty.PropertyToFieldNameConverter.INSTANCE);
+			return path == null ? name : path.toDotPath(getPropertyConverter());
 		}
 
-		private PersistentPropertyPath<MongoPersistentProperty> getPath(String name) {
+		protected PersistentPropertyPath<MongoPersistentProperty> getPath() {
+			return path;
+		}
+
+		/**
+		 * Returns the {@link PersistentPropertyPath} for the given <code>pathExpression</code>.
+		 * 
+		 * @param pathExpression
+		 * @return
+		 */
+		private PersistentPropertyPath<MongoPersistentProperty> getPath(String pathExpression) {
 
 			try {
-				PropertyPath path = PropertyPath.from(name, entity.getTypeInformation());
-				return mappingContext.getPersistentPropertyPath(path);
+
+				PropertyPath path = PropertyPath.from(pathExpression, entity.getTypeInformation());
+				PersistentPropertyPath<MongoPersistentProperty> propertyPath = mappingContext.getPersistentPropertyPath(path);
+
+				Iterator<MongoPersistentProperty> iterator = propertyPath.iterator();
+				boolean associationDetected = false;
+
+				while (iterator.hasNext()) {
+
+					MongoPersistentProperty property = iterator.next();
+
+					if (property.isAssociation()) {
+						associationDetected = true;
+						continue;
+					}
+
+					if (associationDetected && !property.isIdProperty()) {
+						throw new MappingException(String.format(INVALID_ASSOCIATION_REFERENCE, pathExpression));
+					}
+				}
+
+				return propertyPath;
 			} catch (PropertyReferenceException e) {
 				return null;
 			}
 		}
+
+		/**
+		 * Return the {@link Converter} to be used to created the mapped key. Default implementation will use
+		 * {@link PropertyToFieldNameConverter}.
+		 * 
+		 * @return
+		 */
+		protected Converter<MongoPersistentProperty, String> getPropertyConverter() {
+			return PropertyToFieldNameConverter.INSTANCE;
+		}
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,16 +15,35 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.Map.Entry;
+
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.data.mapping.Association;
+import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty.PropertyToFieldNameConverter;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update.Modifier;
+import org.springframework.data.mongodb.core.query.Update.Modifiers;
+import org.springframework.data.util.ClassTypeInformation;
+import org.springframework.util.Assert;
+
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
 
 /**
  * A subclass of {@link QueryMapper} that retains type information on the mongo types.
  * 
  * @author Thomas Darimont
+ * @author Oliver Gierke
+ * @author Christoph Strobl
  */
 public class UpdateMapper extends QueryMapper {
 
-	private final MongoWriter<?> converter;
+	private final MongoConverter converter;
 
 	/**
 	 * Creates a new {@link UpdateMapper} using the given {@link MongoConverter}.
@@ -49,4 +68,208 @@ public class UpdateMapper extends QueryMapper {
 		return entity == null ? super.delegateConvertToMongoType(source, null) : converter.convertToMongoType(source,
 				entity.getTypeInformation());
 	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.convert.QueryMapper#getMappedObjectForField(org.springframework.data.mongodb.core.convert.QueryMapper.Field, java.lang.Object)
+	 */
+	@Override
+	protected Entry<String, Object> getMappedObjectForField(Field field, Object rawValue) {
+
+		if (isDBObject(rawValue)) {
+			return createMapEntry(field, convertSimpleOrDBObject(rawValue, field.getPropertyEntity()));
+		}
+
+		if (isQuery(rawValue)) {
+			return createMapEntry(field,
+					super.getMappedObject(((Query) rawValue).getQueryObject(), field.getPropertyEntity()));
+		}
+
+		if (isUpdateModifier(rawValue)) {
+			return getMappedUpdateModifier(field, rawValue);
+		}
+
+		return super.getMappedObjectForField(field, getMappedValue(field, rawValue));
+	}
+
+	private Entry<String, Object> getMappedUpdateModifier(Field field, Object rawValue) {
+		Object value = null;
+
+		if (rawValue instanceof Modifier) {
+
+			value = getMappedValue((Modifier) rawValue);
+
+		} else if (rawValue instanceof Modifiers) {
+
+			DBObject modificationOperations = new BasicDBObject();
+
+			for (Modifier modifier : ((Modifiers) rawValue).getModifiers()) {
+				modificationOperations.putAll(getMappedValue(modifier).toMap());
+			}
+
+			value = modificationOperations;
+		} else {
+			throw new IllegalArgumentException(String.format("Unable to map value of type '%s'!", rawValue.getClass()));
+		}
+
+		return createMapEntry(field, value);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.convert.QueryMapper#isAssociationConversionNecessary(org.springframework.data.mongodb.core.convert.QueryMapper.Field, java.lang.Object)
+	 */
+	@Override
+	protected boolean isAssociationConversionNecessary(Field documentField, Object value) {
+		return super.isAssociationConversionNecessary(documentField, value) || documentField.containsAssociation();
+	}
+
+	private boolean isUpdateModifier(Object value) {
+		return value instanceof Modifier || value instanceof Modifiers;
+	}
+
+	private boolean isQuery(Object value) {
+		return value instanceof Query;
+	}
+
+	private DBObject getMappedValue(Modifier modifier) {
+
+		Object value = converter.convertToMongoType(modifier.getValue(), ClassTypeInformation.OBJECT);
+		return new BasicDBObject(modifier.getKey(), value);
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.convert.QueryMapper#createPropertyField(org.springframework.data.mongodb.core.mapping.MongoPersistentEntity, java.lang.String, org.springframework.data.mapping.context.MappingContext)
+	 */
+	@Override
+	protected Field createPropertyField(MongoPersistentEntity<?> entity, String key,
+			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
+
+		return entity == null ? super.createPropertyField(entity, key, mappingContext) : //
+				new MetadataBackedUpdateField(entity, key, mappingContext);
+	}
+
+	/**
+	 * {@link MetadataBackedField} that handles {@literal $} paths inside a field key. We clean up an update key
+	 * containing a {@literal $} before handing it to the super class to make sure property lookups and transformations
+	 * continue to work as expected. We provide a custom property converter to re-applied the cleaned up {@literal $}s
+	 * when constructing the mapped key.
+	 * 
+	 * @author Thomas Darimont
+	 * @author Oliver Gierke
+	 */
+	private static class MetadataBackedUpdateField extends MetadataBackedField {
+
+		private final String key;
+
+		/**
+		 * Creates a new {@link MetadataBackedField} with the given {@link MongoPersistentEntity}, key and
+		 * {@link MappingContext}. We clean up the key before handing it up to the super class to make sure it continues to
+		 * work as expected.
+		 * 
+		 * @param entity must not be {@literal null}.
+		 * @param key must not be {@literal null} or empty.
+		 * @param mappingContext must not be {@literal null}.
+		 */
+		public MetadataBackedUpdateField(MongoPersistentEntity<?> entity, String key,
+				MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
+
+			super(key.replaceAll("\\.\\$", ""), entity, mappingContext);
+			this.key = key;
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.convert.QueryMapper.MetadataBackedField#getMappedKey()
+		 */
+		@Override
+		public String getMappedKey() {
+			return this.getPath() == null ? key : super.getMappedKey();
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.convert.QueryMapper.MetadataBackedField#getPropertyConverter()
+		 */
+		@Override
+		protected Converter<MongoPersistentProperty, String> getPropertyConverter() {
+			return isAssociation() ? new AssociationConverter(getAssociation()) : new UpdatePropertyConverter(key);
+		}
+
+		/**
+		 * Converter to skip all properties after an association property was rendered.
+		 * 
+		 * @author Oliver Gierke
+		 */
+		private static class AssociationConverter implements Converter<MongoPersistentProperty, String> {
+
+			private final MongoPersistentProperty property;
+			private boolean associationFound;
+
+			/**
+			 * Creates a new {@link AssociationConverter} for the given {@link Association}.
+			 * 
+			 * @param association must not be {@literal null}.
+			 */
+			public AssociationConverter(Association<MongoPersistentProperty> association) {
+
+				Assert.notNull(association, "Association must not be null!");
+				this.property = association.getInverse();
+			}
+
+			/* 
+			 * (non-Javadoc)
+			 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
+			 */
+			@Override
+			public String convert(MongoPersistentProperty source) {
+
+				if (associationFound) {
+					return null;
+				}
+
+				if (property.equals(source)) {
+					associationFound = true;
+				}
+
+				return source.getFieldName();
+			}
+		}
+
+		/**
+		 * Special {@link Converter} for {@link MongoPersistentProperty} instances that will concatenate the {@literal $}
+		 * contained in the source update key.
+		 * 
+		 * @author Oliver Gierke
+		 */
+		private static class UpdatePropertyConverter implements Converter<MongoPersistentProperty, String> {
+
+			private final Iterator<String> iterator;
+
+			/**
+			 * Creates a new {@link UpdatePropertyConverter} with the given update key.
+			 * 
+			 * @param updateKey must not be {@literal null} or empty.
+			 */
+			public UpdatePropertyConverter(String updateKey) {
+
+				Assert.hasText(updateKey, "Update key must not be null or empty!");
+
+				this.iterator = Arrays.asList(updateKey.split("\\.")).iterator();
+				this.iterator.next();
+			}
+
+			/* 
+			 * (non-Javadoc)
+			 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
+			 */
+			@Override
+			public String convert(MongoPersistentProperty property) {
+
+				String mappedName = PropertyToFieldNameConverter.INSTANCE.convert(property);
+				return iterator.hasNext() && iterator.next().equals("$") ? String.format("%s.$", mappedName) : mappedName;
+			}
+		}
+	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,10 +30,8 @@ import org.springframework.util.Assert;
  */
 public class Point {
 
-	@Field(order = 10)
-	private final double x;
-	@Field(order = 20)
-	private final double y;
+	@Field(order = 10) private final double x;
+	@Field(order = 20) private final double y;
 
 	@PersistenceConstructor
 	public Point(double x, double y) {
@@ -69,9 +67,9 @@ public class Point {
 		int result = 1;
 		long temp;
 		temp = Double.doubleToLongBits(x);
-		result = prime * result + (int) (temp ^ (temp >>> 32));
+		result = prime * result + (int) (temp ^ temp >>> 32);
 		temp = Double.doubleToLongBits(y);
-		result = prime * result + (int) (temp ^ (temp >>> 32));
+		result = prime * result + (int) (temp ^ temp >>> 32);
 		return result;
 	}
 
@@ -98,6 +96,6 @@ public class Point {
 
 	@Override
 	public String toString() {
-		return String.format("Point [latitude=%f, longitude=%f]", x, y);
+		return String.format("Point [x=%f, y=%f]", x, y);
 	}
 }

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

@@ -51,10 +51,24 @@ public @interface CompoundIndex {
 	@Deprecated
 	IndexDirection direction() default IndexDirection.ASCENDING;
 
+	/**
+	 * @see http://docs.mongodb.org/manual/core/index-unique/
+	 * @return
+	 */
 	boolean unique() default false;
 
+	/**
+	 * If set to true index will skip over any document that is missing the indexed field.
+	 * 
+	 * @see http://docs.mongodb.org/manual/core/index-sparse/
+	 * @return
+	 */
 	boolean sparse() default false;
 
+	/**
+	 * @see http://docs.mongodb.org/manual/core/index-creation/#index-creation-duplicate-dropping
+	 * @return
+	 */
 	boolean dropDups() default false;
 
 	/**

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

@@ -0,0 +1,41 @@
+/*
+ * 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.index;
+
+/**
+ * Geoposatial index type.
+ * 
+ * @author Laurent Canet
+ * @author Oliver Gierke
+ * @since 1.4
+ */
+public enum GeoSpatialIndexType {
+
+	/**
+	 * Simple 2-Dimensional index for legacy-format points.
+	 */
+	GEO_2D,
+
+	/**
+	 * 2D Index for GeoJSON-formatted data over a sphere. Only available in Mongo 2.4.
+	 */
+	GEO_2DSPHERE,
+
+	/**
+	 * An haystack index for grouping results over small results.
+	 */
+	GEO_HAYSTACK
+}

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

@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2011 by the original author(s).
+ * 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.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.mongodb.core.index;
 
 import java.lang.annotation.ElementType;
@@ -24,7 +23,8 @@ import java.lang.annotation.Target;
 /**
  * Mark a field to be indexed using MongoDB's geospatial indexing feature.
  * 
- * @author Jon Brisbin <jbrisbin@vmware.com>
+ * @author Jon Brisbin
+ * @author Laurent Canet
  */
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
@@ -65,4 +65,27 @@ public @interface GeoSpatialIndexed {
 	 */
 	int bits() default 26;
 
+	/**
+	 * The type of the geospatial index. Default is {@link GeoSpatialIndexType#GEO_2D}
+	 * 
+	 * @since 1.4
+	 * @return
+	 */
+	GeoSpatialIndexType type() default GeoSpatialIndexType.GEO_2D;
+
+	/**
+	 * The bucket size for {@link GeoSpatialIndexType#GEO_HAYSTACK} indexes, in coordinate units.
+	 * 
+	 * @since 1.4
+	 * @return
+	 */
+	double bucketSize() default 1.0;
+
+	/**
+	 * The name of the additional field to use for {@link GeoSpatialIndexType#GEO_HAYSTACK} indexes
+	 * 
+	 * @since 1.4
+	 * @return
+	 */
+	String additionalField() default "";
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/GeospatialIndex.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.
@@ -16,6 +16,7 @@
 package org.springframework.data.mongodb.core.index;
 
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
@@ -25,14 +26,18 @@ import com.mongodb.DBObject;
  * 
  * @author Jon Brisbin
  * @author Oliver Gierke
+ * @author Laurent Canet
  */
 public class GeospatialIndex implements IndexDefinition {
 
 	private final String field;
 	private String name;
-	private Integer min = null;
-	private Integer max = null;
-	private Integer bits = null;
+	private Integer min;
+	private Integer max;
+	private Integer bits;
+	private GeoSpatialIndexType type = GeoSpatialIndexType.GEO_2D;
+	private Double bucketSize = 1.0;
+	private String additionalField;
 
 	/**
 	 * Creates a new {@link GeospatialIndex} for the given field.
@@ -40,52 +45,146 @@ public class GeospatialIndex implements IndexDefinition {
 	 * @param field must not be empty or {@literal null}.
 	 */
 	public GeospatialIndex(String field) {
-		Assert.hasText(field);
+
+		Assert.hasText(field, "Field must have text!");
+
 		this.field = field;
 	}
 
+	/**
+	 * @param name must not be {@literal null} or empty.
+	 * @return
+	 */
 	public GeospatialIndex named(String name) {
+
+		Assert.hasText(name, "Name must have text!");
+
 		this.name = name;
 		return this;
 	}
 
+	/**
+	 * @param min
+	 * @return
+	 */
 	public GeospatialIndex withMin(int min) {
 		this.min = Integer.valueOf(min);
 		return this;
 	}
 
+	/**
+	 * @param max
+	 * @return
+	 */
 	public GeospatialIndex withMax(int max) {
 		this.max = Integer.valueOf(max);
 		return this;
 	}
 
+	/**
+	 * @param bits
+	 * @return
+	 */
 	public GeospatialIndex withBits(int bits) {
 		this.bits = Integer.valueOf(bits);
 		return this;
 	}
 
+	/**
+	 * @param type must not be {@literal null}.
+	 * @return
+	 */
+	public GeospatialIndex typed(GeoSpatialIndexType type) {
+
+		Assert.notNull(type, "Type must not be null!");
+
+		this.type = type;
+		return this;
+	}
+
+	/**
+	 * @param bucketSize
+	 * @return
+	 */
+	public GeospatialIndex withBucketSize(double bucketSize) {
+		this.bucketSize = bucketSize;
+		return this;
+	}
+
+	/**
+	 * @param fieldName.
+	 * @return
+	 */
+	public GeospatialIndex withAdditionalField(String fieldName) {
+		this.additionalField = fieldName;
+		return this;
+	}
+
 	public DBObject getIndexKeys() {
+
 		DBObject dbo = new BasicDBObject();
-		dbo.put(field, "2d");
+
+		switch (type) {
+
+			case GEO_2D:
+				dbo.put(field, "2d");
+				break;
+
+			case GEO_2DSPHERE:
+				dbo.put(field, "2dsphere");
+				break;
+
+			case GEO_HAYSTACK:
+				dbo.put(field, "geoHaystack");
+				if (!StringUtils.hasText(additionalField)) {
+					throw new IllegalArgumentException("When defining geoHaystack index, an additionnal field must be defined");
+				}
+				dbo.put(additionalField, 1);
+				break;
+
+			default:
+				throw new IllegalArgumentException("Unsupported geospatial index " + type);
+		}
+
 		return dbo;
 	}
 
 	public DBObject getIndexOptions() {
-		if (name == null && min == null && max == null) {
+
+		if (name == null && min == null && max == null && bucketSize == null) {
 			return null;
 		}
+
 		DBObject dbo = new BasicDBObject();
 		if (name != null) {
 			dbo.put("name", name);
 		}
-		if (min != null) {
-			dbo.put("min", min);
-		}
-		if (max != null) {
-			dbo.put("max", max);
-		}
-		if (bits != null) {
-			dbo.put("bits", bits);
+
+		switch (type) {
+
+			case GEO_2D:
+
+				if (min != null) {
+					dbo.put("min", min);
+				}
+				if (max != null) {
+					dbo.put("max", max);
+				}
+				if (bits != null) {
+					dbo.put("bits", bits);
+				}
+				break;
+
+			case GEO_2DSPHERE:
+
+				break;
+
+			case GEO_HAYSTACK:
+
+				if (bucketSize != null) {
+					dbo.put("bucketSize", bucketSize);
+				}
+				break;
 		}
 		return dbo;
 	}

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

@@ -41,8 +41,7 @@ public class Index implements IndexDefinition {
 
 	private boolean sparse = false;
 
-	public Index() {
-	}
+	public Index() {}
 
 	public Index(String key, Direction direction) {
 		fieldSpec.put(key, direction);
@@ -83,16 +82,33 @@ public class Index implements IndexDefinition {
 		return this;
 	}
 
+	/**
+	 * Reject all documents that contain a duplicate value for the indexed field.
+	 * 
+	 * @see http://docs.mongodb.org/manual/core/index-unique/
+	 * @return
+	 */
 	public Index unique() {
 		this.unique = true;
 		return this;
 	}
 
+	/**
+	 * Skip over any document that is missing the indexed field.
+	 * 
+	 * @see http://docs.mongodb.org/manual/core/index-sparse/
+	 * @return
+	 */
 	public Index sparse() {
 		this.sparse = true;
 		return this;
 	}
 
+	/**
+	 * @see http://docs.mongodb.org/manual/core/index-creation/#index-creation-duplicate-dropping
+	 * @param duplicates
+	 * @return
+	 */
 	public Index unique(Duplicates duplicates) {
 		if (duplicates == Duplicates.DROP) {
 			this.dropDuplicates = true;

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

@@ -32,16 +32,42 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Indexed {
 
+	/**
+	 * If set to true reject all documents that contain a duplicate value for the indexed field.
+	 * 
+	 * @see http://docs.mongodb.org/manual/core/index-unique/
+	 * @return
+	 */
 	boolean unique() default false;
 
 	IndexDirection direction() default IndexDirection.ASCENDING;
 
+	/**
+	 * If set to true index will skip over any document that is missing the indexed field.
+	 * 
+	 * @see http://docs.mongodb.org/manual/core/index-sparse/
+	 * @return
+	 */
 	boolean sparse() default false;
 
+	/**
+	 * @see http://docs.mongodb.org/manual/core/index-creation/#index-creation-duplicate-dropping
+	 * @return
+	 */
 	boolean dropDups() default false;
 
+	/**
+	 * Index name.
+	 * 
+	 * @return
+	 */
 	String name() default "";
 
+	/**
+	 * Colleciton name for index to be created on.
+	 * 
+	 * @return
+	 */
 	String collection() default "";
 
 	/**

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2013 the original author or authors.
+ * Copyright 2011-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,11 +45,12 @@ import com.mongodb.util.JSON;
  * @author Oliver Gierke
  * @author Philipp Schneider
  * @author Johno Crawford
+ * @author Laurent Canet
  */
 public class MongoPersistentEntityIndexCreator implements
 		ApplicationListener<MappingContextEvent<MongoPersistentEntity<?>, MongoPersistentProperty>> {
 
-	private static final Logger log = LoggerFactory.getLogger(MongoPersistentEntityIndexCreator.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(MongoPersistentEntityIndexCreator.class);
 
 	private final Map<Class<?>, Boolean> classesSeen = new ConcurrentHashMap<Class<?>, Boolean>();
 	private final MongoDbFactory mongoDbFactory;
@@ -96,8 +97,8 @@ public class MongoPersistentEntityIndexCreator implements
 	protected void checkForIndexes(final MongoPersistentEntity<?> entity) {
 		final Class<?> type = entity.getType();
 		if (!classesSeen.containsKey(type)) {
-			if (log.isDebugEnabled()) {
-				log.debug("Analyzing class " + type + " for index information.");
+			if (LOGGER.isDebugEnabled()) {
+				LOGGER.debug("Analyzing class " + type + " for index information.");
 			}
 
 			// Make sure indexes get created
@@ -111,8 +112,8 @@ public class MongoPersistentEntityIndexCreator implements
 					ensureIndex(indexColl, index.name(), definition, index.unique(), index.dropDups(), index.sparse(),
 							index.background(), index.expireAfterSeconds());
 
-					if (log.isDebugEnabled()) {
-						log.debug("Created compound index " + index);
+					if (LOGGER.isDebugEnabled()) {
+						LOGGER.debug("Created compound index " + index);
 					}
 				}
 			}
@@ -132,8 +133,8 @@ public class MongoPersistentEntityIndexCreator implements
 						} else {
 							if (!name.equals(field.getName()) && index.unique() && !index.sparse()) {
 								// Names don't match, and sparse is not true. This situation will generate an error on the server.
-								if (log.isWarnEnabled()) {
-									log.warn("The index name " + name + " doesn't match this property name: " + field.getName()
+								if (LOGGER.isWarnEnabled()) {
+									LOGGER.warn("The index name " + name + " doesn't match this property name: " + field.getName()
 											+ ". Setting sparse=true on this index will prevent errors when inserting documents.");
 								}
 							}
@@ -146,8 +147,8 @@ public class MongoPersistentEntityIndexCreator implements
 						ensureIndex(collection, name, definition, index.unique(), index.dropDups(), index.sparse(),
 								index.background(), index.expireAfterSeconds());
 
-						if (log.isDebugEnabled()) {
-							log.debug("Created property index " + index);
+						if (LOGGER.isDebugEnabled()) {
+							LOGGER.debug("Created property index " + index);
 						}
 
 					} else if (field.isAnnotationPresent(GeoSpatialIndexed.class)) {
@@ -157,13 +158,15 @@ public class MongoPersistentEntityIndexCreator implements
 						GeospatialIndex indexObject = new GeospatialIndex(persistentProperty.getFieldName());
 						indexObject.withMin(index.min()).withMax(index.max());
 						indexObject.named(StringUtils.hasText(index.name()) ? index.name() : field.getName());
+						indexObject.typed(index.type()).withBucketSize(index.bucketSize())
+								.withAdditionalField(index.additionalField());
 
 						String collection = StringUtils.hasText(index.collection()) ? index.collection() : entity.getCollection();
 						mongoDbFactory.getDb().getCollection(collection)
 								.ensureIndex(indexObject.getIndexKeys(), indexObject.getIndexOptions());
 
-						if (log.isDebugEnabled()) {
-							log.debug(String.format("Created %s for entity %s in collection %s! ", indexObject, entity.getType(),
+						if (LOGGER.isDebugEnabled()) {
+							LOGGER.debug(String.format("Created %s for entity %s in collection %s! ", indexObject, entity.getType(),
 									collection));
 						}
 					}

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

@@ -126,13 +126,13 @@ public abstract class AbstractMongoEventListener<E> implements ApplicationListen
 
 	public void onAfterDelete(DBObject dbo) {
 		if (LOG.isDebugEnabled()) {
-			LOG.debug("onAfterConvert({})", dbo);
+			LOG.debug("onAfterDelete({})", dbo);
 		}
 	}
 
 	public void onBeforeDelete(DBObject dbo) {
 		if (LOG.isDebugEnabled()) {
-			LOG.debug("onAfterConvert({})", dbo);
+			LOG.debug("onBeforeDelete({})", dbo);
 		}
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 the original author or authors.
+ * Copyright 2012-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,14 +28,14 @@ import org.springframework.util.Assert;
  */
 public class AuditingEventListener implements ApplicationListener<BeforeConvertEvent<Object>> {
 
-	private final IsNewAwareAuditingHandler<Object> auditingHandler;
+	private final IsNewAwareAuditingHandler auditingHandler;
 
 	/**
 	 * Creates a new {@link AuditingEventListener} using the given {@link MappingContext} and {@link AuditingHandler}.
 	 * 
 	 * @param auditingHandler must not be {@literal null}.
 	 */
-	public AuditingEventListener(IsNewAwareAuditingHandler<Object> auditingHandler) {
+	public AuditingEventListener(IsNewAwareAuditingHandler auditingHandler) {
 
 		Assert.notNull(auditingHandler, "IsNewAwareAuditingHandler must not be null!");
 		this.auditingHandler = auditingHandler;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 the original author or authors.
+ * Copyright 2010-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ package org.springframework.data.mongodb.core.mapreduce;
  */
 public class MapReduceCounts {
 
-	public static MapReduceCounts NONE = new MapReduceCounts(-1, -1, -1);
+	public static final MapReduceCounts NONE = new MapReduceCounts(-1, -1, -1);
 
 	private final long inputCount;
 	private final long emitCount;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 the original author or authors.
+ * Copyright 2010-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,6 +43,7 @@ import com.mongodb.DBObject;
  * @author Thomas Risberg
  * @author Oliver Gierke
  * @author Thomas Darimont
+ * @author Christoph Strobl
  */
 public class Criteria implements CriteriaDefinition {
 
@@ -52,11 +53,8 @@ public class Criteria implements CriteriaDefinition {
 	private static final Object NOT_SET = new Object();
 
 	private String key;
-
 	private List<Criteria> criteriaChain;
-
 	private LinkedHashMap<String, Object> criteria = new LinkedHashMap<String, Object>();
-
 	private Object isValue = NOT_SET;
 
 	public Criteria() {
@@ -101,13 +99,16 @@ public class Criteria implements CriteriaDefinition {
 	 * @return
 	 */
 	public Criteria is(Object o) {
-		if (isValue != NOT_SET) {
+
+		if (!isValue.equals(NOT_SET)) {
 			throw new InvalidMongoDbApiUsageException(
 					"Multiple 'is' values declared. You need to use 'and' with multiple criteria");
 		}
+
 		if (lastOperatorWasNot()) {
 			throw new InvalidMongoDbApiUsageException("Invalid query: 'not' can't be used with 'is' - use 'ne' instead.");
 		}
+
 		this.isValue = o;
 		return this;
 	}
@@ -117,8 +118,9 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a criterion using the $ne operator
+	 * Creates a criterion using the {@literal $ne} operator.
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/query/ne/
 	 * @param o
 	 * @return
 	 */
@@ -128,8 +130,9 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a criterion using the $lt operator
+	 * Creates a criterion using the {@literal $lt} operator.
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/query/lt/
 	 * @param o
 	 * @return
 	 */
@@ -139,8 +142,9 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a criterion using the $lte operator
+	 * Creates a criterion using the {@literal $lte} operator.
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/query/lte/
 	 * @param o
 	 * @return
 	 */
@@ -150,8 +154,9 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a criterion using the $gt operator
+	 * Creates a criterion using the {@literal $gt} operator.
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/query/gt/
 	 * @param o
 	 * @return
 	 */
@@ -161,8 +166,9 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a criterion using the $gte operator
+	 * Creates a criterion using the {@literal $gte} operator.
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/query/gte/
 	 * @param o
 	 * @return
 	 */
@@ -172,8 +178,9 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a criterion using the $in operator
+	 * Creates a criterion using the {@literal $in} operator.
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/query/in/
 	 * @param o the values to match against
 	 * @return
 	 */
@@ -187,8 +194,9 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a criterion using the $in operator
+	 * Creates a criterion using the {@literal $in} operator.
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/query/in/
 	 * @param c the collection containing the values to match against
 	 * @return
 	 */
@@ -198,8 +206,9 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a criterion using the $nin operator
+	 * Creates a criterion using the {@literal $nin} operator.
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/query/nin/
 	 * @param o
 	 * @return
 	 */
@@ -207,14 +216,22 @@ public class Criteria implements CriteriaDefinition {
 		return nin(Arrays.asList(o));
 	}
 
+	/**
+	 * Creates a criterion using the {@literal $nin} operator.
+	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/query/nin/
+	 * @param o
+	 * @return
+	 */
 	public Criteria nin(Collection<?> o) {
 		criteria.put("$nin", o);
 		return this;
 	}
 
 	/**
-	 * Creates a criterion using the $mod operator
+	 * Creates a criterion using the {@literal $mod} operator.
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/query/mod/
 	 * @param value
 	 * @param remainder
 	 * @return
@@ -228,8 +245,9 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a criterion using the $all operator
+	 * Creates a criterion using the {@literal $all} operator.
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/query/all/
 	 * @param o
 	 * @return
 	 */
@@ -237,14 +255,22 @@ public class Criteria implements CriteriaDefinition {
 		return all(Arrays.asList(o));
 	}
 
+	/**
+	 * Creates a criterion using the {@literal $all} operator.
+	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/query/all/
+	 * @param o
+	 * @return
+	 */
 	public Criteria all(Collection<?> o) {
 		criteria.put("$all", o);
 		return this;
 	}
 
 	/**
-	 * Creates a criterion using the $size operator
+	 * Creates a criterion using the {@literal $size} operator.
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/query/size/
 	 * @param s
 	 * @return
 	 */
@@ -254,8 +280,9 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a criterion using the $exists operator
+	 * Creates a criterion using the {@literal $exists} operator.
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/query/exists/
 	 * @param b
 	 * @return
 	 */
@@ -265,8 +292,9 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a criterion using the $type operator
+	 * Creates a criterion using the {@literal $type} operator.
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/query/type/
 	 * @param t
 	 * @return
 	 */
@@ -276,22 +304,31 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a criterion using the $not meta operator which affects the clause directly following
+	 * Creates a criterion using the {@literal $not} meta operator which affects the clause directly following
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/query/not/
 	 * @return
 	 */
 	public Criteria not() {
 		return not(null);
 	}
 
+	/**
+	 * Creates a criterion using the {@literal $not} operator.
+	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/query/not/
+	 * @param value
+	 * @return
+	 */
 	private Criteria not(Object value) {
 		criteria.put("$not", value);
 		return this;
 	}
 
 	/**
-	 * Creates a criterion using a $regex
+	 * Creates a criterion using a {@literal $regex} operator.
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/query/regex/
 	 * @param re
 	 * @return
 	 */
@@ -300,8 +337,10 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a criterion using a $regex and $options
+	 * Creates a criterion using a {@literal $regex} and {@literal $options} operator.
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/query/regex/
+	 * @see http://docs.mongodb.org/manual/reference/operator/query/regex/#op._S_options
 	 * @param re
 	 * @param options
 	 * @return
@@ -334,8 +373,11 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a geospatial criterion using a $within $center operation. This is only available for Mongo 1.7 and higher.
+	 * Creates a geospatial criterion using a {@literal $within $centerSphere} operation. This is only available for Mongo
+	 * 1.7 and higher.
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/query/geoWithin/
+	 * @see http://docs.mongodb.org/manual/reference/operator/query/centerSphere/
 	 * @param circle must not be {@literal null}
 	 * @return
 	 */
@@ -345,6 +387,13 @@ public class Criteria implements CriteriaDefinition {
 		return this;
 	}
 
+	/**
+	 * Creates a geospatial criterion using a {@literal $within} operation.
+	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/query/geoWithin/
+	 * @param shape
+	 * @return
+	 */
 	public Criteria within(Shape shape) {
 
 		Assert.notNull(shape);
@@ -353,8 +402,9 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a geospatial criterion using a $near operation
+	 * Creates a geospatial criterion using a {@literal $near} operation.
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/query/near/
 	 * @param point must not be {@literal null}
 	 * @return
 	 */
@@ -365,8 +415,10 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a geospatial criterion using a $nearSphere operation. This is only available for Mongo 1.7 and higher.
+	 * Creates a geospatial criterion using a {@literal $nearSphere} operation. This is only available for Mongo 1.7 and
+	 * higher.
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/query/nearSphere/
 	 * @param point must not be {@literal null}
 	 * @return
 	 */
@@ -377,8 +429,9 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a geospatical criterion using a $maxDistance operation, for use with $near
+	 * Creates a geospatical criterion using a {@literal $maxDistance} operation, for use with $near
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/query/maxDistance/
 	 * @param maxDistance
 	 * @return
 	 */
@@ -388,8 +441,9 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a criterion using the $elemMatch operator
+	 * Creates a criterion using the {@literal $elemMatch} operator
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/query/elemMatch/
 	 * @param c
 	 * @return
 	 */
@@ -475,8 +529,10 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	protected DBObject getSingleCriteriaObject() {
+
 		DBObject dbo = new BasicDBObject();
 		boolean not = false;
+
 		for (String k : this.criteria.keySet()) {
 			Object value = this.criteria.get(k);
 			if (not) {
@@ -494,12 +550,14 @@ public class Criteria implements CriteriaDefinition {
 		}
 
 		DBObject queryCriteria = new BasicDBObject();
-		if (isValue != NOT_SET) {
+
+		if (!NOT_SET.equals(isValue)) {
 			queryCriteria.put(this.key, this.isValue);
 			queryCriteria.putAll(dbo);
 		} else {
 			queryCriteria.put(this.key, dbo);
 		}
+
 		return queryCriteria;
 	}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2013 the original author or authors.
+ * Copyright 2011-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,8 +31,9 @@ import com.mongodb.DBObject;
  * 
  * @author Oliver Gierke
  * @author Thomas Darimont
+ * @author Christoph Strobl
  */
-public class NearQuery {
+public final class NearQuery {
 
 	private final Point point;
 	private Query query;
@@ -143,10 +144,12 @@ public class NearQuery {
 	/**
 	 * Configures the {@link Pageable} to use.
 	 * 
-	 * @param pageable
+	 * @param pageable must not be {@literal null}
 	 * @return
 	 */
 	public NearQuery with(Pageable pageable) {
+
+		Assert.notNull(pageable, "Pageable must not be 'null'.");
 		this.num = pageable.getOffset() + pageable.getPageSize();
 		this.skip = pageable.getOffset();
 		return this;
@@ -311,13 +314,18 @@ public class NearQuery {
 	/**
 	 * Adds an actual query to the {@link NearQuery} to restrict the objects considered for the actual near operation.
 	 * 
-	 * @param query
+	 * @param query must not be {@literal null}.
 	 * @return
 	 */
 	public NearQuery query(Query query) {
+
+		Assert.notNull(query, "Cannot apply 'null' query on NearQuery.");
 		this.query = query;
 		this.skip = query.getSkip();
-		this.num = query.getLimit();
+
+		if (query.getLimit() != 0) {
+			this.num = query.getLimit();
+		}
 		return this;
 	}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 the original author or authors.
+ * Copyright 2010-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import org.springframework.data.domain.Pageable;
@@ -41,10 +42,10 @@ import com.mongodb.DBObject;
  */
 public class Query {
 
-	private final static String RESTRICTED_TYPES_KEY = "_$RESTRICTED_TYPES";
+	private static final String RESTRICTED_TYPES_KEY = "_$RESTRICTED_TYPES";
 
 	private final Set<Class<?>> restrictedTypes = new HashSet<Class<?>>();
-	private LinkedHashMap<String, Criteria> criteria = new LinkedHashMap<String, Criteria>();
+	private final Map<String, Criteria> criteria = new LinkedHashMap<String, Criteria>();
 	private Field fieldSpec;
 	private Sort sort;
 	private int skip;
@@ -98,11 +99,23 @@ public class Query {
 		return this.fieldSpec;
 	}
 
+	/**
+	 * Set number of documents to skip before returning results.
+	 * 
+	 * @param skip
+	 * @return
+	 */
 	public Query skip(int skip) {
 		this.skip = skip;
 		return this;
 	}
 
+	/**
+	 * Limit the number of returned documents to {@code limit}.
+	 * 
+	 * @param limit
+	 * @return
+	 */
 	public Query limit(int limit) {
 		this.limit = limit;
 		return this;
@@ -197,6 +210,7 @@ public class Query {
 	public DBObject getQueryObject() {
 
 		DBObject dbo = new BasicDBObject();
+
 		for (String k : criteria.keySet()) {
 			CriteriaDefinition c = criteria.get(k);
 			DBObject cl = c.getCriteriaObject();
@@ -211,37 +225,45 @@ public class Query {
 	}
 
 	public DBObject getFieldsObject() {
-		if (this.fieldSpec == null) {
-			return null;
-		}
-		return fieldSpec.getFieldsObject();
+		return this.fieldSpec == null ? null : fieldSpec.getFieldsObject();
 	}
 
 	public DBObject getSortObject() {
 
-		if (this.sort == null && this.sort == null) {
+		if (this.sort == null) {
 			return null;
 		}
 
 		DBObject dbo = new BasicDBObject();
 
-		if (this.sort != null) {
-			for (org.springframework.data.domain.Sort.Order order : this.sort) {
-				dbo.put(order.getProperty(), order.isAscending() ? 1 : -1);
-			}
+		for (org.springframework.data.domain.Sort.Order order : this.sort) {
+			dbo.put(order.getProperty(), order.isAscending() ? 1 : -1);
 		}
 
 		return dbo;
 	}
 
+	/**
+	 * Get the number of documents to skip.
+	 * 
+	 * @return
+	 */
 	public int getSkip() {
 		return this.skip;
 	}
 
+	/**
+	 * Get the maximum number of documents to be return.
+	 * 
+	 * @return
+	 */
 	public int getLimit() {
 		return this.limit;
 	}
 
+	/**
+	 * @return
+	 */
 	public String getHint() {
 		return hint;
 	}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 the original author or authors.
+ * Copyright 2010-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,18 @@
 package org.springframework.data.mongodb.core.query;
 
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import org.springframework.dao.InvalidDataAccessApiUsageException;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
@@ -32,6 +39,7 @@ import com.mongodb.DBObject;
  * @author Mark Pollack
  * @author Oliver Gierke
  * @author Becca Gaspard
+ * @author Christoph Strobl
  */
 public class Update {
 
@@ -39,7 +47,9 @@ public class Update {
 		LAST, FIRST
 	}
 
-	private HashMap<String, Object> modifierOps = new LinkedHashMap<String, Object>();
+	private Set<String> keysToUpdate = new HashSet<String>();
+	private Map<String, Object> modifierOps = new LinkedHashMap<String, Object>();
+	private Map<String, PushOperatorBuilder> pushCommandBuilders = new LinkedHashMap<String, PushOperatorBuilder>(1);
 
 	/**
 	 * Static factory method to create an Update using the provided key
@@ -73,15 +83,22 @@ public class Update {
 				continue;
 			}
 
-			update.modifierOps.put(key, object.get(key));
+			Object value = object.get(key);
+			update.modifierOps.put(key, value);
+			if (isKeyword(key) && value instanceof DBObject) {
+				update.keysToUpdate.addAll(((DBObject) value).keySet());
+			} else {
+				update.keysToUpdate.add(key);
+			}
 		}
 
 		return update;
 	}
 
 	/**
-	 * Update using the $set update modifier
+	 * Update using the {@literal $set} update modifier
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/update/set/
 	 * @param key
 	 * @param value
 	 * @return
@@ -92,8 +109,9 @@ public class Update {
 	}
 
 	/**
-	 * Update using the $setOnInsert update modifier
+	 * Update using the {@literal $setOnInsert} update modifier
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/update/setOnInsert/
 	 * @param key
 	 * @param value
 	 * @return
@@ -104,8 +122,9 @@ public class Update {
 	}
 
 	/**
-	 * Update using the $unset update modifier
+	 * Update using the {@literal $unset} update modifier
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/update/unset/
 	 * @param key
 	 * @return
 	 */
@@ -115,8 +134,9 @@ public class Update {
 	}
 
 	/**
-	 * Update using the $inc update modifier
+	 * Update using the {@literal $inc} update modifier
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/update/inc/
 	 * @param key
 	 * @param inc
 	 * @return
@@ -127,8 +147,9 @@ public class Update {
 	}
 
 	/**
-	 * Update using the $push update modifier
+	 * Update using the {@literal $push} update modifier
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/update/push/
 	 * @param key
 	 * @param value
 	 * @return
@@ -139,26 +160,46 @@ public class Update {
 	}
 
 	/**
-	 * Update using the $pushAll update modifier
+	 * Update using {@code $push} modifier. <br/>
+	 * Allows creation of {@code $push} command for single or multiple (using {@code $each}) values.
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/update/push/
+	 * @see http://docs.mongodb.org/manual/reference/operator/update/each/
+	 * @param key
+	 * @return {@link PushOperatorBuilder} for given key
+	 */
+	public PushOperatorBuilder push(String key) {
+
+		if (!pushCommandBuilders.containsKey(key)) {
+			pushCommandBuilders.put(key, new PushOperatorBuilder(key));
+		}
+		return pushCommandBuilders.get(key);
+	}
+
+	/**
+	 * Update using the {@code $pushAll} update modifier. <br>
+	 * <b>Note</b>: In mongodb 2.4 the usage of {@code $pushAll} has been deprecated in favor of {@code $push $each}.
+	 * {@link #push(String)}) returns a builder that can be used to populate the {@code $each} object.
+	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/update/pushAll/
 	 * @param key
 	 * @param values
 	 * @return
 	 */
 	public Update pushAll(String key, Object[] values) {
+
 		Object[] convertedValues = new Object[values.length];
 		for (int i = 0; i < values.length; i++) {
 			convertedValues[i] = values[i];
 		}
-		DBObject keyValue = new BasicDBObject();
-		keyValue.put(key, convertedValues);
-		modifierOps.put("$pushAll", keyValue);
+		addMultiFieldOperation("$pushAll", key, convertedValues);
 		return this;
 	}
 
 	/**
-	 * Update using the $addToSet update modifier
+	 * Update using the {@literal $addToSet} update modifier
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/update/addToSet/
 	 * @param key
 	 * @param value
 	 * @return
@@ -169,8 +210,9 @@ public class Update {
 	}
 
 	/**
-	 * Update using the $pop update modifier
+	 * Update using the {@literal $pop} update modifier
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/update/pop/
 	 * @param key
 	 * @param pos
 	 * @return
@@ -181,8 +223,9 @@ public class Update {
 	}
 
 	/**
-	 * Update using the $pull update modifier
+	 * Update using the {@literal $pull} update modifier
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/update/pull/
 	 * @param key
 	 * @param value
 	 * @return
@@ -193,26 +236,27 @@ public class Update {
 	}
 
 	/**
-	 * Update using the $pullAll update modifier
+	 * Update using the {@literal $pullAll} update modifier
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/update/pullAll/
 	 * @param key
 	 * @param values
 	 * @return
 	 */
 	public Update pullAll(String key, Object[] values) {
+
 		Object[] convertedValues = new Object[values.length];
 		for (int i = 0; i < values.length; i++) {
 			convertedValues[i] = values[i];
 		}
-		DBObject keyValue = new BasicDBObject();
-		keyValue.put(key, convertedValues);
-		modifierOps.put("$pullAll", keyValue);
+		addFieldOperation("$pullAll", key, convertedValues);
 		return this;
 	}
 
 	/**
-	 * Update using the $rename update modifier
+	 * Update using the {@literal $rename} update modifier
 	 * 
+	 * @see http://docs.mongodb.org/manual/reference/operator/update/rename/
 	 * @param oldName
 	 * @param newName
 	 * @return
@@ -230,8 +274,16 @@ public class Update {
 		return dbo;
 	}
 
+	protected void addFieldOperation(String operator, String key, Object value) {
+
+		Assert.hasText(key, "Key/Path for update must not be null or blank.");
+		modifierOps.put(operator, new BasicDBObject(key, value));
+		this.keysToUpdate.add(key);
+	}
+
 	protected void addMultiFieldOperation(String operator, String key, Object value) {
 
+		Assert.hasText(key, "Key/Path for update must not be null or blank.");
 		Object existingValue = this.modifierOps.get(operator);
 		DBObject keyValueMap;
 
@@ -248,5 +300,146 @@ public class Update {
 		}
 
 		keyValueMap.put(key, value);
+		this.keysToUpdate.add(key);
+	}
+
+	/**
+	 * Determine if a given {@code key} will be touched on execution.
+	 * 
+	 * @param key
+	 * @return
+	 */
+	public boolean modifies(String key) {
+		return this.keysToUpdate.contains(key);
+	}
+
+	/**
+	 * Inspects given {@code key} for '$'.
+	 * 
+	 * @param key
+	 * @return
+	 */
+	private static boolean isKeyword(String key) {
+		return StringUtils.startsWithIgnoreCase(key, "$");
+	}
+
+	/**
+	 * Modifiers holds a distinct collection of {@link Modifier}
+	 * 
+	 * @author Christoph Strobl
+	 */
+	public static class Modifiers {
+
+		private HashMap<String, Modifier> modifiers;
+
+		public Modifiers() {
+			this.modifiers = new LinkedHashMap<String, Modifier>(1);
+		}
+
+		public Collection<Modifier> getModifiers() {
+			return Collections.unmodifiableCollection(this.modifiers.values());
+		}
+
+		public void addModifier(Modifier modifier) {
+			this.modifiers.put(modifier.getKey(), modifier);
+		}
+	}
+
+	/**
+	 * Marker interface of nested commands.
+	 * 
+	 * @author Christoph Strobl
+	 */
+	public static interface Modifier {
+
+		/**
+		 * @return the command to send eg. {@code $push}
+		 */
+		String getKey();
+
+		/**
+		 * @return value to be sent with command
+		 */
+		Object getValue();
+	}
+
+	/**
+	 * Implementation of {@link Modifier} representing {@code $each}.
+	 * 
+	 * @author Christoph Strobl
+	 */
+	private static class Each implements Modifier {
+
+		private Object[] values;
+
+		public Each(Object... values) {
+			this.values = extractValues(values);
+		}
+
+		private Object[] extractValues(Object[] values) {
+
+			if (values == null || values.length == 0) {
+				return values;
+			}
+
+			if (values.length == 1 && values[0] instanceof Collection) {
+				return ((Collection<?>) values[0]).toArray();
+			}
+
+			Object[] convertedValues = new Object[values.length];
+			for (int i = 0; i < values.length; i++) {
+				convertedValues[i] = values[i];
+			}
+
+			return convertedValues;
+		}
+
+		@Override
+		public String getKey() {
+			return "$each";
+		}
+
+		@Override
+		public Object getValue() {
+			return this.values;
+		}
+	}
+
+	/**
+	 * Builder for creating {@code $push} modifiers
+	 * 
+	 * @author Christop Strobl
+	 */
+	public class PushOperatorBuilder {
+
+		private final String key;
+		private final Modifiers modifiers;
+
+		PushOperatorBuilder(String key) {
+			this.key = key;
+			this.modifiers = new Modifiers();
+		}
+
+		/**
+		 * Propagates {@code $each} to {@code $push}
+		 * 
+		 * @param values
+		 * @return
+		 */
+		public Update each(Object... values) {
+
+			this.modifiers.addModifier(new Each(values));
+			return Update.this.push(key, this.modifiers);
+		}
+
+		/**
+		 * Propagates {@link #value(Object)} to {@code $push}
+		 * 
+		 * @param values
+		 * @return
+		 */
+		public Update value(Object value) {
+			return Update.this.push(key, value);
+		}
 	}
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsOperations.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.
@@ -31,6 +31,7 @@ import com.mongodb.gridfs.GridFSFile;
  * 
  * @author Oliver Gierke
  * @author Philipp Schneider
+ * @author Thomas Darimont
  */
 public interface GridFsOperations extends ResourcePatternResolver {
 
@@ -126,7 +127,7 @@ public interface GridFsOperations extends ResourcePatternResolver {
 	 * Returns all {@link GridFsResource} with the given file name.
 	 * 
 	 * @param filename
-	 * @return
+	 * @return the resource if it exists or {@literal null}.
 	 * @see ResourcePatternResolver#getResource(String)
 	 */
 	GridFsResource getResource(String filename);

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsTemplate.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.
@@ -43,6 +43,7 @@ import com.mongodb.gridfs.GridFSInputFile;
  * 
  * @author Oliver Gierke
  * @author Philipp Schneider
+ * @author Thomas Darimont
  */
 public class GridFsTemplate implements GridFsOperations, ResourcePatternResolver {
 
@@ -198,7 +199,9 @@ public class GridFsTemplate implements GridFsOperations, ResourcePatternResolver
 	 * @see org.springframework.core.io.ResourceLoader#getResource(java.lang.String)
 	 */
 	public GridFsResource getResource(String location) {
-		return new GridFsResource(findOne(query(whereFilename().is(location))));
+
+		GridFSDBFile file = findOne(query(whereFilename().is(location)));
+		return file != null ? new GridFsResource(file) : null;
 	}
 
 	/*
@@ -229,7 +232,7 @@ public class GridFsTemplate implements GridFsOperations, ResourcePatternResolver
 	}
 
 	private DBObject getMappedQuery(Query query) {
-		return query == null ? null : getMappedQuery(query.getQueryObject());
+		return query == null ? new Query().getQueryObject() : getMappedQuery(query.getQueryObject());
 	}
 
 	private DBObject getMappedQuery(DBObject query) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@ import javax.enterprise.inject.spi.ProcessBean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.repository.cdi.CdiRepositoryBean;
 import org.springframework.data.repository.cdi.CdiRepositoryExtensionSupport;
 
 /**
@@ -76,26 +77,29 @@ public class MongoRepositoryExtension extends CdiRepositoryExtensionSupport {
 			Set<Annotation> qualifiers = entry.getValue();
 
 			// Create the bean representing the repository.
-			Bean<?> repositoryBean = createRepositoryBean(repositoryType, qualifiers, beanManager);
+			CdiRepositoryBean<?> repositoryBean = createRepositoryBean(repositoryType, qualifiers, beanManager);
 
 			if (LOG.isInfoEnabled()) {
 				LOG.info(String.format("Registering bean for %s with qualifiers %s.", repositoryType.getName(), qualifiers));
 			}
 
 			// Register the bean to the container.
+			registerBean(repositoryBean);
 			afterBeanDiscovery.addBean(repositoryBean);
 		}
 	}
 
 	/**
-	 * Creates a {@link Bean}.
+	 * Creates a {@link CdiRepositoryBean} for the repository of the given type.
 	 * 
-	 * @param <T> The type of the repository.
-	 * @param repositoryType The class representing the repository.
-	 * @param beanManager The BeanManager instance.
-	 * @return The bean.
+	 * @param <T> the type of the repository.
+	 * @param repositoryType the class representing the repository.
+	 * @param qualifiers the qualifiers to be applied to the bean.
+	 * @param beanManager the BeanManager instance.
+	 * @return
 	 */
-	private <T> Bean<T> createRepositoryBean(Class<T> repositoryType, Set<Annotation> qualifiers, BeanManager beanManager) {
+	private <T> CdiRepositoryBean<T> createRepositoryBean(Class<T> repositoryType, Set<Annotation> qualifiers,
+			BeanManager beanManager) {
 
 		// Determine the MongoOperations bean which matches the qualifiers of the repository.
 		Bean<MongoOperations> mongoOperations = this.mongoOperations.get(qualifiers);

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

@@ -81,7 +81,7 @@ public @interface EnableMongoRepositories {
 	 * 
 	 * @return
 	 */
-	String repositoryImplementationPostfix() default "";
+	String repositoryImplementationPostfix() default "Impl";
 
 	/**
 	 * Configures the location of where to find the Spring Data named queries properties file. Will default to

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 the original author or authors.
+ * Copyright 2010-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -79,22 +79,24 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 		MongoParameterAccessor accessor = new MongoParametersParameterAccessor(method, parameters);
 		Query query = createQuery(new ConvertingParameterAccessor(operations.getConverter(), accessor));
 
+		Object result = null;
+
 		if (method.isGeoNearQuery() && method.isPageQuery()) {
 
 			MongoParameterAccessor countAccessor = new MongoParametersParameterAccessor(method, parameters);
 			Query countQuery = createCountQuery(new ConvertingParameterAccessor(operations.getConverter(), countAccessor));
 
-			return new GeoNearExecution(accessor).execute(query, countQuery);
+			result = new GeoNearExecution(accessor).execute(query, countQuery);
 		} else if (method.isGeoNearQuery()) {
 			return new GeoNearExecution(accessor).execute(query);
 		} else if (method.isCollectionQuery()) {
-			return new CollectionExecution(accessor.getPageable()).execute(query);
+			result = new CollectionExecution(accessor.getPageable()).execute(query);
 		} else if (method.isPageQuery()) {
-			return new PagedExecution(accessor.getPageable()).execute(query);
+			result = new PagedExecution(accessor.getPageable()).execute(query);
+		} else {
+			result = new SingleEntityExecution(isCountQuery()).execute(query);
 		}
 
-		Object result = new SingleEntityExecution(isCountQuery()).execute(query);
-
 		if (result == null) {
 			return result;
 		}
@@ -153,7 +155,7 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 	 * 
 	 * @author Oliver Gierke
 	 */
-	class CollectionExecution extends Execution {
+	final class CollectionExecution extends Execution {
 
 		private final Pageable pageable;
 
@@ -176,7 +178,7 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 	 * 
 	 * @author Oliver Gierke
 	 */
-	class PagedExecution extends Execution {
+	final class PagedExecution extends Execution {
 
 		private final Pageable pageable;
 
@@ -213,7 +215,7 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 	 * 
 	 * @author Oliver Gierke
 	 */
-	class SingleEntityExecution extends Execution {
+	final class SingleEntityExecution extends Execution {
 
 		private final boolean countProjection;
 
@@ -239,7 +241,7 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 	 * 
 	 * @author Oliver Gierke
 	 */
-	class GeoNearExecution extends Execution {
+	final class GeoNearExecution extends Execution {
 
 		private final MongoParameterAccessor accessor;
 

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

@@ -19,10 +19,14 @@ import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.repository.query.QueryMethod;
 import org.springframework.data.repository.query.RepositoryQuery;
 import org.springframework.data.repository.query.parser.PartTree;
+import org.springframework.util.StringUtils;
+
+import com.mongodb.util.JSONParseException;
 
 /**
  * {@link RepositoryQuery} implementation for Mongo.
@@ -66,7 +70,24 @@ public class PartTreeMongoQuery extends AbstractMongoQuery {
 	protected Query createQuery(ConvertingParameterAccessor accessor) {
 
 		MongoQueryCreator creator = new MongoQueryCreator(tree, accessor, context, isGeoNearQuery);
-		return creator.createQuery();
+		Query query = creator.createQuery();
+
+		String fieldSpec = this.getQueryMethod().getFieldSpecification();
+
+		if (!StringUtils.hasText(fieldSpec)) {
+			return query;
+		}
+
+		try {
+
+			BasicQuery result = new BasicQuery(query.getQueryObject().toString(), fieldSpec);
+			result.setSortObject(query.getSortObject());
+			return result;
+
+		} catch (JSONParseException o_O) {
+			throw new IllegalStateException(String.format("Invalid query or field specification in %s!", getQueryMethod(),
+					o_O));
+		}
 	}
 
 	/* 

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

@@ -17,7 +17,7 @@
 
 	<xsd:element name="mongo" type="mongoType">
 		<xsd:annotation>
-			<xsd:documentation source="org.springframework.data.mongodb.core.core.MongoFactoryBean"><![CDATA[
+			<xsd:documentation source="org.springframework.data.mongodb.core.MongoFactoryBean"><![CDATA[
 Defines a Mongo instance used for accessing MongoDB'.
 			]]></xsd:documentation>
 			<xsd:appinfo>
@@ -209,7 +209,7 @@ The base package in which to scan for entities annotated with @Document
 			</xsd:attribute>
 			<xsd:attribute name="mongo-template-ref" type="mongoTemplateRef" use="optional">
 				<xsd:annotation>
-					<xsd:documentation source="org.springframework.data.mongodb.core.core.MongoTemplate">
+					<xsd:documentation source="org.springframework.data.mongodb.core.MongoTemplate">
 						The reference to a MongoTemplate. Will default to 'mongoTemplate'.
 					</xsd:documentation>
 				</xsd:annotation>
@@ -248,7 +248,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 		<xsd:annotation>
 			<xsd:appinfo>
 				<tool:annotation kind="ref">
-					<tool:assignable-to type="org.springframework.data.mongodb.core.core.MongoTemplate"/>
+					<tool:assignable-to type="org.springframework.data.mongodb.core.MongoTemplate"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
@@ -259,7 +259,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 		<xsd:annotation>
 			<xsd:appinfo>
 				<tool:annotation kind="ref">
-					<tool:assignable-to type="org.springframework.data.mongodb.core.core.MongoFactoryBean"/>
+					<tool:assignable-to type="org.springframework.data.mongodb.core.MongoFactoryBean"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>

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

@@ -17,7 +17,7 @@
 
 	<xsd:element name="mongo" type="mongoType">
 		<xsd:annotation>
-			<xsd:documentation source="org.springframework.data.mongodb.core.core.MongoFactoryBean"><![CDATA[
+			<xsd:documentation source="org.springframework.data.mongodb.core.MongoFactoryBean"><![CDATA[
 Defines a Mongo instance used for accessing MongoDB'.
 			]]></xsd:documentation>
 			<xsd:appinfo>
@@ -197,7 +197,7 @@ The base package in which to scan for entities annotated with @Document
 			</xsd:attribute>
 			<xsd:attribute name="mongo-template-ref" type="mongoTemplateRef" use="optional">
 				<xsd:annotation>
-					<xsd:documentation source="org.springframework.data.mongodb.core.core.MongoTemplate">
+					<xsd:documentation source="org.springframework.data.mongodb.core.MongoTemplate">
 						The reference to a MongoTemplate. Will default to 'mongoTemplate'.
 					</xsd:documentation>
 				</xsd:annotation>
@@ -246,7 +246,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 		<xsd:annotation>
 			<xsd:appinfo>
 				<tool:annotation kind="ref">
-					<tool:assignable-to type="org.springframework.data.mongodb.core.core.MongoTemplate"/>
+					<tool:assignable-to type="org.springframework.data.mongodb.core.MongoTemplate"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
@@ -257,7 +257,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 		<xsd:annotation>
 			<xsd:appinfo>
 				<tool:annotation kind="ref">
-					<tool:assignable-to type="org.springframework.data.mongodb.core.core.MongoFactoryBean"/>
+					<tool:assignable-to type="org.springframework.data.mongodb.core.MongoFactoryBean"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>

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

@@ -17,7 +17,7 @@
 
 	<xsd:element name="mongo" type="mongoType">
 		<xsd:annotation>
-			<xsd:documentation source="org.springframework.data.mongodb.core.core.MongoFactoryBean"><![CDATA[
+			<xsd:documentation source="org.springframework.data.mongodb.core.MongoFactoryBean"><![CDATA[
 Defines a Mongo instance used for accessing MongoDB'.
 			]]></xsd:documentation>
 			<xsd:appinfo>
@@ -197,7 +197,7 @@ The base package in which to scan for entities annotated with @Document
 			</xsd:attribute>
 			<xsd:attribute name="mongo-template-ref" type="mongoTemplateRef" use="optional">
 				<xsd:annotation>
-					<xsd:documentation source="org.springframework.data.mongodb.core.core.MongoTemplate">
+					<xsd:documentation source="org.springframework.data.mongodb.core.MongoTemplate">
 						The reference to a MongoTemplate. Will default to 'mongoTemplate'.
 					</xsd:documentation>
 				</xsd:annotation>
@@ -261,7 +261,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 		<xsd:annotation>
 			<xsd:appinfo>
 				<tool:annotation kind="ref">
-					<tool:assignable-to type="org.springframework.data.mongodb.core.core.MongoTemplate"/>
+					<tool:assignable-to type="org.springframework.data.mongodb.core.MongoTemplate"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
@@ -272,7 +272,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 		<xsd:annotation>
 			<xsd:appinfo>
 				<tool:annotation kind="ref">
-					<tool:assignable-to type="org.springframework.data.mongodb.core.core.MongoFactoryBean"/>
+					<tool:assignable-to type="org.springframework.data.mongodb.core.MongoFactoryBean"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>

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

@@ -17,7 +17,7 @@
 
 	<xsd:element name="mongo" type="mongoType">
 		<xsd:annotation>
-			<xsd:documentation source="org.springframework.data.mongodb.core.core.MongoFactoryBean"><![CDATA[
+			<xsd:documentation source="org.springframework.data.mongodb.core.MongoFactoryBean"><![CDATA[
 Defines a Mongo instance used for accessing MongoDB'.
 			]]></xsd:documentation>
 			<xsd:appinfo>
@@ -276,7 +276,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 		<xsd:annotation>
 			<xsd:appinfo>
 				<tool:annotation kind="ref">
-					<tool:assignable-to type="org.springframework.data.mongodb.core.core.MongoTemplate"/>
+					<tool:assignable-to type="org.springframework.data.mongodb.core.MongoTemplate"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
@@ -287,7 +287,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 		<xsd:annotation>
 			<xsd:appinfo>
 				<tool:annotation kind="ref">
-					<tool:assignable-to type="org.springframework.data.mongodb.core.core.MongoFactoryBean"/>
+					<tool:assignable-to type="org.springframework.data.mongodb.core.MongoFactoryBean"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>

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

@@ -17,7 +17,7 @@
 
 	<xsd:element name="mongo" type="mongoType">
 		<xsd:annotation>
-			<xsd:documentation source="org.springframework.data.mongodb.core.core.MongoFactoryBean"><![CDATA[
+			<xsd:documentation source="org.springframework.data.mongodb.core.MongoFactoryBean"><![CDATA[
 Defines a Mongo instance used for accessing MongoDB'.
 			]]></xsd:documentation>
 			<xsd:appinfo>
@@ -283,7 +283,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 		<xsd:annotation>
 			<xsd:appinfo>
 				<tool:annotation kind="ref">
-					<tool:assignable-to type="org.springframework.data.mongodb.core.core.MongoTemplate"/>
+					<tool:assignable-to type="org.springframework.data.mongodb.core.MongoTemplate"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
@@ -294,7 +294,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 		<xsd:annotation>
 			<xsd:appinfo>
 				<tool:annotation kind="ref">
-					<tool:assignable-to type="org.springframework.data.mongodb.core.core.MongoFactoryBean"/>
+					<tool:assignable-to type="org.springframework.data.mongodb.core.MongoFactoryBean"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
@@ -628,6 +628,12 @@ The reference to a Mongoconverter instance.
 					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:attribute>
+			<xsd:attribute name="bucket" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The GridFs bucket string.]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
 </xsd:schema>

spring-data-mongodb/src/test/java/ConfigClassInDefaultPackage.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.mongodb.config.AbstractMongoConfiguration;
+
+import com.mongodb.Mongo;
+import com.mongodb.MongoClient;
+
+/**
+ * Sample configuration class in default package.
+ * 
+ * @see DATAMONGO-877
+ * @author Oliver Gierke
+ */
+@Configuration
+public class ConfigClassInDefaultPackage extends AbstractMongoConfiguration {
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.config.AbstractMongoConfiguration#getDatabaseName()
+	 */
+	@Override
+	protected String getDatabaseName() {
+		return "default";
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.config.AbstractMongoConfiguration#mongo()
+	 */
+	@Override
+	public Mongo mongo() throws Exception {
+		return new MongoClient();
+	}
+}

spring-data-mongodb/src/test/java/ConfigClassInDefaultPackageUnitTests.java

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

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

@@ -23,6 +23,7 @@ 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.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.domain.AuditorAware;
@@ -96,6 +97,21 @@ public class AuditingViaJavaConfigRepositoriesTests {
 		assertThat(createdBy.getFirstname(), is(this.auditor.getFirstname()));
 	}
 
+	/**
+	 * @see DATAMONGO-843
+	 */
+	@Test
+	@SuppressWarnings("resource")
+	public void defaultsMappingContextIfNoneConfigured() {
+		new AnnotationConfigApplicationContext(SampleConfig.class);
+	}
+
 	@Repository
 	static interface AuditablePersonRepository extends MongoRepository<AuditablePerson, String> {}
+
+	@Configuration
+	@EnableMongoAuditing
+	static class SampleConfig {
+
+	}
 }

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

@@ -21,9 +21,11 @@ import static org.junit.Assert.*;
 import java.util.Collections;
 import java.util.Set;
 
-import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.convert.TypeDescriptor;
@@ -45,37 +47,45 @@ import com.mongodb.DBObject;
  * 
  * @author Oliver Gierke
  * @author Thomas Darimont
+ * @author Christoph Strobl
  */
 public class MappingMongoConverterParserIntegrationTests {
 
+	@Rule public ExpectedException exception = ExpectedException.none();
+
 	DefaultListableBeanFactory factory;
 
-	@Before
-	public void setUp() {
-		factory = new DefaultListableBeanFactory();
-		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(factory);
-		reader.loadBeanDefinitions(new ClassPathResource("namespace/converter.xml"));
-	}
-
+	/**
+	 * @see DATAMONGO-243
+	 */
 	@Test
 	public void allowsDbFactoryRefAttribute() {
 
+		loadValidConfiguration();
 		factory.getBeanDefinition("converter");
 		factory.getBean("converter");
 	}
 
+	/**
+	 * @see DATAMONGO-725
+	 */
 	@Test
 	public void hasCustomTypeMapper() {
 
+		loadValidConfiguration();
 		MappingMongoConverter converter = factory.getBean("converter", MappingMongoConverter.class);
 		MongoTypeMapper customMongoTypeMapper = factory.getBean(CustomMongoTypeMapper.class);
 
 		assertThat(converter.getTypeMapper(), is(customMongoTypeMapper));
 	}
 
+	/**
+	 * @see DATAMONGO-301
+	 */
 	@Test
 	public void scansForConverterAndSetsUpCustomConversionsAccordingly() {
 
+		loadValidConfiguration();
 		CustomConversions conversions = factory.getBean(CustomConversions.class);
 		assertThat(conversions.hasCustomWriteTarget(Person.class), is(true));
 		assertThat(conversions.hasCustomWriteTarget(Account.class), is(true));
@@ -87,6 +97,7 @@ public class MappingMongoConverterParserIntegrationTests {
 	@Test
 	public void activatesAbbreviatingPropertiesCorrectly() {
 
+		loadValidConfiguration();
 		BeanDefinition definition = factory.getBeanDefinition("abbreviatingConverter.mappingContext");
 		Object value = definition.getPropertyValues().getPropertyValue("fieldNamingStrategy").getValue();
 
@@ -95,6 +106,32 @@ public class MappingMongoConverterParserIntegrationTests {
 		assertThat(strategy.getBeanClassName(), is(CamelCaseAbbreviatingFieldNamingStrategy.class.getName()));
 	}
 
+	/**
+	 * @see DATAMONGO-892
+	 */
+	@Test
+	public void shouldThrowBeanDefinitionParsingExceptionIfConverterDefinedAsNestedBean() {
+
+		exception.expect(BeanDefinitionParsingException.class);
+		exception.expectMessage("Mongo Converter must not be defined as nested bean.");
+
+		loadNestedBeanConfiguration();
+	}
+
+	private void loadValidConfiguration() {
+		this.loadConfiguration("namespace/converter.xml");
+	}
+
+	private void loadNestedBeanConfiguration() {
+		this.loadConfiguration("namespace/converter-nested-bean-definition.xml");
+	}
+
+	private void loadConfiguration(String configLocation) {
+		factory = new DefaultListableBeanFactory();
+		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(factory);
+		reader.loadBeanDefinitions(new ClassPathResource(configLocation));
+	}
+
 	@Component
 	public static class SampleConverter implements Converter<Person, DBObject> {
 		public DBObject convert(Person source) {

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

@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2011 by the original author(s).
+ * Copyright 2011-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,33 +15,32 @@
  */
 package org.springframework.data.mongodb.config;
 
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-
-import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessResourceFailureException;
+import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * Integration tests for {@link MongoDbFactory}.
  * 
- * @author Thomas Risbergf
+ * @author Thomas Risberg
+ * @author Oliver Gierke
  */
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
 public class MongoDbFactoryNoDatabaseRunningTests {
 
-	@Autowired
-	MongoTemplate mongoTemplate;
+	@Autowired MongoTemplate mongoTemplate;
 
 	/**
-	 * @see DATADOC-139
+	 * @see DATAMONGO-139
 	 */
 	@Test
 	public void startsUpWithoutADatabaseRunning() {

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

@@ -19,6 +19,7 @@ package org.springframework.data.mongodb.config;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
+import java.net.InetAddress;
 import java.util.List;
 
 import org.junit.Ignore;
@@ -40,8 +41,7 @@ import com.mongodb.ServerAddress;
 @ContextConfiguration
 public class MongoNamespaceReplicaSetTests {
 
-	@Autowired
-	private ApplicationContext ctx;
+	@Autowired private ApplicationContext ctx;
 
 	@Test
 	@SuppressWarnings("unchecked")
@@ -53,7 +53,10 @@ public class MongoNamespaceReplicaSetTests {
 		List<ServerAddress> replicaSetSeeds = (List<ServerAddress>) ReflectionTestUtils.getField(mfb, "replicaSetSeeds");
 
 		assertThat(replicaSetSeeds, is(notNullValue()));
-		assertThat(replicaSetSeeds, hasItems(new ServerAddress("127.0.0.1", 10001), new ServerAddress("localhost", 10002)));
+		assertThat(
+				replicaSetSeeds,
+				hasItems(new ServerAddress(InetAddress.getByName("127.0.0.1"), 10001),
+						new ServerAddress(InetAddress.getByName("localhost"), 10002)));
 	}
 
 	@Test

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 the original author or authors.
+ * Copyright 2010-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,8 +53,10 @@ public class MongoNamespaceTests {
 
 	@Test
 	public void testMongoSingleton() throws Exception {
+
 		assertTrue(ctx.containsBean("noAttrMongo"));
 		MongoFactoryBean mfb = (MongoFactoryBean) ctx.getBean("&noAttrMongo");
+
 		assertNull(getField(mfb, "host"));
 		assertNull(getField(mfb, "port"));
 	}
@@ -64,8 +66,10 @@ public class MongoNamespaceTests {
 
 		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);
 
@@ -105,8 +109,10 @@ public class MongoNamespaceTests {
 
 	@Test
 	public void testSecondMongoDbFactory() {
+
 		assertTrue(ctx.containsBean("secondMongoDbFactory"));
 		MongoDbFactory dbf = (MongoDbFactory) ctx.getBean("secondMongoDbFactory");
+
 		Mongo mongo = (Mongo) getField(dbf, "mongo");
 		assertEquals("localhost", mongo.getAddress().getHost());
 		assertEquals(27017, mongo.getAddress().getPort());
@@ -137,10 +143,13 @@ public class MongoNamespaceTests {
 	 */
 	@Test
 	public void testMongoTemplateFactory() {
+
 		assertTrue(ctx.containsBean("mongoTemplate"));
 		MongoOperations operations = (MongoOperations) ctx.getBean("mongoTemplate");
+
 		MongoDbFactory dbf = (MongoDbFactory) getField(operations, "mongoDbFactory");
 		assertEquals("database", getField(dbf, "databaseName"));
+
 		MongoConverter converter = (MongoConverter) getField(operations, "mongoConverter");
 		assertNotNull(converter);
 	}
@@ -150,10 +159,13 @@ public class MongoNamespaceTests {
 	 */
 	@Test
 	public void testSecondMongoTemplateFactory() {
+
 		assertTrue(ctx.containsBean("anotherMongoTemplate"));
 		MongoOperations operations = (MongoOperations) ctx.getBean("anotherMongoTemplate");
+
 		MongoDbFactory dbf = (MongoDbFactory) getField(operations, "mongoDbFactory");
 		assertEquals("database", getField(dbf, "databaseName"));
+
 		WriteConcern writeConcern = (WriteConcern) getField(operations, "writeConcern");
 		assertEquals(WriteConcern.SAFE, writeConcern);
 	}
@@ -163,10 +175,13 @@ public class MongoNamespaceTests {
 	 */
 	@Test
 	public void testGridFsTemplateFactory() {
+
 		assertTrue(ctx.containsBean("gridFsTemplate"));
 		GridFsOperations operations = (GridFsOperations) ctx.getBean("gridFsTemplate");
+
 		MongoDbFactory dbf = (MongoDbFactory) getField(operations, "dbFactory");
 		assertEquals("database", getField(dbf, "databaseName"));
+
 		MongoConverter converter = (MongoConverter) getField(operations, "converter");
 		assertNotNull(converter);
 	}
@@ -176,10 +191,31 @@ public class MongoNamespaceTests {
 	 */
 	@Test
 	public void testSecondGridFsTemplateFactory() {
-		assertTrue(ctx.containsBean("antoherGridFsTemplate"));
-		GridFsOperations operations = (GridFsOperations) ctx.getBean("antoherGridFsTemplate");
+
+		assertTrue(ctx.containsBean("secondGridFsTemplate"));
+		GridFsOperations operations = (GridFsOperations) ctx.getBean("secondGridFsTemplate");
+
 		MongoDbFactory dbf = (MongoDbFactory) getField(operations, "dbFactory");
 		assertEquals("database", getField(dbf, "databaseName"));
+		assertEquals(null, getField(operations, "bucket"));
+
+		MongoConverter converter = (MongoConverter) getField(operations, "converter");
+		assertNotNull(converter);
+	}
+
+	/**
+	 * @see DATAMONGO-823
+	 */
+	@Test
+	public void testThirdGridFsTemplateFactory() {
+
+		assertTrue(ctx.containsBean("thirdGridFsTemplate"));
+		GridFsOperations operations = (GridFsOperations) ctx.getBean("thirdGridFsTemplate");
+
+		MongoDbFactory dbf = (MongoDbFactory) getField(operations, "dbFactory");
+		assertEquals("database", getField(dbf, "databaseName"));
+		assertEquals("bucketString", getField(operations, "bucket"));
+
 		MongoConverter converter = (MongoConverter) getField(operations, "converter");
 		assertNotNull(converter);
 	}
@@ -187,14 +223,19 @@ public class MongoNamespaceTests {
 	@Test
 	@SuppressWarnings("deprecation")
 	public void testMongoSingletonWithPropertyPlaceHolders() throws Exception {
+
 		assertTrue(ctx.containsBean("mongo"));
 		MongoFactoryBean mfb = (MongoFactoryBean) ctx.getBean("&mongo");
+
 		String host = (String) getField(mfb, "host");
 		Integer port = (Integer) getField(mfb, "port");
+
 		assertEquals("127.0.0.1", host);
 		assertEquals(new Integer(27017), port);
+
 		Mongo mongo = mfb.getObject();
 		MongoOptions mongoOpts = mongo.getMongoOptions();
+
 		assertEquals(8, mongoOpts.connectionsPerHost);
 		assertEquals(1000, mongoOpts.connectTimeout);
 		assertEquals(1500, mongoOpts.maxWaitTime);

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

@@ -18,12 +18,15 @@ package org.springframework.data.mongodb.config;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
+import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Arrays;
 import java.util.Collection;
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 import com.mongodb.ServerAddress;
 
@@ -35,6 +38,8 @@ import com.mongodb.ServerAddress;
  */
 public class ServerAddressPropertyEditorUnitTests {
 
+	@Rule public ExpectedException expectedException = ExpectedException.none();
+
 	ServerAddressPropertyEditor editor;
 
 	@Before
@@ -81,11 +86,111 @@ public class ServerAddressPropertyEditorUnitTests {
 		assertNull(editor.getValue());
 	}
 
+	/**
+	 * @see DATAMONGO-808
+	 */
+	@Test
+	public void handleIPv6HostaddressLoopbackShort() throws UnknownHostException {
+
+		String hostAddress = "::1";
+		editor.setAsText(hostAddress);
+
+		assertSingleAddressWithPort(hostAddress, null, editor.getValue());
+	}
+
+	/**
+	 * @see DATAMONGO-808
+	 */
+	@Test
+	public void handleIPv6HostaddressLoopbackShortWithPort() throws UnknownHostException {
+
+		String hostAddress = "::1";
+		int port = 27017;
+		editor.setAsText(hostAddress + ":" + port);
+
+		assertSingleAddressWithPort(hostAddress, port, editor.getValue());
+	}
+
+	/**
+	 * Here we detect no port since the last segment of the address contains leading zeros.
+	 * 
+	 * @see DATAMONGO-808
+	 */
+	@Test
+	public void handleIPv6HostaddressLoopbackLong() throws UnknownHostException {
+
+		String hostAddress = "0000:0000:0000:0000:0000:0000:0000:0001";
+		editor.setAsText(hostAddress);
+
+		assertSingleAddressWithPort(hostAddress, null, editor.getValue());
+	}
+
+	/**
+	 * @see DATAMONGO-808
+	 */
+	@Test
+	public void handleIPv6HostaddressLoopbackLongWithBrackets() throws UnknownHostException {
+
+		String hostAddress = "[0000:0000:0000:0000:0000:0000:0000:0001]";
+		editor.setAsText(hostAddress);
+
+		assertSingleAddressWithPort(hostAddress, null, editor.getValue());
+	}
+
+	/**
+	 * We can't tell whether the last part of the hostAddress represents a port or not.
+	 * 
+	 * @see DATAMONGO-808
+	 */
+	@Test
+	public void shouldFailToHandleAmbiguousIPv6HostaddressLongWithoutPortAndWithoutBrackets() throws UnknownHostException {
+
+		expectedException.expect(IllegalArgumentException.class);
+
+		String hostAddress = "0000:0000:0000:0000:0000:0000:0000:128";
+		editor.setAsText(hostAddress);
+	}
+
+	/**
+	 * @see DATAMONGO-808
+	 */
+	@Test
+	public void handleIPv6HostaddressExampleAddressWithPort() throws UnknownHostException {
+
+		String hostAddress = "0000:0000:0000:0000:0000:0000:0000:0001";
+		int port = 27017;
+		editor.setAsText(hostAddress + ":" + port);
+
+		assertSingleAddressWithPort(hostAddress, port, editor.getValue());
+	}
+
+	/**
+	 * @see DATAMONGO-808
+	 */
+	@Test
+	public void handleIPv6HostaddressExampleAddressInBracketsWithPort() throws UnknownHostException {
+
+		String hostAddress = "[0000:0000:0000:0000:0000:0000:0000:0001]";
+		int port = 27017;
+		editor.setAsText(hostAddress + ":" + port);
+
+		assertSingleAddressWithPort(hostAddress, port, editor.getValue());
+	}
+
 	private static void assertSingleAddressOfLocalhost(Object result) throws UnknownHostException {
+		assertSingleAddressWithPort("localhost", null, result);
+	}
+
+	private static void assertSingleAddressWithPort(String hostAddress, Integer port, Object result)
+			throws UnknownHostException {
 
 		assertThat(result, is(instanceOf(ServerAddress[].class)));
 		Collection<ServerAddress> addresses = Arrays.asList((ServerAddress[]) result);
 		assertThat(addresses, hasSize(1));
-		assertThat(addresses, hasItem(new ServerAddress("localhost")));
+		if (port == null) {
+			assertThat(addresses, hasItem(new ServerAddress(InetAddress.getByName(hostAddress))));
+		} else {
+			assertThat(addresses, hasItem(new ServerAddress(InetAddress.getByName(hostAddress), port)));
+		}
 	}
 }

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

@@ -70,7 +70,7 @@ public abstract class DBObjectTestUtils {
 	}
 
 	@SuppressWarnings("unchecked")
-	private static <T> T getTypedValue(DBObject source, String key, Class<T> type) {
+	public static <T> T getTypedValue(DBObject source, String key, Class<T> type) {
 
 		Object value = source.get(key);
 		assertThat(value, is(notNullValue()));

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2013 the original author or authors.
+ * Copyright 2011-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@ package org.springframework.data.mongodb.core;
 
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
+import static org.junit.Assume.*;
 import static org.mockito.Mockito.*;
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
@@ -25,6 +26,7 @@ import static org.springframework.data.mongodb.core.query.Update.*;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -32,10 +34,8 @@ import java.util.List;
 import java.util.Map;
 
 import org.bson.types.ObjectId;
-import org.hamcrest.CoreMatchers;
 import org.joda.time.DateTime;
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -51,6 +51,7 @@ import org.springframework.dao.OptimisticLockingFailureException;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.PersistenceConstructor;
 import org.springframework.data.annotation.Version;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.mapping.model.MappingException;
@@ -59,6 +60,7 @@ 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.LazyLoadingProxy;
 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;
@@ -72,8 +74,10 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.util.StringUtils;
 
 import com.mongodb.BasicDBObject;
+import com.mongodb.CommandResult;
 import com.mongodb.DBCollection;
 import com.mongodb.DBCursor;
 import com.mongodb.DBObject;
@@ -93,15 +97,20 @@ import com.mongodb.WriteResult;
  * @author Patryk Wasik
  * @author Thomas Darimont
  * @author Komi Innocent
+ * @author Christoph Strobl
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration("classpath:infrastructure.xml")
 public class MongoTemplateTests {
 
+	private static final org.springframework.data.util.Version TWO_DOT_FOUR = org.springframework.data.util.Version
+			.parse("2.4");
+
 	@Autowired MongoTemplate template;
 	@Autowired MongoDbFactory factory;
 
 	MongoTemplate mappingTemplate;
+	org.springframework.data.util.Version mongoVersion;
 
 	@Rule public ExpectedException thrown = ExpectedException.none();
 
@@ -132,6 +141,7 @@ public class MongoTemplateTests {
 	@Before
 	public void setUp() {
 		cleanDb();
+		queryMongoVersionIfNecessary();
 	}
 
 	@After
@@ -139,6 +149,14 @@ public class MongoTemplateTests {
 		cleanDb();
 	}
 
+	private void queryMongoVersionIfNecessary() {
+
+		if (mongoVersion == null) {
+			CommandResult result = template.executeCommand("{ buildInfo: 1 }");
+			mongoVersion = org.springframework.data.util.Version.parse(result.get("version").toString());
+		}
+	}
+
 	protected void cleanDb() {
 		template.dropCollection(Person.class);
 		template.dropCollection(PersonWithAList.class);
@@ -163,6 +181,13 @@ public class MongoTemplateTests {
 		template.dropCollection(ObjectWith3AliasedFields.class);
 		template.dropCollection(ObjectWith3AliasedFieldsAndNestedAddress.class);
 		template.dropCollection(BaseDoc.class);
+		template.dropCollection(ObjectWithEnumValue.class);
+		template.dropCollection(DocumentWithCollection.class);
+		template.dropCollection(DocumentWithCollectionOfSimpleType.class);
+		template.dropCollection(DocumentWithMultipleCollections.class);
+		template.dropCollection(DocumentWithDBRefCollection.class);
+		template.dropCollection(SomeContent.class);
+		template.dropCollection(SomeTemplate.class);
 	}
 
 	@Test
@@ -216,6 +241,7 @@ public class MongoTemplateTests {
 
 	/**
 	 * @see DATAMONGO-480
+	 * @see DATAMONGO-799
 	 */
 	@Test
 	public void throwsExceptionForUpdateWithInvalidPushOperator() {
@@ -231,8 +257,10 @@ public class MongoTemplateTests {
 
 		thrown.expect(DataIntegrityViolationException.class);
 		thrown.expectMessage("Execution");
-		thrown.expectMessage("$push");
+		thrown.expectMessage("UPDATE");
+		thrown.expectMessage("array");
 		thrown.expectMessage("firstName");
+		thrown.expectMessage("failed");
 
 		Query query = new Query(Criteria.where("firstName").is("Amol"));
 		Update upd = new Update().push("age", 29);
@@ -272,6 +300,9 @@ public class MongoTemplateTests {
 	@Test
 	public void rejectsDuplicateIdInInsertAll() {
 
+		thrown.expect(DataIntegrityViolationException.class);
+		thrown.expectMessage("E11000 duplicate key error index: database.person.$_id_");
+
 		MongoTemplate template = new MongoTemplate(factory);
 		template.setWriteResultChecking(WriteResultChecking.EXCEPTION);
 
@@ -283,15 +314,7 @@ public class MongoTemplateTests {
 		records.add(person);
 		records.add(person);
 
-		try {
-			template.insertAll(records);
-			fail("Expected DataIntegrityViolationException!");
-		} catch (DataIntegrityViolationException e) {
-			assertThat(
-					e.getMessage(),
-					CoreMatchers
-							.startsWith("Insert list failed: E11000 duplicate key error index: database.person.$_id_  dup key: { : ObjectId"));
-		}
+		template.insertAll(records);
 	}
 
 	@Test
@@ -879,7 +902,7 @@ public class MongoTemplateTests {
 			l2.add(31);
 			Query q3 = new Query(Criteria.where("age").in(l1, l2));
 			template.find(q3, PersonWithIdPropertyOfTypeObjectId.class);
-			Assert.fail("Should have trown an InvalidDocumentStoreApiUsageException");
+			fail("Should have trown an InvalidDocumentStoreApiUsageException");
 		} catch (InvalidMongoDbApiUsageException e) {}
 	}
 
@@ -1796,12 +1819,12 @@ public class MongoTemplateTests {
 
 		Document doc = new Document();
 		doc.id = "4711";
-		doc.model = new ModelA().withValue("foo");
+		doc.model = new ModelA("foo");
 		template.insert(doc);
 
 		Query query = new Query(Criteria.where("id").is(doc.id));
 		String newModelValue = "bar";
-		Update update = Update.update("model", new ModelA().withValue(newModelValue));
+		Update update = Update.update("model", new ModelA(newModelValue));
 		template.updateFirst(query, update, Document.class);
 
 		Document result = template.findOne(query, Document.class);
@@ -2055,25 +2078,682 @@ public class MongoTemplateTests {
 		assertThat(result.get(0).field, is(value));
 	}
 
+	/**
+	 * @see DATAMONGO-816
+	 */
+	@Test
+	public void shouldExecuteQueryShouldMapQueryBeforeQueryExecution() {
+
+		ObjectWithEnumValue o = new ObjectWithEnumValue();
+		o.value = EnumValue.VALUE2;
+		template.save(o);
+
+		Query q = Query.query(Criteria.where("value").in(EnumValue.VALUE2));
+
+		template.executeQuery(q, StringUtils.uncapitalize(ObjectWithEnumValue.class.getSimpleName()),
+				new DocumentCallbackHandler() {
+
+					@Override
+					public void processDocument(DBObject dbObject) throws MongoException, DataAccessException {
+
+						assertThat(dbObject, is(notNullValue()));
+
+						ObjectWithEnumValue result = template.getConverter().read(ObjectWithEnumValue.class, dbObject);
+
+						assertThat(result.value, is(EnumValue.VALUE2));
+					}
+				});
+	}
+
+	/**
+	 * @see DATAMONGO-811
+	 */
+	@Test
+	public void updateFirstShouldIncreaseVersionForVersionedEntity() {
+
+		VersionedPerson person = new VersionedPerson();
+		person.firstname = "Dave";
+		person.lastname = "Matthews";
+		template.save(person);
+		assertThat(person.id, is(notNullValue()));
+
+		Query qry = query(where("id").is(person.id));
+		VersionedPerson personAfterFirstSave = template.findOne(qry, VersionedPerson.class);
+		assertThat(personAfterFirstSave.version, is(0L));
+
+		template.updateFirst(qry, Update.update("lastname", "Bubu"), VersionedPerson.class);
+
+		VersionedPerson personAfterUpdateFirst = template.findOne(qry, VersionedPerson.class);
+		assertThat(personAfterUpdateFirst.version, is(1L));
+		assertThat(personAfterUpdateFirst.lastname, is("Bubu"));
+	}
+
+	/**
+	 * @see DATAMONGO-811
+	 */
+	@Test
+	public void updateFirstShouldIncreaseVersionOnlyForFirstMatchingEntity() {
+
+		VersionedPerson person1 = new VersionedPerson();
+		person1.firstname = "Dave";
+
+		VersionedPerson person2 = new VersionedPerson();
+		person2.firstname = "Dave";
+
+		template.save(person1);
+		template.save(person2);
+		Query q = query(where("id").in(person1.id, person2.id));
+
+		template.updateFirst(q, Update.update("lastname", "Metthews"), VersionedPerson.class);
+
+		for (VersionedPerson p : template.find(q, VersionedPerson.class)) {
+			if ("Metthews".equals(p.lastname)) {
+				assertThat(p.version, equalTo(Long.valueOf(1)));
+			} else {
+				assertThat(p.version, equalTo(Long.valueOf(0)));
+			}
+		}
+	}
+
+	/**
+	 * @see DATAMONGO-811
+	 */
+	@Test
+	public void updateMultiShouldIncreaseVersionOfAllUpdatedEntities() {
+
+		VersionedPerson person1 = new VersionedPerson();
+		person1.firstname = "Dave";
+
+		VersionedPerson person2 = new VersionedPerson();
+		person2.firstname = "Dave";
+
+		template.save(person1);
+		template.save(person2);
+
+		Query q = query(where("id").in(person1.id, person2.id));
+		template.updateMulti(q, Update.update("lastname", "Metthews"), VersionedPerson.class);
+
+		for (VersionedPerson p : template.find(q, VersionedPerson.class)) {
+			assertThat(p.version, equalTo(Long.valueOf(1)));
+		}
+	}
+
+	/**
+	 * @see DATAMONGO-686
+	 */
+	@Test
+	public void itShouldBePossibleToReuseAnExistingQuery() {
+
+		Sample sample = new Sample();
+		sample.id = "42";
+		sample.field = "A";
+
+		template.save(sample);
+
+		Query query = new Query();
+		query.addCriteria(where("_id").in("42", "43"));
+
+		assertThat(template.count(query, Sample.class), is(1L));
+
+		query.with(new PageRequest(0, 10));
+		query.with(new Sort("field"));
+
+		assertThat(template.find(query, Sample.class), is(not(empty())));
+	}
+
+	/**
+	 * @see DATAMONGO-807
+	 */
+	@Test
+	public void findAndModifyShouldRetrainTypeInformationWithinUpdatedType() {
+
+		Document document = new Document();
+		document.model = new ModelA("value1");
+
+		template.save(document);
+
+		Query query = query(where("id").is(document.id));
+		Update update = Update.update("model", new ModelA("value2"));
+		template.findAndModify(query, update, Document.class);
+
+		Document retrieved = template.findOne(query, Document.class);
+		assertThat(retrieved.model, instanceOf(ModelA.class));
+		assertThat(retrieved.model.value(), equalTo("value2"));
+	}
+
+	/**
+	 * @see DATAMONGO-407
+	 */
+	@Test
+	public void updatesShouldRetainTypeInformationEvenForCollections() {
+
+		List<Model> models = Arrays.<Model> asList(new ModelA("foo"));
+
+		DocumentWithCollection doc = new DocumentWithCollection(models);
+		doc.id = "4711";
+		template.insert(doc);
+
+		Query query = new Query(Criteria.where("id").is(doc.id));
+		query.addCriteria(where("models.value").is("foo"));
+		String newModelValue = "bar";
+		Update update = Update.update("models.$", new ModelA(newModelValue));
+		template.updateFirst(query, update, DocumentWithCollection.class);
+
+		Query findQuery = new Query(Criteria.where("id").is(doc.id));
+		DocumentWithCollection result = template.findOne(findQuery, DocumentWithCollection.class);
+
+		assertThat(result, is(notNullValue()));
+		assertThat(result.id, is(doc.id));
+		assertThat(result.models, is(notNullValue()));
+		assertThat(result.models, hasSize(1));
+		assertThat(result.models.get(0).value(), is(newModelValue));
+	}
+
+	/**
+	 * @see DATAMONGO-812
+	 */
+	@Test
+	public void updateMultiShouldAddValuesCorrectlyWhenUsingPushEachWithComplexTypes() {
+
+		assumeThat(mongoVersion.isGreaterThanOrEqualTo(TWO_DOT_FOUR), is(true));
+
+		DocumentWithCollection document = new DocumentWithCollection(Collections.<Model> emptyList());
+		template.save(document);
+		Query query = query(where("id").is(document.id));
+		assumeThat(template.findOne(query, DocumentWithCollection.class).models, hasSize(1));
+
+		Update update = new Update().push("models").each(new ModelA("model-b"), new ModelA("model-c"));
+		template.updateMulti(query, update, DocumentWithCollection.class);
+
+		assertThat(template.findOne(query, DocumentWithCollection.class).models, hasSize(3));
+	}
+
+	/**
+	 * @see DATAMONGO-812
+	 */
+	@Test
+	public void updateMultiShouldAddValuesCorrectlyWhenUsingPushEachWithSimpleTypes() {
+
+		assumeThat(mongoVersion.isGreaterThanOrEqualTo(TWO_DOT_FOUR), is(true));
+
+		DocumentWithCollectionOfSimpleType document = new DocumentWithCollectionOfSimpleType();
+		document.values = Arrays.asList("spring");
+		template.save(document);
+
+		Query query = query(where("id").is(document.id));
+		assumeThat(template.findOne(query, DocumentWithCollectionOfSimpleType.class).values, hasSize(1));
+
+		Update update = new Update().push("values").each("data", "mongodb");
+		template.updateMulti(query, update, DocumentWithCollectionOfSimpleType.class);
+
+		assertThat(template.findOne(query, DocumentWithCollectionOfSimpleType.class).values, hasSize(3));
+	}
+
+	/**
+	 * @see DATAMONOGO-828
+	 */
+	@Test
+	public void updateFirstShouldDoNothingWhenCalledForEntitiesThatDoNotExist() {
+
+		Query q = query(where("id").is(Long.MIN_VALUE));
+
+		template.updateFirst(q, Update.update("lastname", "supercalifragilisticexpialidocious"), VersionedPerson.class);
+		assertThat(template.findOne(q, VersionedPerson.class), nullValue());
+	}
+
+	/**
+	 * @see DATAMONGO-354
+	 */
+	@Test
+	public void testUpdateShouldAllowMultiplePushAll() {
+
+		DocumentWithMultipleCollections doc = new DocumentWithMultipleCollections();
+		doc.id = "1234";
+		doc.string1 = Arrays.asList("spring");
+		doc.string2 = Arrays.asList("one");
+
+		template.save(doc);
+
+		Update update = new Update().pushAll("string1", new Object[] { "data", "mongodb" });
+		update.pushAll("string2", new String[] { "two", "three" });
+
+		Query findQuery = new Query(Criteria.where("id").is(doc.id));
+		template.updateFirst(findQuery, update, DocumentWithMultipleCollections.class);
+
+		DocumentWithMultipleCollections result = template.findOne(findQuery, DocumentWithMultipleCollections.class);
+		assertThat(result.string1, hasItems("spring", "data", "mongodb"));
+		assertThat(result.string2, hasItems("one", "two", "three"));
+
+	}
+
+	/**
+	 * @see DATAMONGO-404
+	 */
+	@Test
+	public void updateWithPullShouldRemoveNestedItemFromDbRefAnnotatedCollection() {
+
+		Sample sample1 = new Sample("1", "A");
+		Sample sample2 = new Sample("2", "B");
+		template.save(sample1);
+		template.save(sample2);
+
+		DocumentWithDBRefCollection doc = new DocumentWithDBRefCollection();
+		doc.id = "1";
+		doc.dbRefAnnotatedList = Arrays.asList( //
+				sample1, //
+				sample2 //
+				);
+		template.save(doc);
+
+		Update update = new Update().pull("dbRefAnnotatedList", doc.dbRefAnnotatedList.get(1));
+
+		Query qry = query(where("id").is("1"));
+		template.updateFirst(qry, update, DocumentWithDBRefCollection.class);
+
+		DocumentWithDBRefCollection result = template.findOne(qry, DocumentWithDBRefCollection.class);
+
+		assertThat(result, is(notNullValue()));
+		assertThat(result.dbRefAnnotatedList, hasSize(1));
+		assertThat(result.dbRefAnnotatedList.get(0), is(notNullValue()));
+		assertThat(result.dbRefAnnotatedList.get(0).id, is((Object) "1"));
+	}
+
+	/**
+	 * @see DATAMONGO-404
+	 */
+	@Test
+	public void updateWithPullShouldRemoveNestedItemFromDbRefAnnotatedCollectionWhenGivenAnIdValueOfComponentTypeEntity() {
+
+		Sample sample1 = new Sample("1", "A");
+		Sample sample2 = new Sample("2", "B");
+		template.save(sample1);
+		template.save(sample2);
+
+		DocumentWithDBRefCollection doc = new DocumentWithDBRefCollection();
+		doc.id = "1";
+		doc.dbRefAnnotatedList = Arrays.asList( //
+				sample1, //
+				sample2 //
+				);
+		template.save(doc);
+
+		Update update = new Update().pull("dbRefAnnotatedList.id", "2");
+
+		Query qry = query(where("id").is("1"));
+		template.updateFirst(qry, update, DocumentWithDBRefCollection.class);
+
+		DocumentWithDBRefCollection result = template.findOne(qry, DocumentWithDBRefCollection.class);
+
+		assertThat(result, is(notNullValue()));
+		assertThat(result.dbRefAnnotatedList, hasSize(1));
+		assertThat(result.dbRefAnnotatedList.get(0), is(notNullValue()));
+		assertThat(result.dbRefAnnotatedList.get(0).id, is((Object) "1"));
+	}
+
+	/**
+	 * @see DATAMONGO-852
+	 */
+	@Test
+	public void updateShouldNotBumpVersionNumberIfVersionPropertyIncludedInUpdate() {
+
+		VersionedPerson person = new VersionedPerson();
+		person.firstname = "Dave";
+		person.lastname = "Matthews";
+		template.save(person);
+		assertThat(person.id, is(notNullValue()));
+
+		Query qry = query(where("id").is(person.id));
+		VersionedPerson personAfterFirstSave = template.findOne(qry, VersionedPerson.class);
+		assertThat(personAfterFirstSave.version, is(0L));
+
+		template.updateFirst(qry, Update.update("lastname", "Bubu").set("version", 100L), VersionedPerson.class);
+
+		VersionedPerson personAfterUpdateFirst = template.findOne(qry, VersionedPerson.class);
+		assertThat(personAfterUpdateFirst.version, is(100L));
+		assertThat(personAfterUpdateFirst.lastname, is("Bubu"));
+	}
+
+	/**
+	 * @see DATAMONGO-468
+	 */
+	@Test
+	public void shouldBeAbleToUpdateDbRefPropertyWithDomainObject() {
+
+		Sample sample1 = new Sample("1", "A");
+		Sample sample2 = new Sample("2", "B");
+		template.save(sample1);
+		template.save(sample2);
+
+		DocumentWithDBRefCollection doc = new DocumentWithDBRefCollection();
+		doc.id = "1";
+		doc.dbRefProperty = sample1;
+		template.save(doc);
+
+		Update update = new Update().set("dbRefProperty", sample2);
+
+		Query qry = query(where("id").is("1"));
+		template.updateFirst(qry, update, DocumentWithDBRefCollection.class);
+
+		DocumentWithDBRefCollection updatedDoc = template.findOne(qry, DocumentWithDBRefCollection.class);
+
+		assertThat(updatedDoc, is(notNullValue()));
+		assertThat(updatedDoc.dbRefProperty, is(notNullValue()));
+		assertThat(updatedDoc.dbRefProperty.id, is(sample2.id));
+		assertThat(updatedDoc.dbRefProperty.field, is(sample2.field));
+	}
+
+	/**
+	 * @see DATAMONGO-862
+	 */
+	@Test
+	public void testUpdateShouldWorkForPathsOnInterfaceMethods() {
+
+		DocumentWithCollection document = new DocumentWithCollection(Arrays.<Model> asList(new ModelA("spring"),
+				new ModelA("data")));
+
+		template.save(document);
+
+		Query query = query(where("id").is(document.id).and("models._id").exists(true));
+		Update update = new Update().set("models.$.value", "mongodb");
+		template.findAndModify(query, update, DocumentWithCollection.class);
+
+		DocumentWithCollection result = template.findOne(query(where("id").is(document.id)), DocumentWithCollection.class);
+		assertThat(result.models.get(0).value(), is("mongodb"));
+	}
+
+	/**
+	 * @see DATAMONGO-773
+	 */
+	@Test
+	public void testShouldSupportQueryWithIncludedDbRefField() {
+
+		Sample sample = new Sample("47111", "foo");
+		template.save(sample);
+
+		DocumentWithDBRefCollection doc = new DocumentWithDBRefCollection();
+		doc.id = "4711";
+		doc.dbRefProperty = sample;
+
+		template.save(doc);
+
+		Query qry = query(where("id").is(doc.id));
+		qry.fields().include("dbRefProperty");
+
+		List<DocumentWithDBRefCollection> result = template.find(qry, DocumentWithDBRefCollection.class);
+
+		assertThat(result, is(notNullValue()));
+		assertThat(result, hasSize(1));
+		assertThat(result.get(0), is(notNullValue()));
+		assertThat(result.get(0).dbRefProperty, is(notNullValue()));
+		assertThat(result.get(0).dbRefProperty.field, is(sample.field));
+	}
+
+	/**
+	 * @see DATAMONGO-880
+	 */
+	@Test
+	public void savingAndReassigningLazyLoadingProxies() {
+
+		template.dropCollection(SomeTemplate.class);
+		template.dropCollection(SomeMessage.class);
+		template.dropCollection(SomeContent.class);
+
+		SomeContent content = new SomeContent();
+		content.id = "C1";
+		content.text = "BUBU";
+		template.save(content);
+
+		SomeTemplate tmpl = new SomeTemplate();
+		tmpl.id = "T1";
+		tmpl.content = content; // @DBRef(lazy=true) tmpl.content
+
+		template.save(tmpl);
+
+		SomeTemplate savedTmpl = template.findById(tmpl.id, SomeTemplate.class);
+
+		SomeMessage message = new SomeMessage();
+		message.id = "M1";
+		message.dbrefContent = savedTmpl.content; // @DBRef message.dbrefContent
+		message.normalContent = savedTmpl.content;
+
+		template.save(message);
+
+		SomeMessage savedMessage = template.findById(message.id, SomeMessage.class);
+
+		assertThat(savedMessage.dbrefContent.text, is(content.text));
+		assertThat(savedMessage.normalContent.text, is(content.text));
+	}
+
+	/**
+	 * @see DATAMONGO-884
+	 */
+	@Test
+	public void callingNonObjectMethodsOnLazyLoadingProxyShouldReturnNullIfUnderlyingDbrefWasDeletedInbetween() {
+
+		template.dropCollection(SomeTemplate.class);
+		template.dropCollection(SomeContent.class);
+
+		SomeContent content = new SomeContent();
+		content.id = "C1";
+		content.text = "BUBU";
+		template.save(content);
+
+		SomeTemplate tmpl = new SomeTemplate();
+		tmpl.id = "T1";
+		tmpl.content = content; // @DBRef(lazy=true) tmpl.content
+
+		template.save(tmpl);
+
+		SomeTemplate savedTmpl = template.findById(tmpl.id, SomeTemplate.class);
+
+		template.remove(content);
+
+		assertThat(savedTmpl.getContent().toString(), is("someContent:C1$LazyLoadingProxy"));
+		assertThat(savedTmpl.getContent(), is(instanceOf(LazyLoadingProxy.class)));
+		assertThat(savedTmpl.getContent().getText(), is(nullValue()));
+	}
+
+	/**
+	 * @see DATAMONGO-888
+	 */
+	@Test
+	public void sortOnIdFieldPropertyShouldBeMappedCorrectly() {
+
+		DoucmentWithNamedIdField one = new DoucmentWithNamedIdField();
+		one.someIdKey = "1";
+		one.value = "a";
+
+		DoucmentWithNamedIdField two = new DoucmentWithNamedIdField();
+		two.someIdKey = "2";
+		two.value = "b";
+
+		template.save(one);
+		template.save(two);
+
+		Query query = query(where("_id").in("1", "2")).with(new Sort(Direction.DESC, "someIdKey"));
+		assertThat(template.find(query, DoucmentWithNamedIdField.class), contains(two, one));
+	}
+
+	/**
+	 * @see DATAMONGO-888
+	 */
+	@Test
+	public void sortOnAnnotatedFieldPropertyShouldBeMappedCorrectly() {
+
+		DoucmentWithNamedIdField one = new DoucmentWithNamedIdField();
+		one.someIdKey = "1";
+		one.value = "a";
+
+		DoucmentWithNamedIdField two = new DoucmentWithNamedIdField();
+		two.someIdKey = "2";
+		two.value = "b";
+
+		template.save(one);
+		template.save(two);
+
+		Query query = query(where("_id").in("1", "2")).with(new Sort(Direction.DESC, "value"));
+		assertThat(template.find(query, DoucmentWithNamedIdField.class), contains(two, one));
+	}
+
+	/**
+	 * @see DATAMONGO-913
+	 */
+	@Test
+	public void shouldRetrieveInitializedValueFromDbRefAssociationAfterLoad() {
+
+		SomeContent content = new SomeContent();
+		content.id = "content-1";
+		content.name = "Content 1";
+		content.text = "Some text";
+
+		template.save(content);
+
+		SomeTemplate tmpl = new SomeTemplate();
+		tmpl.id = "template-1";
+		tmpl.content = content;
+
+		template.save(tmpl);
+
+		SomeTemplate result = template.findOne(query(where("content").is(tmpl.getContent())), SomeTemplate.class);
+
+		assertThat(result, is(notNullValue()));
+		assertThat(result.getContent(), is(notNullValue()));
+		assertThat(result.getContent().getId(), is(notNullValue()));
+		assertThat(result.getContent().getName(), is(notNullValue()));
+		assertThat(result.getContent().getText(), is(content.getText()));
+	}
+
+	/**
+	 * @see DATAMONGO-913
+	 */
+	@Test
+	public void shouldReuseExistingDBRefInQueryFromDbRefAssociationAfterLoad() {
+
+		SomeContent content = new SomeContent();
+		content.id = "content-1";
+		content.name = "Content 1";
+		content.text = "Some text";
+
+		template.save(content);
+
+		SomeTemplate tmpl = new SomeTemplate();
+		tmpl.id = "template-1";
+		tmpl.content = content;
+
+		template.save(tmpl);
+
+		SomeTemplate result = template.findOne(query(where("content").is(tmpl.getContent())), SomeTemplate.class);
+
+		// Use lazy-loading-proxy in query
+		result = template.findOne(query(where("content").is(result.getContent())), SomeTemplate.class);
+
+		assertNotNull(result.getContent().getName());
+		assertThat(result.getContent().getName(), is(content.getName()));
+	}
+
+	static class DoucmentWithNamedIdField {
+
+		@Id String someIdKey;
+
+		@Field(value = "val")//
+		String value;
+
+		@Override
+		public int hashCode() {
+			final int prime = 31;
+			int result = 1;
+			result = prime * result + (someIdKey == null ? 0 : someIdKey.hashCode());
+			result = prime * result + (value == null ? 0 : value.hashCode());
+			return result;
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (this == obj) {
+				return true;
+			}
+			if (obj == null) {
+				return false;
+			}
+			if (!(obj instanceof DoucmentWithNamedIdField)) {
+				return false;
+			}
+			DoucmentWithNamedIdField other = (DoucmentWithNamedIdField) obj;
+			if (someIdKey == null) {
+				if (other.someIdKey != null) {
+					return false;
+				}
+			} else if (!someIdKey.equals(other.someIdKey)) {
+				return false;
+			}
+			if (value == null) {
+				if (other.value != null) {
+					return false;
+				}
+			} else if (!value.equals(other.value)) {
+				return false;
+			}
+			return true;
+		}
+
+	}
+
+	static class DocumentWithDBRefCollection {
+
+		@Id public String id;
+
+		@org.springframework.data.mongodb.core.mapping.DBRef//
+		public List<Sample> dbRefAnnotatedList;
+
+		@org.springframework.data.mongodb.core.mapping.DBRef//
+		public Sample dbRefProperty;
+	}
+
+	static class DocumentWithCollection {
+
+		@Id String id;
+		List<Model> models;
+
+		DocumentWithCollection(List<Model> models) {
+			this.models = models;
+		}
+	}
+
+	static class DocumentWithCollectionOfSimpleType {
+
+		@Id String id;
+		List<String> values;
+	}
+
+	static class DocumentWithMultipleCollections {
+		@Id String id;
+		List<String> string1;
+		List<String> string2;
+	}
+
 	static interface Model {
 		String value();
 
-		Model withValue(String value);
+		String id();
 	}
 
 	static class ModelA implements Model {
 
+		@Id String id;
 		private String value;
 
+		ModelA(String value) {
+			this.value = value;
+		}
+
 		@Override
 		public String value() {
 			return this.value;
 		}
 
 		@Override
-		public Model withValue(String value) {
-			this.value = value;
-			return this;
+		public String id() {
+			return id;
 		}
 	}
 
@@ -2098,6 +2778,13 @@ public class MongoTemplateTests {
 
 		@Id String id;
 		String field;
+
+		public Sample() {}
+
+		public Sample(String id, String field) {
+			this.id = id;
+			this.field = field;
+		}
 	}
 
 	static class TestClass {
@@ -2180,4 +2867,49 @@ public class MongoTemplateTests {
 	static class ObjectWith3AliasedFieldsAndNestedAddress extends ObjectWith3AliasedFields {
 		@Field("adr") Address address;
 	}
+
+	static enum EnumValue {
+		VALUE1, VALUE2, VALUE3
+	}
+
+	static class ObjectWithEnumValue {
+
+		@Id String id;
+		EnumValue value;
+	}
+
+	public static class SomeTemplate {
+
+		String id;
+		@org.springframework.data.mongodb.core.mapping.DBRef(lazy = true) SomeContent content;
+
+		public SomeContent getContent() {
+			return content;
+		}
+	}
+
+	public static class SomeContent {
+
+		String id;
+		String text;
+		String name;
+
+		public String getName() {
+			return name;
+		}
+
+		public String getId() {
+			return id;
+		}
+
+		public String getText() {
+			return text;
+		}
+	}
+
+	static class SomeMessage {
+		String id;
+		@org.springframework.data.mongodb.core.mapping.DBRef SomeContent dbrefContent;
+		SomeContent normalContent;
+	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 the original author or authors.
+ * Copyright 2010-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,23 +21,28 @@ import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 import java.math.BigInteger;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.regex.Pattern;
 
 import org.bson.types.ObjectId;
+import org.hamcrest.core.Is;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.ArgumentMatcher;
+import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
-import org.springframework.context.ApplicationListener;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.annotation.Id;
+import org.springframework.data.annotation.Version;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.convert.CustomConversions;
 import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
@@ -45,12 +50,16 @@ import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.index.MongoPersistentEntityIndexCreator;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.test.util.ReflectionTestUtils;
 
+import com.mongodb.BasicDBObject;
+import com.mongodb.BasicDBObjectBuilder;
 import com.mongodb.DB;
 import com.mongodb.DBCollection;
+import com.mongodb.DBCursor;
 import com.mongodb.DBObject;
 import com.mongodb.Mongo;
 import com.mongodb.MongoException;
@@ -59,6 +68,7 @@ import com.mongodb.MongoException;
  * Unit tests for {@link MongoTemplate}.
  * 
  * @author Oliver Gierke
+ * @author Christoph Strobl
  */
 @RunWith(MockitoJUnitRunner.class)
 public class MongoTemplateUnitTests extends MongoOperationsUnitTests {
@@ -69,6 +79,7 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests {
 	@Mock Mongo mongo;
 	@Mock DB db;
 	@Mock DBCollection collection;
+	@Mock DBCursor cursor;
 
 	MongoExceptionTranslator exceptionTranslator = new MongoExceptionTranslator();
 	MappingMongoConverter converter;
@@ -84,7 +95,6 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests {
 		this.mappingContext = new MongoMappingContext();
 		this.converter = new MappingMongoConverter(new DefaultDbRefResolver(factory), mappingContext);
 		this.template = new MongoTemplate(factory, converter);
-
 	}
 
 	@Test(expected = IllegalArgumentException.class)
@@ -113,7 +123,10 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests {
 
 	@Test(expected = InvalidDataAccessApiUsageException.class)
 	public void rejectsNotFoundMapReduceResource() {
-		template.setApplicationContext(new GenericApplicationContext());
+
+		GenericApplicationContext ctx = new GenericApplicationContext();
+		ctx.refresh();
+		template.setApplicationContext(ctx);
 		template.mapReduce("foo", "classpath:doesNotExist.js", "function() {}", Person.class);
 	}
 
@@ -203,6 +216,46 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests {
 		assertThat(entity.id, is(5));
 	}
 
+	/**
+	 * @see DATAMONGO-868
+	 */
+	@Test
+	public void findAndModifyShouldBumpVersionByOneWhenVersionFieldNotIncludedInUpdate() {
+
+		VersionedEntity v = new VersionedEntity();
+		v.id = 1;
+		v.version = 0;
+
+		ArgumentCaptor<DBObject> captor = ArgumentCaptor.forClass(DBObject.class);
+
+		template.findAndModify(new Query(), new Update().set("id", "10"), VersionedEntity.class);
+		verify(collection, times(1)).findAndModify(Matchers.any(DBObject.class),
+				org.mockito.Matchers.isNull(DBObject.class), org.mockito.Matchers.isNull(DBObject.class), eq(false),
+				captor.capture(), eq(false), eq(false));
+
+		Assert.assertThat(captor.getValue().get("$inc"), Is.<Object> is(new BasicDBObject("version", 1L)));
+	}
+
+	/**
+	 * @see DATAMONGO-868
+	 */
+	@Test
+	public void findAndModifyShouldNotBumpVersionByOneWhenVersionFieldAlreadyIncludedInUpdate() {
+
+		VersionedEntity v = new VersionedEntity();
+		v.id = 1;
+		v.version = 0;
+
+		ArgumentCaptor<DBObject> captor = ArgumentCaptor.forClass(DBObject.class);
+
+		template.findAndModify(new Query(), new Update().set("version", 100), VersionedEntity.class);
+		verify(collection, times(1)).findAndModify(Matchers.any(DBObject.class), isNull(DBObject.class),
+				isNull(DBObject.class), eq(false), captor.capture(), eq(false), eq(false));
+
+		Assert.assertThat(captor.getValue().get("$set"), Is.<Object> is(new BasicDBObject("version", 100)));
+		Assert.assertThat(captor.getValue().get("$inc"), nullValue());
+	}
+
 	/**
 	 * @see DATAMONGO-533
 	 */
@@ -212,18 +265,47 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests {
 		GenericApplicationContext applicationContext = new GenericApplicationContext();
 		applicationContext.getBeanFactory().registerSingleton("foo",
 				new MongoPersistentEntityIndexCreator(new MongoMappingContext(), factory));
+		applicationContext.refresh();
+
+		GenericApplicationContext spy = spy(applicationContext);
 
 		MongoTemplate mongoTemplate = new MongoTemplate(factory, converter);
-		mongoTemplate.setApplicationContext(applicationContext);
+		mongoTemplate.setApplicationContext(spy);
 
-		Collection<ApplicationListener<?>> listeners = applicationContext.getApplicationListeners();
-		assertThat(listeners, hasSize(1));
+		verify(spy, times(1)).addApplicationListener(argThat(new ArgumentMatcher<MongoPersistentEntityIndexCreator>() {
 
-		ApplicationListener<?> listener = listeners.iterator().next();
+			@Override
+			public boolean matches(Object argument) {
 
-		assertThat(listener, is(instanceOf(MongoPersistentEntityIndexCreator.class)));
-		MongoPersistentEntityIndexCreator creator = (MongoPersistentEntityIndexCreator) listener;
-		assertThat(creator.isIndexCreatorFor(mappingContext), is(true));
+				if (!(argument instanceof MongoPersistentEntityIndexCreator)) {
+					return false;
+				}
+
+				return ((MongoPersistentEntityIndexCreator) argument).isIndexCreatorFor(mappingContext);
+			}
+		}));
+	}
+
+	/**
+	 * @see DATAMONGO-948
+	 */
+	@Test
+	public void sortShouldBeTakenAsIsWhenExecutingQueryWithoutSpecificTypeInformation() {
+
+		when(db.getCollection(Mockito.any(String.class))).thenReturn(collection);
+		when(collection.find(Mockito.any(DBObject.class))).thenReturn(cursor);
+		when(cursor.sort(Mockito.any(DBObject.class))).thenReturn(cursor);
+
+		Query query = Query.query(Criteria.where("foo").is("bar")).with(new Sort("foo"));
+		template.executeQuery(query, "collection1", new DocumentCallbackHandler() {
+
+			@Override
+			public void processDocument(DBObject dbObject) {}
+		});
+
+		ArgumentCaptor<DBObject> captor = ArgumentCaptor.forClass(DBObject.class);
+		verify(cursor, times(1)).sort(captor.capture());
+		assertThat(captor.getValue(), equalTo(new BasicDBObjectBuilder().add("foo", 1).get()));
 	}
 
 	class AutogenerateableId {
@@ -240,6 +322,12 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests {
 		}
 	}
 
+	static class VersionedEntity {
+
+		@Id Integer id;
+		@Version Integer version;
+	}
+
 	enum MyConverter implements Converter<AutogenerateableId, String> {
 
 		INSTANCE;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@
  */
 package org.springframework.data.mongodb.core;
 
-import static org.springframework.data.mongodb.core.query.Query.*;
-import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.mockito.Mockito.*;
+import static org.springframework.data.mongodb.core.query.Criteria.*;
+import static org.springframework.data.mongodb.core.query.Query.*;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -33,14 +33,13 @@ import com.mongodb.DBCursor;
  * Unit tests for {@link QueryCursorPreparer}.
  * 
  * @author Oliver Gierke
+ * @author Christoph Strobl
  */
 @RunWith(MockitoJUnitRunner.class)
 public class QueryCursorPreparerUnitTests {
 
-	@Mock
-	MongoDbFactory factory;
-	@Mock
-	DBCursor cursor;
+	@Mock MongoDbFactory factory;
+	@Mock DBCursor cursor;
 
 	/**
 	 * @see DATAMONGO-185
@@ -50,7 +49,7 @@ public class QueryCursorPreparerUnitTests {
 
 		Query query = query(where("foo").is("bar")).withHint("hint");
 
-		CursorPreparer preparer = new MongoTemplate(factory).new QueryCursorPreparer(query);
+		CursorPreparer preparer = new MongoTemplate(factory).new QueryCursorPreparer(query, null);
 		preparer.prepare(cursor);
 
 		verify(cursor).hint("hint");

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

@@ -26,10 +26,12 @@ import java.io.BufferedInputStream;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Scanner;
 
+import org.joda.time.LocalDateTime;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -41,9 +43,11 @@ 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.annotation.Id;
 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.aggregation.AggregationTests.CarDescriptor.Entry;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.util.Version;
 import org.springframework.test.context.ContextConfiguration;
@@ -107,6 +111,7 @@ public class AggregationTests {
 		mongoTemplate.dropCollection(DATAMONGO753.class);
 		mongoTemplate.dropCollection(Data.class);
 		mongoTemplate.dropCollection(DATAMONGO788.class);
+		mongoTemplate.dropCollection(User.class);
 	}
 
 	/**
@@ -185,7 +190,7 @@ public class AggregationTests {
 		AggregationResults<TagCount> results = mongoTemplate.aggregate(agg, INPUT_COLLECTION, TagCount.class);
 
 		assertThat(results, is(notNullValue()));
-		assertThat(results.getServerUsed(), is("/127.0.0.1:27017"));
+		assertThat(results.getServerUsed(), endsWith("127.0.0.1:27017"));
 
 		List<TagCount> tagCount = results.getMappedResults();
 
@@ -213,7 +218,7 @@ public class AggregationTests {
 		AggregationResults<TagCount> results = mongoTemplate.aggregate(aggregation, INPUT_COLLECTION, TagCount.class);
 
 		assertThat(results, is(notNullValue()));
-		assertThat(results.getServerUsed(), is("/127.0.0.1:27017"));
+		assertThat(results.getServerUsed(), endsWith("127.0.0.1:27017"));
 
 		List<TagCount> tagCount = results.getMappedResults();
 
@@ -237,7 +242,7 @@ public class AggregationTests {
 		AggregationResults<TagCount> results = mongoTemplate.aggregate(aggregation, INPUT_COLLECTION, TagCount.class);
 
 		assertThat(results, is(notNullValue()));
-		assertThat(results.getServerUsed(), is("/127.0.0.1:27017"));
+		assertThat(results.getServerUsed(), endsWith("127.0.0.1:27017"));
 
 		List<TagCount> tagCount = results.getMappedResults();
 
@@ -744,6 +749,114 @@ public class AggregationTests {
 		assertThat((Integer) items.get(1).get("y"), is(1));
 	}
 
+	/**
+	 * @see DATAMONGO-806
+	 */
+	@Test
+	public void shouldAllowGroupByIdFields() {
+
+		mongoTemplate.dropCollection(User.class);
+
+		LocalDateTime now = new LocalDateTime();
+
+		User user1 = new User("u1", new PushMessage("1", "aaa", now.toDate()));
+		User user2 = new User("u2", new PushMessage("2", "bbb", now.minusDays(2).toDate()));
+		User user3 = new User("u3", new PushMessage("3", "ccc", now.minusDays(1).toDate()));
+
+		mongoTemplate.save(user1);
+		mongoTemplate.save(user2);
+		mongoTemplate.save(user3);
+
+		Aggregation agg = newAggregation( //
+				project("id", "msgs"), //
+				unwind("msgs"), //
+				match(where("msgs.createDate").gt(now.minusDays(1).toDate())), //
+				group("id").push("msgs").as("msgs") //
+		);
+
+		AggregationResults<DBObject> results = mongoTemplate.aggregate(agg, User.class, DBObject.class);
+
+		List<DBObject> mappedResults = results.getMappedResults();
+
+		DBObject firstItem = mappedResults.get(0);
+		assertThat(firstItem.get("_id"), is(notNullValue()));
+		assertThat(String.valueOf(firstItem.get("_id")), is("u1"));
+	}
+
+	/**
+	 * @see DATAMONGO-840
+	 */
+	@Test
+	public void shouldAggregateOrderDataToAnInvoice() {
+
+		mongoTemplate.dropCollection(Order.class);
+
+		double taxRate = 0.19;
+
+		LineItem product1 = new LineItem("1", "p1", 1.23);
+		LineItem product2 = new LineItem("2", "p2", 0.87, 2);
+		LineItem product3 = new LineItem("3", "p3", 5.33);
+
+		Order order = new Order("o4711", "c42", new Date()).addItem(product1).addItem(product2).addItem(product3);
+
+		mongoTemplate.save(order);
+
+		AggregationResults<Invoice> results = mongoTemplate.aggregate(newAggregation(Order.class, //
+				match(where("id").is(order.getId())), unwind("items"), //
+				project("id", "customerId", "items") //
+						.andExpression("items.price * items.quantity").as("lineTotal"), //
+				group("id") //
+						.sum("lineTotal").as("netAmount") //
+						.addToSet("items").as("items"), //
+				project("id", "items", "netAmount") //
+						.and("orderId").previousOperation() //
+						.andExpression("netAmount * [0]", taxRate).as("taxAmount") //
+						.andExpression("netAmount * (1 + [0])", taxRate).as("totalAmount") //
+				), Invoice.class);
+
+		Invoice invoice = results.getUniqueMappedResult();
+
+		assertThat(invoice, is(notNullValue()));
+		assertThat(invoice.getOrderId(), is(order.getId()));
+		assertThat(invoice.getNetAmount(), is(closeTo(8.3, 000001)));
+		assertThat(invoice.getTaxAmount(), is(closeTo(1.577, 000001)));
+		assertThat(invoice.getTotalAmount(), is(closeTo(9.877, 000001)));
+	}
+
+	/**
+	 * @see DATAMONGO-924
+	 */
+	@Test
+	public void shouldAllowGroupingByAliasedFieldDefinedInFormerAggregationStage() {
+
+		mongoTemplate.dropCollection(CarPerson.class);
+
+		CarPerson person1 = new CarPerson("first1", "last1", new CarDescriptor.Entry("MAKE1", "MODEL1", 2000),
+				new CarDescriptor.Entry("MAKE1", "MODEL2", 2001), new CarDescriptor.Entry("MAKE2", "MODEL3", 2010),
+				new CarDescriptor.Entry("MAKE3", "MODEL4", 2014));
+
+		CarPerson person2 = new CarPerson("first2", "last2", new CarDescriptor.Entry("MAKE3", "MODEL4", 2014));
+
+		CarPerson person3 = new CarPerson("first3", "last3", new CarDescriptor.Entry("MAKE2", "MODEL5", 2011));
+
+		mongoTemplate.save(person1);
+		mongoTemplate.save(person2);
+		mongoTemplate.save(person3);
+
+		TypedAggregation<CarPerson> agg = Aggregation.newAggregation(CarPerson.class,
+				unwind("descriptors.carDescriptor.entries"), //
+				project() //
+						.and("descriptors.carDescriptor.entries.make").as("make") //
+						.and("descriptors.carDescriptor.entries.model").as("model") //
+						.and("firstName").as("firstName") //
+						.and("lastName").as("lastName"), //
+				group("make"));
+
+		AggregationResults<DBObject> result = mongoTemplate.aggregate(agg, DBObject.class);
+
+		assertThat(result.getMappedResults(), hasSize(3));
+	}
+
 	private void assertLikeStats(LikeStats like, String id, long count) {
 
 		assertThat(like, is(notNullValue()));
@@ -827,4 +940,85 @@ public class AggregationTests {
 		}
 	}
 
+	/**
+	 * @see DATAMONGO-806
+	 */
+	static class User {
+
+		@Id String id;
+		List<PushMessage> msgs;
+
+		public User() {}
+
+		public User(String id, PushMessage... msgs) {
+			this.id = id;
+			this.msgs = Arrays.asList(msgs);
+		}
+	}
+
+	/**
+	 * @see DATAMONGO-806
+	 */
+	static class PushMessage {
+
+		@Id String id;
+		String content;
+		Date createDate;
+
+		public PushMessage() {}
+
+		public PushMessage(String id, String content, Date createDate) {
+			this.id = id;
+			this.content = content;
+			this.createDate = createDate;
+		}
+	}
+
+	@org.springframework.data.mongodb.core.mapping.Document
+	static class CarPerson {
+
+		@Id private String id;
+		private String firstName;
+		private String lastName;
+		private Descriptors descriptors;
+
+		public CarPerson(String firstname, String lastname, Entry... entries) {
+			this.firstName = firstname;
+			this.lastName = lastname;
+
+			this.descriptors = new Descriptors();
+
+			this.descriptors.carDescriptor = new CarDescriptor(entries);
+		}
+	}
+
+	static class Descriptors {
+		private CarDescriptor carDescriptor;
+	}
+
+	static class CarDescriptor {
+
+		private List<Entry> entries = new ArrayList<AggregationTests.CarDescriptor.Entry>();
+
+		public CarDescriptor(Entry... entries) {
+
+			for (Entry entry : entries) {
+				this.entries.add(entry);
+			}
+		}
+
+		static class Entry {
+			private String make;
+			private String model;
+			private int year;
+
+			public Entry() {}
+
+			public Entry(String make, String model, int year) {
+				this.make = make;
+				this.model = model;
+				this.year = year;
+			}
+		}
+	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
+import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
 
 /**
@@ -161,4 +162,66 @@ public class AggregationUnitTests {
 		assertThat(fields.get("aCnt"), is((Object) 1));
 		assertThat(fields.get("a"), is((Object) "$_id.a"));
 	}
+
+	/**
+	 * @see DATAMONGO-838
+	 */
+	@Test
+	public void expressionBasedFieldsShouldBeReferencableInFollowingOperations() {
+
+		DBObject agg = newAggregation( //
+				project("a").andExpression("b+c").as("foo"), //
+				group("a").sum("foo").as("foosum") //
+		).toDbObject("foo", Aggregation.DEFAULT_CONTEXT);
+
+		@SuppressWarnings("unchecked")
+		DBObject secondProjection = ((List<DBObject>) agg.get("pipeline")).get(1);
+		DBObject fields = getAsDBObject(secondProjection, "$group");
+		assertThat(fields.get("foosum"), is((Object) new BasicDBObject("$sum", "$foo")));
+	}
+
+	/**
+	 * @see DATAMONGO-908
+	 */
+	@Test
+	public void shouldSupportReferingToNestedPropertiesInGroupOperation() {
+
+		DBObject agg = newAggregation( //
+				project("cmsParameterId", "rules"), //
+				unwind("rules"), //
+				group("cmsParameterId", "rules.ruleType").count().as("totol") //
+		).toDbObject("foo", Aggregation.DEFAULT_CONTEXT);
+
+		assertThat(agg, is(notNullValue()));
+
+		DBObject group = ((List<DBObject>) agg.get("pipeline")).get(2);
+		DBObject fields = getAsDBObject(group, "$group");
+		DBObject id = getAsDBObject(fields, "_id");
+
+		assertThat(id.get("ruleType"), is((Object) "$rules.ruleType"));
+	}
+
+	/**
+	 * @see DATAMONGO-924
+	 */
+	@Test
+	public void referencingProjectionAliasesFromPreviousStepShouldReferToTheSameFieldTarget() {
+
+		DBObject agg = newAggregation( //
+				project().and("foo.bar").as("ba") //
+				, project().and("ba").as("b") //
+		).toDbObject("foo", Aggregation.DEFAULT_CONTEXT);
+
+		DBObject projection0 = extractPipelineElement(agg, 0, "$project");
+		assertThat(projection0, is((DBObject) new BasicDBObject("ba", "$foo.bar")));
+
+		DBObject projection1 = extractPipelineElement(agg, 1, "$project");
+		assertThat(projection1, is((DBObject) new BasicDBObject("b", "$ba")));
+	}
+
+	private DBObject extractPipelineElement(DBObject agg, int index, String operation) {
+
+		List<DBObject> pipeline = (List<DBObject>) agg.get("pipeline");
+		return (DBObject) pipeline.get(index).get(operation);
+	}
 }

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

@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.aggregation;
+
+import java.util.List;
+
+/**
+ * @author Thomas Darimont
+ */
+public class Invoice {
+
+	String orderId;
+
+	double taxAmount;
+
+	double netAmount;
+
+	double totalAmount;
+
+	List<LineItem> items;
+
+	public String getOrderId() {
+		return orderId;
+	}
+
+	public void setOrderId(String orderId) {
+		this.orderId = orderId;
+	}
+
+	public double getTaxAmount() {
+		return taxAmount;
+	}
+
+	public void setTaxAmount(double taxAmount) {
+		this.taxAmount = taxAmount;
+	}
+
+	public double getNetAmount() {
+		return netAmount;
+	}
+
+	public void setNetAmount(double netAmount) {
+		this.netAmount = netAmount;
+	}
+
+	public double getTotalAmount() {
+		return totalAmount;
+	}
+
+	public void setTotalAmount(double totalAmount) {
+		this.totalAmount = totalAmount;
+	}
+
+	public List<LineItem> getItems() {
+		return items;
+	}
+
+	public void setItems(List<LineItem> items) {
+		this.items = items;
+	}
+}

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

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.aggregation;
+
+/**
+ * @author Thomas Darimont
+ */
+public class LineItem {
+
+	final String id;
+
+	final String caption;
+
+	final double price;
+
+	int quantity = 1;
+
+	@SuppressWarnings("unused")
+	private LineItem() {
+		this(null, null, 0.0, 0);
+	}
+
+	public LineItem(String id, String caption, double price) {
+		this.id = id;
+		this.caption = caption;
+		this.price = price;
+	}
+
+	public LineItem(String id, String caption, double price, int quantity) {
+		this(id, caption, price);
+		this.quantity = quantity;
+	}
+}

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

@@ -0,0 +1,70 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.aggregation;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Thomas Darimont
+ */
+public class Order {
+
+	final String id;
+
+	final String customerId;
+
+	final Date orderDate;
+
+	final List<LineItem> items;
+
+	public Order(String id, String customerId, Date orderDate) {
+		this(id, customerId, orderDate, new ArrayList<LineItem>());
+	}
+
+	public Order(String id, String customerId, Date orderDate, List<LineItem> items) {
+		this.id = id;
+		this.customerId = customerId;
+		this.orderDate = orderDate;
+		this.items = items;
+	}
+
+	public Order addItem(LineItem item) {
+
+		List<LineItem> newItems = new ArrayList<LineItem>(items != null ? items : Collections.<LineItem> emptyList());
+		newItems.add(item);
+
+		return new Order(id, customerId, orderDate, newItems);
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public String getCustomerId() {
+		return customerId;
+	}
+
+	public Date getOrderDate() {
+		return orderDate;
+	}
+
+	public List<LineItem> getItems() {
+		return items;
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.springframework.data.mongodb.core.Person;
 
 /**
  * Unit tests for {@link SpelExpressionTransformer}.
@@ -174,6 +175,26 @@ public class SpelExpressionTransformerUnitTests {
 				is("{ \"$multiply\" : [ { \"$add\" : [ 1 , 42 , 1.2345]} , 23]}"));
 	}
 
+	/**
+	 * @see DATAMONGO-840
+	 */
+	@Test
+	public void shouldRenderCompoundExpressionsWithIndexerAndFieldReference() {
+
+		Person person = new Person();
+		person.setAge(10);
+		assertThat(transform("[0].age + a.c", person), is("{ \"$add\" : [ 10 , \"$a.c\"]}"));
+	}
+
+	/**
+	 * @see DATAMONGO-840
+	 */
+	@Test
+	public void shouldRenderCompoundExpressionsWithOnlyFieldReferences() {
+
+		assertThat(transform("a.b + a.c"), is("{ \"$add\" : [ \"$a.b\" , \"$a.c\"]}"));
+	}
+
 	@Test
 	public void shouldRenderStringFunctions() {
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,22 +17,40 @@ package org.springframework.data.mongodb.core.aggregation;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
+import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
 
+import java.util.Arrays;
+import java.util.List;
+
+import org.bson.types.ObjectId;
 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.convert.converter.Converter;
+import org.springframework.core.convert.support.GenericConversionService;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.annotation.PersistenceConstructor;
 import org.springframework.data.mapping.model.MappingException;
+import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
+import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
+import org.springframework.data.mongodb.core.convert.CustomConversions;
 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.Document;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.query.Criteria;
+
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
 
 /**
  * Unit tests for {@link TypeBasedAggregationOperationContext}.
  * 
  * @author Oliver Gierke
+ * @author Thomas Darimont
  */
 @RunWith(MockitoJUnitRunner.class)
 public class TypeBasedAggregationOperationContextUnitTests {
@@ -76,12 +94,121 @@ public class TypeBasedAggregationOperationContextUnitTests {
 		assertThat(context.getReference(field), is(context.getReference("bar.name")));
 	}
 
+	/**
+	 * @see DATAMONGO-806
+	 */
+	@Test
+	public void aliasesIdFieldCorrectly() {
+
+		AggregationOperationContext context = getContext(Foo.class);
+		assertThat(context.getReference("id"), is(new FieldReference(new ExposedField(Fields.field("id", "_id"), true))));
+	}
+
+	/**
+	 * @see DATAMONGO-912
+	 */
+	@Test
+	public void shouldUseCustomConversionIfPresentAndConversionIsRequiredInFirstStage() {
+
+		CustomConversions customConversions = customAgeConversions();
+		converter.setCustomConversions(customConversions);
+		customConversions.registerConvertersIn((GenericConversionService) converter.getConversionService());
+
+		AggregationOperationContext context = getContext(FooPerson.class);
+
+		MatchOperation matchStage = match(Criteria.where("age").is(new Age(10)));
+		ProjectionOperation projectStage = project("age", "name");
+
+		DBObject agg = newAggregation(matchStage, projectStage).toDbObject("test", context);
+
+		DBObject age = getValue((DBObject) getValue(getPipelineElementFromAggregationAt(agg, 0), "$match"), "age");
+		assertThat(age, is((DBObject) new BasicDBObject("v", 10)));
+	}
+
+	/**
+	 * @see DATAMONGO-912
+	 */
+	@Test
+	public void shouldUseCustomConversionIfPresentAndConversionIsRequiredInLaterStage() {
+
+		CustomConversions customConversions = customAgeConversions();
+		converter.setCustomConversions(customConversions);
+		customConversions.registerConvertersIn((GenericConversionService) converter.getConversionService());
+
+		AggregationOperationContext context = getContext(FooPerson.class);
+
+		MatchOperation matchStage = match(Criteria.where("age").is(new Age(10)));
+		ProjectionOperation projectStage = project("age", "name");
+
+		DBObject agg = newAggregation(projectStage, matchStage).toDbObject("test", context);
+
+		DBObject age = getValue((DBObject) getValue(getPipelineElementFromAggregationAt(agg, 1), "$match"), "age");
+		assertThat(age, is((DBObject) new BasicDBObject("v", 10)));
+	}
+
+	@Document(collection = "person")
+	public static class FooPerson {
+
+		final ObjectId id;
+		final String name;
+		final Age age;
+
+		@PersistenceConstructor
+		FooPerson(ObjectId id, String name, Age age) {
+			this.id = id;
+			this.name = name;
+			this.age = age;
+		}
+	}
+
+	public static class Age {
+
+		final int value;
+
+		Age(int value) {
+			this.value = value;
+		}
+	}
+
+	public CustomConversions customAgeConversions() {
+		return new CustomConversions(Arrays.<Converter<?, ?>> asList(ageWriteConverter(), ageReadConverter()));
+	}
+
+	Converter<Age, DBObject> ageWriteConverter() {
+		return new Converter<Age, DBObject>() {
+			@Override
+			public DBObject convert(Age age) {
+				return new BasicDBObject("v", age.value);
+			}
+		};
+	}
+
+	Converter<DBObject, Age> ageReadConverter() {
+		return new Converter<DBObject, Age>() {
+			@Override
+			public Age convert(DBObject dbObject) {
+				return new Age(((Integer) dbObject.get("v")));
+			}
+		};
+	}
+
+	@SuppressWarnings("unchecked")
+	static DBObject getPipelineElementFromAggregationAt(DBObject agg, int index) {
+		return ((List<DBObject>) agg.get("pipeline")).get(index);
+	}
+
+	@SuppressWarnings("unchecked")
+	static <T> T getValue(DBObject o, String key) {
+		return (T) o.get(key);
+	}
+
 	private TypeBasedAggregationOperationContext getContext(Class<?> type) {
 		return new TypeBasedAggregationOperationContext(type, context, mapper);
 	}
 
 	static class Foo {
 
+		@Id String id;
 		Bar bar;
 	}
 

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

@@ -7,6 +7,7 @@ import java.net.URL;
 import java.text.DateFormat;
 import java.text.Format;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.Locale;
 import java.util.UUID;
 
@@ -183,6 +184,19 @@ public class CustomConversionsUnitTests {
 		assertThat(conversions.getCustomWriteTarget(DateTime.class, null), is(equalTo((Class) String.class)));
 	}
 
+	/**
+	 * @see DATAMONGO-881
+	 */
+	@Test
+	public void customConverterOverridesDefault() {
+
+		CustomConversions conversions = new CustomConversions(Arrays.asList(CustomDateTimeConverter.INSTANCE));
+		GenericConversionService conversionService = new DefaultConversionService();
+		conversions.registerConvertersIn(conversionService);
+
+		assertThat(conversionService.convert(new DateTime(), Date.class), is(new Date(0)));
+	}
+
 	enum FormatToStringConverter implements Converter<Format, String> {
 		INSTANCE;
 
@@ -227,4 +241,14 @@ public class CustomConversionsUnitTests {
 			return "";
 		}
 	}
+
+	enum CustomDateTimeConverter implements Converter<DateTime, Date> {
+
+		INSTANCE;
+
+		@Override
+		public Date convert(DateTime source) {
+			return new Date(0);
+		}
+	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,7 +50,10 @@ import com.mongodb.DBObject;
 import com.mongodb.DBRef;
 
 /**
+ * Unit tests dor {@link DbRefMappingMongoConverterUnitTests}.
+ * 
  * @author Oliver Gierke
+ * @author Thomas Darimont
  */
 @RunWith(MockitoJUnitRunner.class)
 public class DbRefMappingMongoConverterUnitTests {
@@ -283,6 +286,149 @@ public class DbRefMappingMongoConverterUnitTests {
 		assertThat(deserializedResult.dbRefToSerializableTarget.getValue(), is(value));
 	}
 
+	/**
+	 * @see DATAMONGO-884
+	 */
+	@Test
+	public void lazyLoadingProxyForToStringObjectMethodOverridingDbref() {
+
+		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();
+		WithObjectMethodOverrideLazyDbRefs lazyDbRefs = new WithObjectMethodOverrideLazyDbRefs();
+		lazyDbRefs.dbRefToToStringObjectMethodOverride = new ToStringObjectMethodOverrideLazyDbRefTarget(id, value);
+		converterSpy.write(lazyDbRefs, dbo);
+
+		WithObjectMethodOverrideLazyDbRefs result = converterSpy.read(WithObjectMethodOverrideLazyDbRefs.class, dbo);
+
+		assertThat(result.dbRefToToStringObjectMethodOverride, is(notNullValue()));
+		assertProxyIsResolved(result.dbRefToToStringObjectMethodOverride, false);
+		assertThat(result.dbRefToToStringObjectMethodOverride.toString(), is(id + ":" + value));
+		assertProxyIsResolved(result.dbRefToToStringObjectMethodOverride, true);
+	}
+
+	/**
+	 * @see DATAMONGO-884
+	 */
+	@Test
+	public void callingToStringObjectMethodOnLazyLoadingDbrefShouldNotInitializeProxy() {
+
+		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();
+		WithObjectMethodOverrideLazyDbRefs lazyDbRefs = new WithObjectMethodOverrideLazyDbRefs();
+		lazyDbRefs.dbRefToPlainObject = new LazyDbRefTarget(id, value);
+		converterSpy.write(lazyDbRefs, dbo);
+
+		WithObjectMethodOverrideLazyDbRefs result = converterSpy.read(WithObjectMethodOverrideLazyDbRefs.class, dbo);
+
+		assertThat(result.dbRefToPlainObject, is(notNullValue()));
+		assertProxyIsResolved(result.dbRefToPlainObject, false);
+
+		// calling Object#toString does not initialize the proxy.
+		String proxyString = result.dbRefToPlainObject.toString();
+		assertThat(proxyString, is("lazyDbRefTarget" + ":" + id + "$LazyLoadingProxy"));
+		assertProxyIsResolved(result.dbRefToPlainObject, false);
+
+		// calling another method not declared on object triggers proxy initialization.
+		assertThat(result.dbRefToPlainObject.getValue(), is(value));
+		assertProxyIsResolved(result.dbRefToPlainObject, true);
+	}
+
+	/**
+	 * @see DATAMONGO-884
+	 */
+	@Test
+	public void equalsObjectMethodOnLazyLoadingDbrefShouldNotInitializeProxy() {
+
+		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();
+		WithObjectMethodOverrideLazyDbRefs lazyDbRefs = new WithObjectMethodOverrideLazyDbRefs();
+		lazyDbRefs.dbRefToPlainObject = new LazyDbRefTarget(id, value);
+		lazyDbRefs.dbRefToToStringObjectMethodOverride = new ToStringObjectMethodOverrideLazyDbRefTarget(id, value);
+		converterSpy.write(lazyDbRefs, dbo);
+
+		WithObjectMethodOverrideLazyDbRefs result = converterSpy.read(WithObjectMethodOverrideLazyDbRefs.class, dbo);
+
+		assertThat(result.dbRefToPlainObject, is(notNullValue()));
+		assertProxyIsResolved(result.dbRefToPlainObject, false);
+
+		assertThat(result.dbRefToPlainObject, is(equalTo(result.dbRefToPlainObject)));
+		assertThat(result.dbRefToPlainObject, is(not(equalTo(null))));
+		assertThat(result.dbRefToPlainObject, is(not(equalTo((Object) lazyDbRefs.dbRefToToStringObjectMethodOverride))));
+
+		assertProxyIsResolved(result.dbRefToPlainObject, false);
+	}
+
+	/**
+	 * @see DATAMONGO-884
+	 */
+	@Test
+	public void hashcodeObjectMethodOnLazyLoadingDbrefShouldNotInitializeProxy() {
+
+		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();
+		WithObjectMethodOverrideLazyDbRefs lazyDbRefs = new WithObjectMethodOverrideLazyDbRefs();
+		lazyDbRefs.dbRefToPlainObject = new LazyDbRefTarget(id, value);
+		lazyDbRefs.dbRefToToStringObjectMethodOverride = new ToStringObjectMethodOverrideLazyDbRefTarget(id, value);
+		converterSpy.write(lazyDbRefs, dbo);
+
+		WithObjectMethodOverrideLazyDbRefs result = converterSpy.read(WithObjectMethodOverrideLazyDbRefs.class, dbo);
+
+		assertThat(result.dbRefToPlainObject, is(notNullValue()));
+		assertProxyIsResolved(result.dbRefToPlainObject, false);
+
+		assertThat(result.dbRefToPlainObject.hashCode(), is(311365444));
+
+		assertProxyIsResolved(result.dbRefToPlainObject, false);
+	}
+
+	/**
+	 * @see DATAMONGO-884
+	 */
+	@Test
+	public void lazyLoadingProxyForEqualsAndHashcodeObjectMethodOverridingDbref() {
+
+		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();
+		WithObjectMethodOverrideLazyDbRefs lazyDbRefs = new WithObjectMethodOverrideLazyDbRefs();
+		lazyDbRefs.dbRefEqualsAndHashcodeObjectMethodOverride1 = new EqualsAndHashCodeObjectMethodOverrideLazyDbRefTarget(
+				id, value);
+		lazyDbRefs.dbRefEqualsAndHashcodeObjectMethodOverride2 = new EqualsAndHashCodeObjectMethodOverrideLazyDbRefTarget(
+				id, value);
+		converterSpy.write(lazyDbRefs, dbo);
+
+		WithObjectMethodOverrideLazyDbRefs result = converterSpy.read(WithObjectMethodOverrideLazyDbRefs.class, dbo);
+
+		assertProxyIsResolved(result.dbRefEqualsAndHashcodeObjectMethodOverride1, false);
+		assertThat(result.dbRefEqualsAndHashcodeObjectMethodOverride1, is(notNullValue()));
+		result.dbRefEqualsAndHashcodeObjectMethodOverride1.equals(null);
+		assertProxyIsResolved(result.dbRefEqualsAndHashcodeObjectMethodOverride1, true);
+
+		assertProxyIsResolved(result.dbRefEqualsAndHashcodeObjectMethodOverride2, false);
+		assertThat(result.dbRefEqualsAndHashcodeObjectMethodOverride2, is(notNullValue()));
+		result.dbRefEqualsAndHashcodeObjectMethodOverride2.hashCode();
+		assertProxyIsResolved(result.dbRefEqualsAndHashcodeObjectMethodOverride2, true);
+	}
+
 	private Object transport(Object result) {
 		return SerializationUtils.deserialize(SerializationUtils.serialize(result));
 	}
@@ -345,6 +491,7 @@ public class DbRefMappingMongoConverterUnitTests {
 		}
 	}
 
+	@SuppressWarnings("serial")
 	static class LazyDbRefTargetWithPeristenceConstructor extends LazyDbRefTarget {
 
 		boolean persistenceConstructorCalled;
@@ -362,6 +509,7 @@ public class DbRefMappingMongoConverterUnitTests {
 		}
 	}
 
+	@SuppressWarnings("serial")
 	static class LazyDbRefTargetWithPeristenceConstructorWithoutDefaultConstructor extends LazyDbRefTarget {
 
 		boolean persistenceConstructorCalled;
@@ -387,4 +535,74 @@ public class DbRefMappingMongoConverterUnitTests {
 
 		private static final long serialVersionUID = 1L;
 	}
+
+	static class ToStringObjectMethodOverrideLazyDbRefTarget extends LazyDbRefTarget {
+
+		private static final long serialVersionUID = 1L;
+
+		public ToStringObjectMethodOverrideLazyDbRefTarget() {}
+
+		public ToStringObjectMethodOverrideLazyDbRefTarget(String id, String value) {
+			super(id, value);
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see java.lang.Object#toString()
+		 */
+		@Override
+		public String toString() {
+			return this.id + ":" + this.value;
+		}
+	}
+
+	static class EqualsAndHashCodeObjectMethodOverrideLazyDbRefTarget extends LazyDbRefTarget {
+
+		private static final long serialVersionUID = 1L;
+
+		public EqualsAndHashCodeObjectMethodOverrideLazyDbRefTarget() {}
+
+		public EqualsAndHashCodeObjectMethodOverrideLazyDbRefTarget(String id, String value) {
+			super(id, value);
+		}
+
+		@Override
+		public int hashCode() {
+			final int prime = 31;
+			int result = 1;
+			result = prime * result + ((id == null) ? 0 : id.hashCode());
+			result = prime * result + ((value == null) ? 0 : value.hashCode());
+			return result;
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (this == obj)
+				return true;
+			if (obj == null)
+				return false;
+			if (getClass() != obj.getClass())
+				return false;
+			EqualsAndHashCodeObjectMethodOverrideLazyDbRefTarget other = (EqualsAndHashCodeObjectMethodOverrideLazyDbRefTarget) obj;
+			if (id == null) {
+				if (other.id != null)
+					return false;
+			} else if (!id.equals(other.id))
+				return false;
+			if (value == null) {
+				if (other.value != null)
+					return false;
+			} else if (!value.equals(other.value))
+				return false;
+			return true;
+		}
+	}
+
+	static class WithObjectMethodOverrideLazyDbRefs {
+
+		@org.springframework.data.mongodb.core.mapping.DBRef(lazy = true) LazyDbRefTarget dbRefToPlainObject;
+		@org.springframework.data.mongodb.core.mapping.DBRef(lazy = true) ToStringObjectMethodOverrideLazyDbRefTarget dbRefToToStringObjectMethodOverride;
+		@org.springframework.data.mongodb.core.mapping.DBRef(lazy = true) EqualsAndHashCodeObjectMethodOverrideLazyDbRefTarget dbRefEqualsAndHashcodeObjectMethodOverride2;
+		@org.springframework.data.mongodb.core.mapping.DBRef(lazy = true) EqualsAndHashCodeObjectMethodOverrideLazyDbRefTarget dbRefEqualsAndHashcodeObjectMethodOverride1;
+	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ 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;
+import org.springframework.test.util.ReflectionTestUtils;
 
 /**
  * Utility class to test proxy handling for lazy loading.
@@ -39,8 +40,8 @@ public class LazyLoadingTestUtils {
 	public static void assertProxyIsResolved(Object target, boolean expected) {
 
 		LazyLoadingInterceptor interceptor = extractInterceptor(target);
-		assertThat(interceptor.isResolved(), is(expected));
-		assertThat(interceptor.getResult(), is(expected ? notNullValue() : nullValue()));
+		assertThat(ReflectionTestUtils.getField(interceptor, "resolved"), is((Object) expected));
+		assertThat(ReflectionTestUtils.getField(interceptor, "result"), is(expected ? notNullValue() : nullValue()));
 	}
 
 	private static LazyLoadingInterceptor extractInterceptor(Object proxy) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2013 the original author or authors.
+ * Copyright 2011-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package org.springframework.data.mongodb.core.convert;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
+import static org.springframework.data.mongodb.core.DBObjectTestUtils.*;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -27,6 +28,8 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
+import java.util.EnumMap;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -34,6 +37,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.SortedMap;
+import java.util.TreeMap;
 
 import org.bson.types.ObjectId;
 import org.hamcrest.Matcher;
@@ -57,7 +61,9 @@ import org.springframework.data.mongodb.core.convert.DBObjectAccessorUnitTests.P
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.core.mapping.PersonPojoStringId;
+import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import com.mongodb.BasicDBList;
@@ -72,6 +78,7 @@ import com.mongodb.util.JSON;
  * 
  * @author Oliver Gierke
  * @author Patrik Wasik
+ * @author Christoph Strobl
  */
 @RunWith(MockitoJUnitRunner.class)
 public class MappingMongoConverterUnitTests {
@@ -1021,12 +1028,12 @@ public class MappingMongoConverterUnitTests {
 		address.city = "London";
 		address.street = "Foo";
 
-		Object result = converter.convertToMongoType(Collections.singleton(address));
+		Object result = converter.convertToMongoType(Collections.singleton(address), ClassTypeInformation.OBJECT);
 		assertThat(result, is(instanceOf(BasicDBList.class)));
 
 		Set<?> readResult = converter.read(Set.class, (BasicDBList) result);
 		assertThat(readResult.size(), is(1));
-		assertThat(readResult.iterator().next(), is(instanceOf(Map.class)));
+		assertThat(readResult.iterator().next(), is(instanceOf(Address.class)));
 	}
 
 	/**
@@ -1240,9 +1247,9 @@ public class MappingMongoConverterUnitTests {
 		DB db = mock(DB.class);
 		DBRef dbRef = new DBRef(db, "collection", "id");
 
-		org.springframework.data.mongodb.core.mapping.DBRef annotation = mock(org.springframework.data.mongodb.core.mapping.DBRef.class);
+		MongoPersistentProperty property = mock(MongoPersistentProperty.class);
 
-		assertThat(converter.createDBRef(dbRef, annotation), is(dbRef));
+		assertThat(converter.createDBRef(dbRef, property), is(dbRef));
 	}
 
 	/**
@@ -1381,6 +1388,146 @@ public class MappingMongoConverterUnitTests {
 		assertThat(aValue.get("c"), is((Object) "C"));
 	}
 
+	/**
+	 * @see DATAMONGO-812
+	 * @see DATAMONGO-893
+	 */
+	@Test
+	public void convertsListToBasicDBListAndRetainsTypeInformationForComplexObjects() {
+
+		Address address = new Address();
+		address.city = "London";
+		address.street = "Foo";
+
+		Object result = converter.convertToMongoType(Collections.singletonList(address),
+				ClassTypeInformation.from(InterfaceType.class));
+
+		assertThat(result, is(instanceOf(BasicDBList.class)));
+
+		BasicDBList dbList = (BasicDBList) result;
+		assertThat(dbList, hasSize(1));
+		assertThat(getTypedValue(getAsDBObject(dbList, 0), "_class", String.class), equalTo(Address.class.getName()));
+	}
+
+	/**
+	 * @see DATAMONGO-812
+	 */
+	@Test
+	public void convertsListToBasicDBListWithoutTypeInformationForSimpleTypes() {
+
+		Object result = converter.convertToMongoType(Collections.singletonList("foo"));
+
+		assertThat(result, is(instanceOf(BasicDBList.class)));
+
+		BasicDBList dbList = (BasicDBList) result;
+		assertThat(dbList, hasSize(1));
+		assertThat(dbList.get(0), instanceOf(String.class));
+	}
+
+	/**
+	 * @see DATAMONGO-812
+	 */
+	@Test
+	public void convertsArrayToBasicDBListAndRetainsTypeInformationForComplexObjects() {
+
+		Address address = new Address();
+		address.city = "London";
+		address.street = "Foo";
+
+		Object result = converter.convertToMongoType(new Address[] { address }, ClassTypeInformation.OBJECT);
+
+		assertThat(result, is(instanceOf(BasicDBList.class)));
+
+		BasicDBList dbList = (BasicDBList) result;
+		assertThat(dbList, hasSize(1));
+		assertThat(getTypedValue(getAsDBObject(dbList, 0), "_class", String.class), equalTo(Address.class.getName()));
+	}
+
+	/**
+	 * @see DATAMONGO-812
+	 */
+	@Test
+	public void convertsArrayToBasicDBListWithoutTypeInformationForSimpleTypes() {
+
+		Object result = converter.convertToMongoType(new String[] { "foo" });
+
+		assertThat(result, is(instanceOf(BasicDBList.class)));
+
+		BasicDBList dbList = (BasicDBList) result;
+		assertThat(dbList, hasSize(1));
+		assertThat(dbList.get(0), instanceOf(String.class));
+	}
+
+	/**
+	 * @see DATAMONGO-833
+	 */
+	@Test
+	public void readsEnumSetCorrectly() {
+
+		BasicDBList enumSet = new BasicDBList();
+		enumSet.add("SECOND");
+		DBObject dbObject = new BasicDBObject("enumSet", enumSet);
+
+		ClassWithEnumProperty result = converter.read(ClassWithEnumProperty.class, dbObject);
+
+		assertThat(result.enumSet, is(instanceOf(EnumSet.class)));
+		assertThat(result.enumSet.size(), is(1));
+		assertThat(result.enumSet, hasItem(SampleEnum.SECOND));
+	}
+
+	/**
+	 * @see DATAMONGO-833
+	 */
+	@Test
+	public void readsEnumMapCorrectly() {
+
+		BasicDBObject enumMap = new BasicDBObject("FIRST", "Dave");
+		ClassWithEnumProperty result = converter.read(ClassWithEnumProperty.class, new BasicDBObject("enumMap", enumMap));
+
+		assertThat(result.enumMap, is(instanceOf(EnumMap.class)));
+		assertThat(result.enumMap.size(), is(1));
+		assertThat(result.enumMap.get(SampleEnum.FIRST), is("Dave"));
+	}
+
+	/**
+	 * @see DATAMONGO-887
+	 */
+	@Test
+	public void readsTreeMapCorrectly() {
+
+		DBObject person = new BasicDBObject("foo", "Dave");
+		DBObject treeMapOfPerson = new BasicDBObject("key", person);
+		DBObject document = new BasicDBObject("treeMapOfPersons", treeMapOfPerson);
+
+		ClassWithMapProperty result = converter.read(ClassWithMapProperty.class, document);
+
+		assertThat(result.treeMapOfPersons, is(notNullValue()));
+		assertThat(result.treeMapOfPersons.get("key"), is(notNullValue()));
+		assertThat(result.treeMapOfPersons.get("key").firstname, is("Dave"));
+	}
+
+	/**
+	 * @see DATAMONGO-887
+	 */
+	@Test
+	public void writesTreeMapCorrectly() {
+
+		Person person = new Person();
+		person.firstname = "Dave";
+
+		ClassWithMapProperty source = new ClassWithMapProperty();
+		source.treeMapOfPersons = new TreeMap<String, Person>();
+		source.treeMapOfPersons.put("key", person);
+
+		DBObject result = new BasicDBObject();
+
+		converter.write(source, result);
+
+		DBObject map = getAsDBObject(result, "treeMapOfPersons");
+		DBObject entry = getAsDBObject(map, "key");
+		assertThat(entry.get("foo"), is((Object) "Dave"));
+	}
+
 	static class GenericType<T> {
 		T content;
 	}
@@ -1389,6 +1536,8 @@ public class MappingMongoConverterUnitTests {
 
 		SampleEnum sampleEnum;
 		List<SampleEnum> enums;
+		EnumSet<SampleEnum> enumSet;
+		EnumMap<SampleEnum, String> enumMap;
 	}
 
 	static enum SampleEnum {
@@ -1406,7 +1555,11 @@ public class MappingMongoConverterUnitTests {
 		abstract void method();
 	}
 
-	static class Address {
+	static interface InterfaceType {
+
+	}
+
+	static class Address implements InterfaceType {
 		String street;
 		String city;
 	}
@@ -1446,6 +1599,7 @@ public class MappingMongoConverterUnitTests {
 		Map<String, Object> mapOfObjects;
 		Map<String, String[]> mapOfStrings;
 		Map<String, Person> mapOfPersons;
+		TreeMap<String, Person> treeMapOfPersons;
 	}
 
 	static class ClassWithNestedMaps {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2013 the original author or authors.
+ * Copyright 2011-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,11 +34,14 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.data.annotation.Id;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.DBObjectTestUtils;
 import org.springframework.data.mongodb.core.Person;
 import org.springframework.data.mongodb.core.mapping.BasicMongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.DBRef;
+import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
@@ -48,6 +51,7 @@ import org.springframework.data.mongodb.core.query.Query;
 
 import com.mongodb.BasicDBList;
 import com.mongodb.BasicDBObject;
+import com.mongodb.BasicDBObjectBuilder;
 import com.mongodb.DBObject;
 import com.mongodb.QueryBuilder;
 
@@ -56,6 +60,8 @@ import com.mongodb.QueryBuilder;
  * 
  * @author Oliver Gierke
  * @author Patryk Wasik
+ * @author Thomas Darimont
+ * @author Christoph Strobl
  */
 @RunWith(MockitoJUnitRunner.class)
 public class QueryMapperUnitTests {
@@ -466,10 +472,153 @@ public class QueryMapperUnitTests {
 		assertThat(result.get("myvalue"), is((Object) "$center"));
 	}
 
+	/**
+	 * @DATAMONGO-805
+	 */
+	@Test
+	public void shouldExcludeDBRefAssociation() {
+
+		Query query = query(where("someString").is("foo"));
+		query.fields().exclude("reference");
+
+		BasicMongoPersistentEntity<?> entity = context.getPersistentEntity(WithDBRef.class);
+		DBObject queryResult = mapper.getMappedObject(query.getQueryObject(), entity);
+		DBObject fieldsResult = mapper.getMappedObject(query.getFieldsObject(), entity);
+
+		assertThat(queryResult.get("someString"), is((Object) "foo"));
+		assertThat(fieldsResult.get("reference"), is((Object) 0));
+	}
+
+	/**
+	 * @see DATAMONGO-686
+	 */
+	@Test
+	public void queryMapperShouldNotChangeStateInGivenQueryObjectWhenIdConstrainedByInList() {
+
+		BasicMongoPersistentEntity<?> persistentEntity = context.getPersistentEntity(Sample.class);
+		String idPropertyName = persistentEntity.getIdProperty().getName();
+		DBObject queryObject = query(where(idPropertyName).in("42")).getQueryObject();
+
+		Object idValuesBefore = getAsDBObject(queryObject, idPropertyName).get("$in");
+		mapper.getMappedObject(queryObject, persistentEntity);
+		Object idValuesAfter = getAsDBObject(queryObject, idPropertyName).get("$in");
+
+		assertThat(idValuesAfter, is(idValuesBefore));
+	}
+
+	/**
+	 * @see DATAMONGO-821
+	 */
+	@Test
+	public void queryMapperShouldNotTryToMapDBRefListPropertyIfNestedInsideDBObjectWithinDBObject() {
+
+		DBObject queryObject = query(
+				where("referenceList").is(new BasicDBObject("$nested", new BasicDBObject("$keys", 0L)))).getQueryObject();
+
+		DBObject mappedObject = mapper.getMappedObject(queryObject, context.getPersistentEntity(WithDBRefList.class));
+		DBObject referenceObject = getAsDBObject(mappedObject, "referenceList");
+		DBObject nestedObject = getAsDBObject(referenceObject, "$nested");
+
+		assertThat(nestedObject, is((DBObject) new BasicDBObject("$keys", 0L)));
+	}
+
+	/**
+	 * @see DATAMONGO-821
+	 */
+	@Test
+	public void queryMapperShouldNotTryToMapDBRefPropertyIfNestedInsideDBObjectWithinDBObject() {
+
+		DBObject queryObject = query(where("reference").is(new BasicDBObject("$nested", new BasicDBObject("$keys", 0L))))
+				.getQueryObject();
+
+		DBObject mappedObject = mapper.getMappedObject(queryObject, context.getPersistentEntity(WithDBRef.class));
+		DBObject referenceObject = getAsDBObject(mappedObject, "reference");
+		DBObject nestedObject = getAsDBObject(referenceObject, "$nested");
+
+		assertThat(nestedObject, is((DBObject) new BasicDBObject("$keys", 0L)));
+	}
+
+	/**
+	 * @see DATAMONGO-821
+	 */
+	@Test
+	public void queryMapperShouldMapDBRefPropertyIfNestedInDBObject() {
+
+		Reference sample = new Reference();
+		sample.id = 321L;
+		DBObject queryObject = query(where("reference").is(new BasicDBObject("$in", Arrays.asList(sample))))
+				.getQueryObject();
+
+		DBObject mappedObject = mapper.getMappedObject(queryObject, context.getPersistentEntity(WithDBRef.class));
+
+		DBObject referenceObject = getAsDBObject(mappedObject, "reference");
+		BasicDBList inObject = getAsDBList(referenceObject, "$in");
+
+		assertThat(inObject.get(0), is(instanceOf(com.mongodb.DBRef.class)));
+	}
+
+	/**
+	 * @see DATAMONGO-773
+	 */
+	@Test
+	public void queryMapperShouldBeAbleToProcessQueriesThatIncludeDbRefFields() {
+
+		BasicMongoPersistentEntity<?> persistentEntity = context.getPersistentEntity(WithDBRef.class);
+
+		Query qry = query(where("someString").is("abc"));
+		qry.fields().include("reference");
+
+		DBObject mappedFields = mapper.getMappedObject(qry.getFieldsObject(), persistentEntity);
+		assertThat(mappedFields, is(notNullValue()));
+	}
+
+	/**
+	 * @see DATAMONGO-893
+	 */
+	@Test
+	public void classInformationShouldNotBePresentInDBObjectUsedInFinderMethods() {
+
+		EmbeddedClass embedded = new EmbeddedClass();
+		embedded.id = "1";
+
+		EmbeddedClass embedded2 = new EmbeddedClass();
+		embedded2.id = "2";
+		Query query = query(where("embedded").in(Arrays.asList(embedded, embedded2)));
+
+		DBObject dbo = mapper.getMappedObject(query.getQueryObject(), context.getPersistentEntity(Foo.class));
+		assertThat(dbo.toString(), equalTo("{ \"embedded\" : { \"$in\" : [ { \"_id\" : \"1\"} , { \"_id\" : \"2\"}]}}"));
+	}
+
+	/**
+	 * @see DATAMONGO-647
+	 */
+	@Test
+	public void customizedFieldNameShouldBeMappedCorrectlyWhenApplyingSort() {
+
+		Query query = query(where("field").is("bar")).with(new Sort(Direction.DESC, "field"));
+		DBObject dbo = mapper.getMappedObject(query.getSortObject(), context.getPersistentEntity(CustomizedField.class));
+		assertThat(dbo, equalTo(new BasicDBObjectBuilder().add("foo", -1).get()));
+	}
+
+	@Document
+	public class Foo {
+		@Id private ObjectId id;
+		EmbeddedClass embedded;
+	}
+
+	public class EmbeddedClass {
+		public String id;
+	}
+
 	class IdWrapper {
 		Object id;
 	}
 
+	class ClassWithEmbedded {
+		@Id String id;
+		Sample sample;
+	}
+
 	class ClassWithDefaultId {
 
 		String id;
@@ -506,6 +655,12 @@ public class QueryMapperUnitTests {
 		@DBRef Reference reference;
 	}
 
+	class WithDBRefList {
+
+		String someString;
+		@DBRef List<Reference> referenceList;
+	}
+
 	class Reference {
 
 		Long id;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,26 +16,47 @@
 package org.springframework.data.mongodb.core.convert;
 
 import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.collection.IsMapContaining.*;
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+import static org.springframework.data.mongodb.core.DBObjectTestUtils.*;
 
+import java.util.Arrays;
 import java.util.List;
 
+import org.hamcrest.Matcher;
+import org.hamcrest.collection.IsIterableContainingInOrder;
+import org.hamcrest.core.IsEqual;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.convert.WritingConverter;
+import org.springframework.data.mapping.model.MappingException;
 import org.springframework.data.mongodb.MongoDbFactory;
 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.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 
+import com.mongodb.BasicDBList;
+import com.mongodb.BasicDBObject;
+import com.mongodb.BasicDBObjectBuilder;
 import com.mongodb.DBObject;
+import com.mongodb.DBRef;
 
 /**
  * Unit tests for {@link UpdateMapper}.
  * 
  * @author Oliver Gierke
+ * @author Christoph Strobl
+ * @author Thomas Darimont
  */
 @RunWith(MockitoJUnitRunner.class)
 public class UpdateMapperUnitTests {
@@ -43,12 +64,26 @@ public class UpdateMapperUnitTests {
 	@Mock MongoDbFactory factory;
 	MappingMongoConverter converter;
 	MongoMappingContext context;
+	UpdateMapper mapper;
 
+	private Converter<NestedEntity, DBObject> writingConverterSpy;
+
+	@SuppressWarnings("unchecked")
 	@Before
 	public void setUp() {
 
+		this.writingConverterSpy = Mockito.spy(new NestedEntityWriteConverter());
+		CustomConversions conversions = new CustomConversions(Arrays.asList(writingConverterSpy));
+
 		this.context = new MongoMappingContext();
+		this.context.setSimpleTypeHolder(conversions.getSimpleTypeHolder());
+		this.context.initialize();
+
 		this.converter = new MappingMongoConverter(new DefaultDbRefResolver(factory), context);
+		this.converter.setCustomConversions(conversions);
+		this.converter.afterPropertiesSet();
+
+		this.mapper = new UpdateMapper(converter);
 	}
 
 	/**
@@ -58,22 +93,479 @@ public class UpdateMapperUnitTests {
 	public void updateMapperRetainsTypeInformationForCollectionField() {
 
 		Update update = new Update().push("list", new ConcreteChildClass("2", "BAR"));
-		UpdateMapper mapper = new UpdateMapper(converter);
 
 		DBObject mappedObject = mapper.getMappedObject(update.getUpdateObject(),
 				context.getPersistentEntity(ParentClass.class));
 
-		DBObject push = DBObjectTestUtils.getAsDBObject(mappedObject, "$push");
-		DBObject list = DBObjectTestUtils.getAsDBObject(push, "list");
+		DBObject push = getAsDBObject(mappedObject, "$push");
+		DBObject list = getAsDBObject(push, "aliased");
 
 		assertThat(list.get("_class"), is((Object) ConcreteChildClass.class.getName()));
 	}
 
+	/**
+	 * @see DATAMONGO-807
+	 */
+	@Test
+	public void updateMapperShouldRetainTypeInformationForNestedEntities() {
+
+		Update update = Update.update("model", new ModelImpl(1));
+		UpdateMapper mapper = new UpdateMapper(converter);
+
+		DBObject mappedObject = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(ModelWrapper.class));
+
+		DBObject set = getAsDBObject(mappedObject, "$set");
+		DBObject modelDbObject = (DBObject) set.get("model");
+		assertThat(modelDbObject.get("_class"), not(nullValue()));
+	}
+
+	/**
+	 * @see DATAMONGO-807
+	 */
+	@Test
+	public void updateMapperShouldNotPersistTypeInformationForKnownSimpleTypes() {
+
+		Update update = Update.update("model.value", 1);
+		UpdateMapper mapper = new UpdateMapper(converter);
+
+		DBObject mappedObject = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(ModelWrapper.class));
+
+		DBObject set = getAsDBObject(mappedObject, "$set");
+		assertThat(set.get("_class"), nullValue());
+	}
+
+	/**
+	 * @see DATAMONGO-807
+	 */
+	@Test
+	public void updateMapperShouldNotPersistTypeInformationForNullValues() {
+
+		Update update = Update.update("model", null);
+		UpdateMapper mapper = new UpdateMapper(converter);
+
+		DBObject mappedObject = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(ModelWrapper.class));
+
+		DBObject set = getAsDBObject(mappedObject, "$set");
+		assertThat(set.get("_class"), nullValue());
+	}
+
+	/**
+	 * @see DATAMONGO-407
+	 */
+	@Test
+	public void updateMapperShouldRetainTypeInformationForNestedCollectionElements() {
+
+		Update update = Update.update("list.$", new ConcreteChildClass("42", "bubu"));
+
+		UpdateMapper mapper = new UpdateMapper(converter);
+		DBObject mappedObject = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(ParentClass.class));
+
+		DBObject set = getAsDBObject(mappedObject, "$set");
+		DBObject modelDbObject = getAsDBObject(set, "aliased.$");
+		assertThat(modelDbObject.get("_class"), is((Object) ConcreteChildClass.class.getName()));
+	}
+
+	/**
+	 * @see DATAMONGO-407
+	 */
+	@Test
+	public void updateMapperShouldSupportNestedCollectionElementUpdates() {
+
+		Update update = Update.update("list.$.value", "foo").set("list.$.otherValue", "bar");
+
+		UpdateMapper mapper = new UpdateMapper(converter);
+		DBObject mappedObject = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(ParentClass.class));
+
+		DBObject set = getAsDBObject(mappedObject, "$set");
+		assertThat(set.get("aliased.$.value"), is((Object) "foo"));
+		assertThat(set.get("aliased.$.otherValue"), is((Object) "bar"));
+	}
+
+	/**
+	 * @see DATAMONGO-407
+	 */
+	@Test
+	public void updateMapperShouldWriteTypeInformationForComplexNestedCollectionElementUpdates() {
+
+		Update update = Update.update("list.$.value", "foo").set("list.$.someObject", new ConcreteChildClass("42", "bubu"));
+
+		UpdateMapper mapper = new UpdateMapper(converter);
+		DBObject mappedObject = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(ParentClass.class));
+
+		DBObject dbo = getAsDBObject(mappedObject, "$set");
+		assertThat(dbo.get("aliased.$.value"), is((Object) "foo"));
+
+		DBObject someObject = getAsDBObject(dbo, "aliased.$.someObject");
+		assertThat(someObject, is(notNullValue()));
+		assertThat(someObject.get("_class"), is((Object) ConcreteChildClass.class.getName()));
+		assertThat(someObject.get("value"), is((Object) "bubu"));
+	}
+
+	/**
+	 * @see DATAMONGO-812
+	 */
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	@Test
+	public void updateMapperShouldConvertPushCorrectlyWhenCalledWithEachUsingSimpleTypes() {
+
+		Update update = new Update().push("values").each("spring", "data", "mongodb");
+		DBObject mappedObject = mapper.getMappedObject(update.getUpdateObject(), context.getPersistentEntity(Model.class));
+
+		DBObject push = getAsDBObject(mappedObject, "$push");
+		DBObject values = getAsDBObject(push, "values");
+		BasicDBList each = getAsDBList(values, "$each");
+
+		assertThat(push.get("_class"), nullValue());
+		assertThat(values.get("_class"), nullValue());
+
+		assertThat(each.toMap(), (Matcher) allOf(hasValue("spring"), hasValue("data"), hasValue("mongodb")));
+	}
+
+	/**
+	 * @see DATAMONGO-812
+	 */
+	@Test
+	public void updateMapperShouldConvertPushWhithoutAddingClassInformationWhenUsedWithEvery() {
+
+		Update update = new Update().push("values").each("spring", "data", "mongodb");
+
+		DBObject mappedObject = mapper.getMappedObject(update.getUpdateObject(), context.getPersistentEntity(Model.class));
+		DBObject push = getAsDBObject(mappedObject, "$push");
+		DBObject values = getAsDBObject(push, "values");
+
+		assertThat(push.get("_class"), nullValue());
+		assertThat(values.get("_class"), nullValue());
+	}
+
+	/**
+	 * @see DATAMONGO-812
+	 */
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	@Test
+	public void updateMapperShouldConvertPushCorrectlyWhenCalledWithEachUsingCustomTypes() {
+
+		Update update = new Update().push("models").each(new ListModel("spring", "data", "mongodb"));
+		DBObject mappedObject = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(ModelWrapper.class));
+
+		DBObject push = getAsDBObject(mappedObject, "$push");
+		DBObject model = getAsDBObject(push, "models");
+		BasicDBList each = getAsDBList(model, "$each");
+		BasicDBList values = getAsDBList((DBObject) each.get(0), "values");
+
+		assertThat(values.toMap(), (Matcher) allOf(hasValue("spring"), hasValue("data"), hasValue("mongodb")));
+	}
+
+	/**
+	 * @see DATAMONGO-812
+	 */
+	@Test
+	public void updateMapperShouldRetainClassInformationForPushCorrectlyWhenCalledWithEachUsingCustomTypes() {
+
+		Update update = new Update().push("models").each(new ListModel("spring", "data", "mongodb"));
+		DBObject mappedObject = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(ModelWrapper.class));
+
+		DBObject push = getAsDBObject(mappedObject, "$push");
+		DBObject model = getAsDBObject(push, "models");
+		BasicDBList each = getAsDBList(model, "$each");
+
+		assertThat(((DBObject) each.get(0)).get("_class").toString(), equalTo(ListModel.class.getName()));
+	}
+
+	/**
+	 * @see DATAMONGO-812
+	 */
+	@Test
+	public void testUpdateShouldAllowMultiplePushEachForDifferentFields() {
+
+		Update update = new Update().push("category").each("spring", "data").push("type").each("mongodb");
+		DBObject mappedObject = mapper.getMappedObject(update.getUpdateObject(), context.getPersistentEntity(Object.class));
+
+		DBObject push = getAsDBObject(mappedObject, "$push");
+		assertThat(getAsDBObject(push, "category").containsField("$each"), is(true));
+		assertThat(getAsDBObject(push, "type").containsField("$each"), is(true));
+	}
+
+	/**
+	 * @see DATAMONGO-410
+	 */
+	@Test
+	public void testUpdateMapperShouldConsiderCustomWriteTarget() {
+
+		List<NestedEntity> someValues = Arrays.asList(new NestedEntity("spring"), new NestedEntity("data"),
+				new NestedEntity("mongodb"));
+		NestedEntity[] array = new NestedEntity[someValues.size()];
+
+		Update update = new Update().pushAll("collectionOfNestedEntities", someValues.toArray(array));
+		mapper.getMappedObject(update.getUpdateObject(), context.getPersistentEntity(DomainEntity.class));
+
+		verify(writingConverterSpy, times(3)).convert(Mockito.any(NestedEntity.class));
+	}
+
+	/**
+	 * @see DATAMONGO-404
+	 */
+	@Test
+	public void createsDbRefForEntityIdOnPulls() {
+
+		Update update = new Update().pull("dbRefAnnotatedList.id", "2");
+
+		DBObject mappedObject = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(DocumentWithDBRefCollection.class));
+
+		DBObject pullClause = getAsDBObject(mappedObject, "$pull");
+		assertThat(pullClause.get("dbRefAnnotatedList"), is((Object) new DBRef(null, "entity", "2")));
+	}
+
+	/**
+	 * @see DATAMONGO-404
+	 */
+	@Test
+	public void createsDbRefForEntityOnPulls() {
+
+		Entity entity = new Entity();
+		entity.id = "5";
+
+		Update update = new Update().pull("dbRefAnnotatedList", entity);
+		DBObject mappedObject = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(DocumentWithDBRefCollection.class));
+
+		DBObject pullClause = getAsDBObject(mappedObject, "$pull");
+		assertThat(pullClause.get("dbRefAnnotatedList"), is((Object) new DBRef(null, "entity", entity.id)));
+	}
+
+	/**
+	 * @see DATAMONGO-404
+	 */
+	@Test(expected = MappingException.class)
+	public void rejectsInvalidFieldReferenceForDbRef() {
+
+		Update update = new Update().pull("dbRefAnnotatedList.name", "NAME");
+		mapper.getMappedObject(update.getUpdateObject(), context.getPersistentEntity(DocumentWithDBRefCollection.class));
+	}
+
+	/**
+	 * @see DATAMONGO-404
+	 */
+	@Test
+	public void rendersNestedDbRefCorrectly() {
+
+		Update update = new Update().pull("nested.dbRefAnnotatedList.id", "2");
+		DBObject mappedObject = mapper
+				.getMappedObject(update.getUpdateObject(), context.getPersistentEntity(Wrapper.class));
+
+		DBObject pullClause = getAsDBObject(mappedObject, "$pull");
+		assertThat(pullClause.containsField("mapped.dbRefAnnotatedList"), is(true));
+	}
+
+	/**
+	 * @see DATAMONGO-468
+	 */
+	@Test
+	public void rendersUpdateOfDbRefPropertyWithDomainObjectCorrectly() {
+
+		Entity entity = new Entity();
+		entity.id = "5";
+
+		Update update = new Update().set("dbRefProperty", entity);
+		DBObject mappedObject = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(DocumentWithDBRefCollection.class));
+
+		DBObject setClause = getAsDBObject(mappedObject, "$set");
+		assertThat(setClause.get("dbRefProperty"), is((Object) new DBRef(null, "entity", entity.id)));
+	}
+
+	/**
+	 * @see DATAMONGO-862
+	 */
+	@Test
+	public void rendersUpdateAndPreservesKeyForPathsNotPointingToProperty() {
+
+		Update update = new Update().set("listOfInterface.$.value", "expected-value");
+		DBObject mappedObject = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(ParentClass.class));
+
+		DBObject setClause = getAsDBObject(mappedObject, "$set");
+		assertThat(setClause.containsField("listOfInterface.$.value"), is(true));
+	}
+
+	/**
+	 * @see DATAMONGO-863
+	 */
+	@Test
+	public void doesNotConvertRawDbObjects() {
+
+		Update update = new Update();
+		update.pull("options",
+				new BasicDBObject("_id", new BasicDBObject("$in", converter.convertToMongoType(Arrays.asList(1L, 2L)))));
+
+		DBObject mappedObject = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(ParentClass.class));
+
+		DBObject setClause = getAsDBObject(mappedObject, "$pull");
+		DBObject options = getAsDBObject(setClause, "options");
+		DBObject idClause = getAsDBObject(options, "_id");
+		BasicDBList inClause = getAsDBList(idClause, "$in");
+
+		assertThat(inClause, IsIterableContainingInOrder.<Object> contains(1L, 2L));
+	}
+
+
+	/**
+	 * @see DATAMONGO-897
+	 */
+	@Test
+	public void updateOnDbrefPropertyOfInterfaceTypeWithoutExplicitGetterForIdShouldBeMappedCorrectly() {
+
+		Update update = new Update().set("referencedDocument", new InterfaceDocumentDefinitionImpl("1", "Foo"));
+		DBObject mappedObject = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(DocumentWithReferenceToInterfaceImpl.class));
+
+		DBObject $set = DBObjectTestUtils.getAsDBObject(mappedObject, "$set");
+		Object model = $set.get("referencedDocument");
+
+		DBRef expectedDBRef = new DBRef(factory.getDb(), "interfaceDocumentDefinitionImpl", "1");
+		assertThat(model, allOf(instanceOf(DBRef.class), IsEqual.<Object> equalTo(expectedDBRef)));
+	}
+
+	/**
+	 * @see DATAMONGO-847
+	 */
+	@Test
+	public void updateMapperConvertsNestedQueryCorrectly() {
+
+		Update update = new Update().pull("list", Query.query(Criteria.where("value").in("foo", "bar")));
+		DBObject mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(ParentClass.class));
+
+		DBObject $pull = DBObjectTestUtils.getAsDBObject(mappedUpdate, "$pull");
+		DBObject list = DBObjectTestUtils.getAsDBObject($pull, "aliased");
+		DBObject value = DBObjectTestUtils.getAsDBObject(list, "value");
+		BasicDBList $in = DBObjectTestUtils.getAsDBList(value, "$in");
+
+		assertThat($in, IsIterableContainingInOrder.<Object> contains("foo", "bar"));
+	}
+
+	/**
+	 * @see DATAMONGO-847
+	 */
+	@Test
+	public void updateMapperConvertsPullWithNestedQuerfyOnDBRefCorrectly() {
+
+		Update update = new Update().pull("dbRefAnnotatedList", Query.query(Criteria.where("id").is("1")));
+		DBObject mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(DocumentWithDBRefCollection.class));
+
+		DBObject $pull = DBObjectTestUtils.getAsDBObject(mappedUpdate, "$pull");
+		DBObject list = DBObjectTestUtils.getAsDBObject($pull, "dbRefAnnotatedList");
+
+		assertThat(list, equalTo(new BasicDBObjectBuilder().add("_id", "1").get()));
+	}
+
+	@org.springframework.data.mongodb.core.mapping.Document(collection = "DocumentWithReferenceToInterface")
+	static interface DocumentWithReferenceToInterface {
+
+		String getId();
+
+		InterfaceDocumentDefinitionWithoutId getReferencedDocument();
+
+	}
+
+	static interface InterfaceDocumentDefinitionWithoutId {
+
+		String getValue();
+	}
+
+	static class InterfaceDocumentDefinitionImpl implements InterfaceDocumentDefinitionWithoutId {
+
+		@Id String id;
+		String value;
+
+		public InterfaceDocumentDefinitionImpl(String id, String value) {
+
+			this.id = id;
+			this.value = value;
+		}
+
+		@Override
+		public String getValue() {
+			return this.value;
+		}
+
+	}
+
+	static class DocumentWithReferenceToInterfaceImpl implements DocumentWithReferenceToInterface {
+
+		private @Id String id;
+
+		@org.springframework.data.mongodb.core.mapping.DBRef//
+		private InterfaceDocumentDefinitionWithoutId referencedDocument;
+
+		public String getId() {
+			return id;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setModel(InterfaceDocumentDefinitionWithoutId referencedDocument) {
+			this.referencedDocument = referencedDocument;
+		}
+
+		@Override
+		public InterfaceDocumentDefinitionWithoutId getReferencedDocument() {
+			return this.referencedDocument;
+		}
+
+	}
+
+	static interface Model {}
+
+	static class ModelImpl implements Model {
+		public int value;
+
+		public ModelImpl(int value) {
+			this.value = value;
+		}
+
+	}
+
+	public class ModelWrapper {
+		Model model;
+	}
+
+	static class ListModelWrapper {
+
+		List<Model> models;
+	}
+
+	static class ListModel {
+
+		List<String> values;
+
+		public ListModel(String... values) {
+			this.values = Arrays.asList(values);
+		}
+	}
+
 	static class ParentClass {
 
 		String id;
+
+		@Field("aliased")//
 		List<? extends AbstractChildClass> list;
 
+		@Field//
+		List<Model> listOfInterface;
+
 		public ParentClass(String id, List<? extends AbstractChildClass> list) {
 			this.id = id;
 			this.list = list;
@@ -85,10 +577,13 @@ public class UpdateMapperUnitTests {
 
 		String id;
 		String value;
+		String otherValue;
+		AbstractChildClass someObject;
 
 		public AbstractChildClass(String id, String value) {
 			this.id = id;
 			this.value = value;
+			this.otherValue = "other_" + value;
 		}
 	}
 
@@ -98,4 +593,49 @@ public class UpdateMapperUnitTests {
 			super(id, value);
 		}
 	}
+
+	static class DomainEntity {
+		List<NestedEntity> collectionOfNestedEntities;
+	}
+
+	static class NestedEntity {
+		String name;
+
+		public NestedEntity(String name) {
+			super();
+			this.name = name;
+		}
+
+	}
+
+	@WritingConverter
+	static class NestedEntityWriteConverter implements Converter<NestedEntity, DBObject> {
+
+		@Override
+		public DBObject convert(NestedEntity source) {
+			return new BasicDBObject();
+		}
+	}
+
+	static class DocumentWithDBRefCollection {
+
+		@Id public String id;
+
+		@org.springframework.data.mongodb.core.mapping.DBRef//
+		public List<Entity> dbRefAnnotatedList;
+
+		@org.springframework.data.mongodb.core.mapping.DBRef//
+		public Entity dbRefProperty;
+	}
+
+	static class Entity {
+
+		@Id public String id;
+		String name;
+	}
+
+	static class Wrapper {
+
+		@Field("mapped") DocumentWithDBRefCollection nested;
+	}
 }

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

@@ -0,0 +1,164 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.geo;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import java.util.Map;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.data.mongodb.config.AbstractIntegrationTests;
+import org.springframework.data.mongodb.core.CollectionCallback;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.WriteResultChecking;
+import org.springframework.data.mongodb.core.index.GeoSpatialIndexType;
+import org.springframework.data.mongodb.core.index.GeoSpatialIndexed;
+
+import com.mongodb.DBCollection;
+import com.mongodb.DBObject;
+import com.mongodb.MongoException;
+import com.mongodb.WriteConcern;
+
+/**
+ * Integration tests for geo-spatial indexing.
+ * 
+ * @author Laurent Canet
+ * @author Oliver Gierke
+ */
+public class GeoSpatialIndexTests extends AbstractIntegrationTests {
+
+	@Autowired private MongoTemplate template;
+
+	@Before
+	public void setUp() {
+
+		template.setWriteConcern(WriteConcern.FSYNC_SAFE);
+		template.setWriteResultChecking(WriteResultChecking.EXCEPTION);
+	}
+
+	/**
+	 * @see DATAMONGO-778
+	 */
+	@Test
+	public void test2dIndex() {
+
+		try {
+			template.save(new GeoSpatialEntity2D(45.2, 4.6));
+			assertThat(hasIndexOfType(GeoSpatialEntity2D.class, "2d"), is(true));
+		} finally {
+			template.dropCollection(GeoSpatialEntity2D.class);
+		}
+	}
+
+	/**
+	 * @see DATAMONGO-778
+	 */
+	@Test
+	public void test2dSphereIndex() {
+
+		try {
+			template.save(new GeoSpatialEntity2DSphere(45.2, 4.6));
+			assertThat(hasIndexOfType(GeoSpatialEntity2DSphere.class, "2dsphere"), is(true));
+		} finally {
+			template.dropCollection(GeoSpatialEntity2DSphere.class);
+		}
+	}
+
+	/**
+	 * @see DATAMONGO-778
+	 */
+	@Test
+	public void testHaystackIndex() {
+
+		try {
+			template.save(new GeoSpatialEntityHaystack(45.2, 4.6, "Paris"));
+			assertThat(hasIndexOfType(GeoSpatialEntityHaystack.class, "geoHaystack"), is(true));
+		} finally {
+			template.dropCollection(GeoSpatialEntityHaystack.class);
+		}
+	}
+
+	/**
+	 * Returns whether an index with the given name exists for the given entity type.
+	 * 
+	 * @param indexName
+	 * @param entityType
+	 * @return
+	 */
+	private boolean hasIndexOfType(Class<?> entityType, final String type) {
+
+		return template.execute(entityType, new CollectionCallback<Boolean>() {
+
+			@SuppressWarnings("unchecked")
+			public Boolean doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+
+				for (DBObject indexInfo : collection.getIndexInfo()) {
+
+					DBObject keys = (DBObject) indexInfo.get("key");
+					Map<String, Object> keysMap = keys.toMap();
+
+					for (String key : keysMap.keySet()) {
+						Object indexType = keys.get(key);
+						if (type.equals(indexType)) {
+							return true;
+						}
+					}
+				}
+
+				return false;
+			}
+		});
+	}
+
+	static class GeoSpatialEntity2D {
+		public String id;
+		@GeoSpatialIndexed(type = GeoSpatialIndexType.GEO_2D) public Point location;
+
+		public GeoSpatialEntity2D(double x, double y) {
+			this.location = new Point(x, y);
+		}
+	}
+
+	static class GeoSpatialEntityHaystack {
+		public String id;
+		public String name;
+		@GeoSpatialIndexed(type = GeoSpatialIndexType.GEO_HAYSTACK, additionalField = "name") public Point location;
+
+		public GeoSpatialEntityHaystack(double x, double y, String name) {
+			this.location = new Point(x, y);
+			this.name = name;
+		}
+	}
+
+	static class GeoJsonPoint {
+		String type = "Point";
+		double coordinates[];
+	}
+
+	static class GeoSpatialEntity2DSphere {
+		public String id;
+		@GeoSpatialIndexed(type = GeoSpatialIndexType.GEO_2DSPHERE) public GeoJsonPoint location;
+
+		public GeoSpatialEntity2DSphere(double x, double y) {
+			this.location = new GeoJsonPoint();
+			this.location.coordinates = new double[] { x, y };
+		}
+	}
+}

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

@@ -24,6 +24,7 @@ import static org.springframework.data.mongodb.core.query.Update.*;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -49,6 +50,7 @@ import com.mongodb.MongoException;
 /**
  * @author Jon Brisbin
  * @author Oliver Gierke
+ * @author Thomas Darimont
  */
 public class MappingTests extends AbstractIntegrationTests {
 
@@ -465,6 +467,57 @@ public class MappingTests extends AbstractIntegrationTests {
 		assertThat(result.items.get(0).id, is(items.id));
 	}
 
+	/**
+	 * @see DATAMONGO-805
+	 */
+	@Test
+	public void supportExcludeDbRefAssociation() {
+
+		template.dropCollection(Item.class);
+		template.dropCollection(Container.class);
+
+		Item item = new Item();
+		template.insert(item);
+
+		Container container = new Container("foo");
+		container.item = item;
+
+		template.insert(container);
+
+		Query query = new Query(Criteria.where("id").is("foo"));
+		query.fields().exclude("item");
+		Container result = template.findOne(query, Container.class);
+
+		assertThat(result, is(notNullValue()));
+		assertThat(result.item, is(nullValue()));
+	}
+
+	/**
+	 * @see DATAMONGO-805
+	 */
+	@Test
+	public void shouldMapFieldsOfIterableEntity() {
+
+		template.dropCollection(IterableItem.class);
+		template.dropCollection(Container.class);
+
+		Item item = new IterableItem();
+		item.value = "bar";
+		template.insert(item);
+
+		Container container = new Container("foo");
+		container.item = item;
+
+		template.insert(container);
+
+		Query query = new Query(Criteria.where("id").is("foo"));
+		Container result = template.findOne(query, Container.class);
+
+		assertThat(result, is(notNullValue()));
+		assertThat(result.item, is(notNullValue()));
+		assertThat(result.item.value, is("bar"));
+	}
+
 	static class Container {
 
 		@Id final String id;
@@ -473,6 +526,10 @@ public class MappingTests extends AbstractIntegrationTests {
 			id = new ObjectId().toString();
 		}
 
+		public Container(String id) {
+			this.id = id;
+		}
+
 		@DBRef Item item;
 		@DBRef List<Item> items;
 	}
@@ -480,9 +537,26 @@ public class MappingTests extends AbstractIntegrationTests {
 	static class Item {
 
 		@Id final String id;
+		String value;
 
 		public Item() {
 			this.id = new ObjectId().toString();
 		}
 	}
+
+	static class IterableItem extends Item implements Iterable<ItemData> {
+
+		List<ItemData> data = new ArrayList<MappingTests.ItemData>();
+
+		@Override
+		public Iterator<ItemData> iterator() {
+			return data.iterator();
+		}
+	}
+
+	static class ItemData {
+
+		String id;
+		String value;
+	}
 }

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/AuditingEventListenerUnitTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 the original author or authors.
+ * Copyright 2012-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ import org.springframework.data.support.IsNewStrategyFactory;
 @RunWith(MockitoJUnitRunner.class)
 public class AuditingEventListenerUnitTests {
 
-	IsNewAwareAuditingHandler<Object> handler;
+	IsNewAwareAuditingHandler handler;
 
 	IsNewStrategyFactory factory;
 	AuditingEventListener listener;
@@ -48,7 +48,7 @@ public class AuditingEventListenerUnitTests {
 		MongoMappingContext mappingContext = new MongoMappingContext();
 		factory = new MappingContextIsNewStrategyFactory(mappingContext);
 
-		handler = spy(new IsNewAwareAuditingHandler<Object>(factory));
+		handler = spy(new IsNewAwareAuditingHandler(factory));
 		doNothing().when(handler).markCreated(Mockito.any(Object.class));
 		doNothing().when(handler).markModified(Mockito.any(Object.class));
 
@@ -83,7 +83,6 @@ public class AuditingEventListenerUnitTests {
 
 	static class Sample {
 
-		@Id
-		String id;
+		@Id String id;
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ * Copyright 2011-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 package org.springframework.data.mongodb.core.mapreduce;
 
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
 import static org.springframework.data.mongodb.core.mapreduce.GroupBy.*;
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 
@@ -42,6 +44,12 @@ import com.mongodb.DBCollection;
 import com.mongodb.DBObject;
 import com.mongodb.Mongo;
 
+/**
+ * Integration tests for group-by operations.
+ * 
+ * @author Mark Pollack
+ * @author Oliver Gierke
+ */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration("classpath:infrastructure.xml")
 public class GroupByTests {
@@ -84,49 +92,46 @@ public class GroupByTests {
 
 	@Test
 	public void singleKeyCreation() {
+
 		DBObject gc = new GroupBy("a").getGroupByObject();
-		// String expected =
-		// "{ \"group\" : { \"ns\" : \"test\" , \"key\" : { \"a\" : 1} , \"cond\" :  null  , \"$reduce\" :  null  , \"initial\" :  null }}";
-		String expected = "{ \"key\" : { \"a\" : 1} , \"$reduce\" :  null  , \"initial\" :  null }";
-		Assert.assertEquals(expected, gc.toString());
+
+		assertThat(gc.toString(), is("{ \"key\" : { \"a\" : 1} , \"$reduce\" :  null  , \"initial\" :  null }"));
 	}
 
 	@Test
 	public void multipleKeyCreation() {
+
 		DBObject gc = GroupBy.key("a", "b").getGroupByObject();
-		// String expected =
-		// "{ \"group\" : { \"ns\" : \"test\" , \"key\" : { \"a\" : 1 , \"b\" : 1} , \"cond\" :  null  , \"$reduce\" :  null  , \"initial\" :  null }}";
-		String expected = "{ \"key\" : { \"a\" : 1 , \"b\" : 1} , \"$reduce\" :  null  , \"initial\" :  null }";
-		Assert.assertEquals(expected, gc.toString());
+
+		assertThat(gc.toString(), is("{ \"key\" : { \"a\" : 1 , \"b\" : 1} , \"$reduce\" :  null  , \"initial\" :  null }"));
 	}
 
 	@Test
 	public void keyFunctionCreation() {
+
 		DBObject gc = GroupBy.keyFunction("classpath:keyFunction.js").getGroupByObject();
-		String expected = "{ \"$keyf\" : \"classpath:keyFunction.js\" , \"$reduce\" :  null  , \"initial\" :  null }";
-		Assert.assertEquals(expected, gc.toString());
+
+		assertThat(gc.toString(),
+				is("{ \"$keyf\" : \"classpath:keyFunction.js\" , \"$reduce\" :  null  , \"initial\" :  null }"));
 	}
 
 	@Test
 	public void SimpleGroup() {
-		createGroupByData();
-		GroupByResults<XObject> results;
 
-		results = mongoTemplate.group(
+		createGroupByData();
+		GroupByResults<XObject> results = mongoTemplate.group(
 				"group_test_collection",
 				GroupBy.key("x").initialDocument(new BasicDBObject("count", 0))
 						.reduceFunction("function(doc, prev) { prev.count += 1 }"), XObject.class);
 
 		assertMapReduceResults(results);
-
 	}
 
 	@Test
 	public void SimpleGroupWithKeyFunction() {
-		createGroupByData();
-		GroupByResults<XObject> results;
 
-		results = mongoTemplate.group(
+		createGroupByData();
+		GroupByResults<XObject> results = mongoTemplate.group(
 				"group_test_collection",
 				GroupBy.keyFunction("function(doc) { return { x : doc.x }; }").initialDocument("{ count: 0 }")
 						.reduceFunction("function(doc, prev) { prev.count += 1 }"), XObject.class);
@@ -136,30 +141,35 @@ public class GroupByTests {
 
 	@Test
 	public void SimpleGroupWithFunctionsAsResources() {
-		createGroupByData();
-		GroupByResults<XObject> results;
 
-		results = mongoTemplate.group("group_test_collection", GroupBy.keyFunction("classpath:keyFunction.js")
-				.initialDocument("{ count: 0 }").reduceFunction("classpath:groupReduce.js"), XObject.class);
+		createGroupByData();
+		GroupByResults<XObject> results = mongoTemplate.group(
+				"group_test_collection",
+				GroupBy.keyFunction("classpath:keyFunction.js").initialDocument("{ count: 0 }")
+						.reduceFunction("classpath:groupReduce.js"), XObject.class);
 
 		assertMapReduceResults(results);
 	}
 
 	@Test
 	public void SimpleGroupWithQueryAndFunctionsAsResources() {
-		createGroupByData();
-		GroupByResults<XObject> results;
 
-		results = mongoTemplate.group(where("x").gt(0), "group_test_collection", keyFunction("classpath:keyFunction.js")
-				.initialDocument("{ count: 0 }").reduceFunction("classpath:groupReduce.js"), XObject.class);
+		createGroupByData();
+		GroupByResults<XObject> results = mongoTemplate.group(
+				where("x").gt(0),
+				"group_test_collection",
+				keyFunction("classpath:keyFunction.js").initialDocument("{ count: 0 }").reduceFunction(
+						"classpath:groupReduce.js"), XObject.class);
 
 		assertMapReduceResults(results);
 	}
 
 	private void assertMapReduceResults(GroupByResults<XObject> results) {
+
 		DBObject dboRawResults = results.getRawResults();
-		String expected = "{ \"serverUsed\" : \"/127.0.0.1:27017\" , \"retval\" : [ { \"x\" : 1.0 , \"count\" : 2.0} , { \"x\" : 2.0 , \"count\" : 1.0} , { \"x\" : 3.0 , \"count\" : 3.0}] , \"count\" : 6.0 , \"keys\" : 3 , \"ok\" : 1.0}";
-		Assert.assertEquals(expected, dboRawResults.toString());
+
+		assertThat(dboRawResults.containsField("serverUsed"), is(true));
+		assertThat(dboRawResults.get("serverUsed").toString(), endsWith("127.0.0.1:27017"));
 
 		int numResults = 0;
 		for (XObject xObject : results) {
@@ -174,13 +184,15 @@ public class GroupByTests {
 			}
 			numResults++;
 		}
-		Assert.assertEquals(3, numResults);
-		Assert.assertEquals(6, results.getCount(), 0.001);
-		Assert.assertEquals(3, results.getKeys());
+		assertThat(numResults, is(3));
+		assertThat(results.getKeys(), is(3));
+		assertEquals(6, results.getCount(), 0.001);
 	}
 
 	private void createGroupByData() {
+
 		DBCollection c = mongoTemplate.getDb().getCollection("group_test_collection");
+
 		c.save(new BasicDBObject("x", 1));
 		c.save(new BasicDBObject("x", 1));
 		c.save(new BasicDBObject("x", 2));
@@ -188,5 +200,4 @@ public class GroupByTests {
 		c.save(new BasicDBObject("x", 3));
 		c.save(new BasicDBObject("x", 3));
 	}
-
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,6 +37,7 @@ import org.springframework.data.mongodb.core.MongoTemplate;
 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.geo.Box;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.test.context.ContextConfiguration;
@@ -50,6 +51,7 @@ import com.mongodb.Mongo;
  * Integration test for {@link MongoTemplate}'s Map-Reduce operations
  * 
  * @author Mark Pollack
+ * @author Thomas Darimont
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration("classpath:infrastructure.xml")
@@ -276,6 +278,31 @@ public class MapReduceTests {
 
 	}
 
+	/**
+	 * @see DATAMONGO-938
+	 */
+	@Test
+	public void mapReduceShouldUseQueryMapper() {
+
+		DBCollection c = mongoTemplate.getDb().getCollection("jmrWithGeo");
+
+		c.save(new BasicDBObject("x", new String[] { "a", "b" }).append("loc", new double[] { 0, 0 }));
+		c.save(new BasicDBObject("x", new String[] { "b", "c" }).append("loc", new double[] { 0, 0 }));
+		c.save(new BasicDBObject("x", new String[] { "c", "d" }).append("loc", new double[] { 0, 0 }));
+
+		Query query = new Query(where("x").ne(new String[] { "a", "b" }).and("loc")
+				.within(new Box(new double[] { 0, 0 }, new double[] { 1, 1 })));
+
+		MapReduceResults<ValueObject> results = template.mapReduce(query, "jmrWithGeo", mapFunction, reduceFunction,
+				ValueObject.class);
+
+		Map<String, Float> m = copyToMap(results);
+		assertEquals(3, m.size());
+		assertEquals(1, m.get("b").intValue());
+		assertEquals(2, m.get("c").intValue());
+		assertEquals(1, m.get("d").intValue());
+	}
+
 	private void performMapReduce(boolean inline, boolean withQuery) {
 		createMapReduceData();
 		MapReduceResults<ValueObject> results;

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

@@ -20,11 +20,18 @@ import static org.junit.Assert.*;
 
 import org.junit.Test;
 import org.springframework.data.domain.Sort.Direction;
+import org.springframework.data.mongodb.core.index.GeoSpatialIndexType;
 import org.springframework.data.mongodb.core.index.GeospatialIndex;
 import org.springframework.data.mongodb.core.index.Index;
 import org.springframework.data.mongodb.core.index.Index.Duplicates;
 
-public class IndexTests {
+/**
+ * Unit tests for {@link Index}.
+ * 
+ * @author Oliver Gierke
+ * @author Laurent Canet
+ */
+public class IndexUnitTests {
 
 	@Test
 	public void testWithAscendingIndex() {
@@ -69,6 +76,29 @@ public class IndexTests {
 		assertEquals("{ \"min\" : 0}", i.getIndexOptions().toString());
 	}
 
+	/**
+	 * @see DATAMONGO-778
+	 */
+	@Test
+	public void testGeospatialIndex2DSphere() {
+
+		GeospatialIndex i = new GeospatialIndex("location").typed(GeoSpatialIndexType.GEO_2DSPHERE);
+		assertEquals("{ \"location\" : \"2dsphere\"}", i.getIndexKeys().toString());
+		assertEquals("{ }", i.getIndexOptions().toString());
+	}
+
+	/**
+	 * @see DATAMONGO-778
+	 */
+	@Test
+	public void testGeospatialIndexGeoHaystack() {
+
+		GeospatialIndex i = new GeospatialIndex("location").typed(GeoSpatialIndexType.GEO_HAYSTACK)
+				.withAdditionalField("name").withBucketSize(40);
+		assertEquals("{ \"location\" : \"geoHaystack\" , \"name\" : 1}", i.getIndexKeys().toString());
+		assertEquals("{ \"bucketSize\" : 40.0}", i.getIndexOptions().toString());
+	}
+
 	@Test
 	public void ensuresPropertyOrder() {
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2013 the original author or authors.
+ * Copyright 2011-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ import static org.junit.Assert.*;
 import org.junit.Test;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.mongodb.core.DBObjectTestUtils;
 import org.springframework.data.mongodb.core.geo.Distance;
 import org.springframework.data.mongodb.core.geo.Metric;
 import org.springframework.data.mongodb.core.geo.Metrics;
@@ -31,6 +32,7 @@ import org.springframework.data.mongodb.core.geo.Point;
  * 
  * @author Oliver Gierke
  * @author Thomas Darimont
+ * @author Christoph Strobl
  */
 public class NearQueryUnitTests {
 
@@ -123,4 +125,36 @@ public class NearQueryUnitTests {
 		assertThat(query.getSkip(), is(pageable.getPageNumber() * pageable.getPageSize()));
 		assertThat((Integer) query.toDBObject().get("num"), is((pageable.getPageNumber() + 1) * pageable.getPageSize()));
 	}
+
+	/**
+	 * @see DATAMONGO-829
+	 */
+	@Test
+	public void nearQueryShouldInoreZeroLimitFromQuery() {
+
+		NearQuery query = NearQuery.near(new Point(1, 2)).query(Query.query(Criteria.where("foo").is("bar")));
+		assertThat(query.toDBObject().get("num"), nullValue());
+	}
+
+	/**
+	 * @see DATAMONOGO-829
+	 */
+	@Test(expected = IllegalArgumentException.class)
+	public void nearQueryShouldThrowExceptionWhenGivenANullQuery() {
+		NearQuery.near(new Point(1, 2)).query(null);
+	}
+
+	/**
+	 * @see DATAMONGO-829
+	 */
+	@Test
+	public void numShouldNotBeAlteredByQueryWithoutPageable() {
+
+		int num = 100;
+		NearQuery query = NearQuery.near(new Point(1, 2));
+		query.num(num);
+		query.query(Query.query(Criteria.where("foo").is("bar")));
+
+		assertThat(DBObjectTestUtils.getTypedValue(query.toDBObject(), "num", Integer.class), is(num));
+	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 the original author or authors.
+ * Copyright 2010-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@ import org.junit.Test;
  * @author Oliver Gierke
  * @author Thomas Risberg
  * @author Becca Gaspard
+ * @author Christoph Strobl
  */
 public class UpdateTests {
 
@@ -94,6 +95,23 @@ public class UpdateTests {
 				is("{ \"$pushAll\" : { \"authors\" : [ { \"name\" : \"Sven\"} , { \"name\" : \"Maria\"}]}}"));
 	}
 
+	/**
+	 * @see DATAMONGO-354
+	 */
+	@Test
+	public void testMultiplePushAllShouldBePossibleWhenUsingDifferentFields() {
+
+		Map<String, String> m1 = Collections.singletonMap("name", "Sven");
+		Map<String, String> m2 = Collections.singletonMap("name", "Maria");
+
+		Update u = new Update().pushAll("authors", new Object[] { m1, m2 });
+		u.pushAll("books", new Object[] { "Spring in Action" });
+
+		assertThat(
+				u.getUpdateObject().toString(),
+				is("{ \"$pushAll\" : { \"authors\" : [ { \"name\" : \"Sven\"} , { \"name\" : \"Maria\"}] , \"books\" : [ \"Spring in Action\"]}}"));
+	}
+
 	@Test
 	public void testAddToSet() {
 
@@ -170,4 +188,100 @@ public class UpdateTests {
 		Update u = new Update().setOnInsert("size", 1).setOnInsert("count", 1);
 		assertThat(u.getUpdateObject().toString(), is("{ \"$setOnInsert\" : { \"size\" : 1 , \"count\" : 1}}"));
 	}
+
+	/**
+	 * @see DATAMONGO-852
+	 */
+	@Test
+	public void testUpdateAffectsFieldShouldReturnTrueWhenMultiFieldOperationAddedForField() {
+
+		Update update = new Update().set("foo", "bar");
+		assertThat(update.modifies("foo"), is(true));
+	}
+
+	/**
+	 * @see DATAMONGO-852
+	 */
+	@Test
+	public void testUpdateAffectsFieldShouldReturnFalseWhenMultiFieldOperationAddedForField() {
+
+		Update update = new Update().set("foo", "bar");
+		assertThat(update.modifies("oof"), is(false));
+	}
+
+	/**
+	 * @see DATAMONGO-852
+	 */
+	@Test
+	public void testUpdateAffectsFieldShouldReturnTrueWhenSingleFieldOperationAddedForField() {
+
+		Update update = new Update().pullAll("foo", new Object[] { "bar" });
+		assertThat(update.modifies("foo"), is(true));
+	}
+
+	/**
+	 * @see DATAMONGO-852
+	 */
+	@Test
+	public void testUpdateAffectsFieldShouldReturnFalseWhenSingleFieldOperationAddedForField() {
+
+		Update update = new Update().pullAll("foo", new Object[] { "bar" });
+		assertThat(update.modifies("oof"), is(false));
+	}
+
+	/**
+	 * @see DATAMONGO-852
+	 */
+	@Test
+	public void testUpdateAffectsFieldShouldReturnFalseWhenCalledOnEmptyUpdate() {
+		assertThat(new Update().modifies("foo"), is(false));
+	}
+
+	/**
+	 * @see DATAMONGO-852
+	 */
+	@Test
+	public void testUpdateAffectsFieldShouldReturnTrueWhenUpdateWithKeyCreatedFromDbObject() {
+
+		Update update = new Update().set("foo", "bar");
+		Update clone = Update.fromDBObject(update.getUpdateObject());
+
+		assertThat(clone.modifies("foo"), is(true));
+	}
+
+	/**
+	 * @see DATAMONGO-852
+	 */
+	@Test
+	public void testUpdateAffectsFieldShouldReturnFalseWhenUpdateWithoutKeyCreatedFromDbObject() {
+
+		Update update = new Update().set("foo", "bar");
+		Update clone = Update.fromDBObject(update.getUpdateObject());
+
+		assertThat(clone.modifies("oof"), is(false));
+	}
+
+	/**
+	 * @see DATAMONGO-853
+	 */
+	@Test(expected = IllegalArgumentException.class)
+	public void testAddingMultiFieldOperationThrowsExceptionWhenCalledWithNullKey() {
+		new Update().addMultiFieldOperation("$op", null, "exprected to throw IllegalArgumentException.");
+	}
+
+	/**
+	 * @see DATAMONGO-853
+	 */
+	@Test(expected = IllegalArgumentException.class)
+	public void testAddingSingleFieldOperationThrowsExceptionWhenCalledWithNullKey() {
+		new Update().addFieldOperation("$op", null, "exprected to throw IllegalArgumentException.");
+	}
+
+	/**
+	 * @see DATAMONGO-853
+	 */
+	@Test(expected = IllegalArgumentException.class)
+	public void testCreatingUpdateWithNullKeyThrowsException() {
+		Update.update(null, "value");
+	}
 }

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/GridFsTemplateIntegrationTests.java

@@ -45,10 +45,11 @@ import com.mongodb.gridfs.GridFSFile;
  * 
  * @author Oliver Gierke
  * @author Philipp Schneider
+ * @author Thomas Darimont
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration("classpath:gridfs/gridfs.xml")
-public class GridFsTemplateIIntegrationTests {
+public class GridFsTemplateIntegrationTests {
 
 	Resource resource = new ClassPathResource("gridfs/gridfs.xml");
 
@@ -162,6 +163,14 @@ public class GridFsTemplateIIntegrationTests {
 		assertSame(result.get(0), reference);
 	}
 
+	/**
+	 * @see DATAMONGO-813
+	 */
+	@Test
+	public void getResourceShouldReturnNullForNonExistingResource() {
+		assertThat(operations.getResource("doesnotexist"), is(nullValue()));
+	}
+
 	private static void assertSame(GridFSFile left, GridFSFile right) {
 
 		assertThat(left.getId(), is(right.getId()));

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/AbstractPersonRepositoryIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2013 the original author or authors.
+ * Copyright 2011-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,6 +50,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * 
  * @author Oliver Gierke
  * @author Thomas Darimont
+ * @author Christoph Strobl
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 public abstract class AbstractPersonRepositoryIntegrationTests {
@@ -738,4 +739,91 @@ public abstract class AbstractPersonRepositoryIntegrationTests {
 		assertThat(result.size(), is(1));
 		assertThat(result.get(0), is(dave));
 	}
+
+	/**
+	 * @see DATAMONGO-871
+	 */
+	@Test
+	public void findsPersonsByFirstnameAsArray() {
+
+		Person[] result = repository.findByThePersonsFirstnameAsArray("Leroi");
+
+		assertThat(result, is(arrayWithSize(1)));
+		assertThat(result, is(arrayContaining(leroi)));
+	}
+
+	/**
+	 * @see DATAMONGO-821
+	 */
+	@Test
+	public void findUsingAnnotatedQueryOnDBRef() {
+
+		operations.remove(new org.springframework.data.mongodb.core.query.Query(), User.class);
+
+		User user = new User();
+		user.username = "Terria";
+		operations.save(user);
+
+		alicia.creator = user;
+		repository.save(alicia);
+
+		Page<Person> result = repository.findByHavingCreator(new PageRequest(0, 100));
+		assertThat(result.getNumberOfElements(), is(1));
+		assertThat(result.getContent().get(0), is(alicia));
+	}
+	
+	/**
+	 * @see DATAMONGO-893
+	 */
+	@Test
+	public void findByNestedPropertyInCollectionShouldFindMatchingDocuments() {
+
+		Person p = new Person("Mary", "Poppins");
+		Address adr = new Address("some", "2", "where");
+		p.setAddress(adr);
+
+		repository.save(p);
+
+		Page<Person> result = repository.findByAddressIn(Arrays.asList(adr), new PageRequest(0, 10));
+
+		assertThat(result.getContent(), hasSize(1));
+	}
+
+	/**
+	 * @see DATAMONGO-745
+	 */
+	@Test
+	public void findByCustomQueryFirstnamesInListAndLastname() {
+
+		repository.save(new Person("foo", "bar"));
+		repository.save(new Person("bar", "bar"));
+		repository.save(new Person("fuu", "bar"));
+		repository.save(new Person("notfound", "bar"));
+
+		Page<Person> result = repository.findByCustomQueryFirstnamesAndLastname(Arrays.asList("bar", "foo", "fuu"), "bar",
+				new PageRequest(0, 2));
+
+		assertThat(result.getContent(), hasSize(2));
+		assertThat(result.getTotalPages(), is(2));
+		assertThat(result.getTotalElements(), is(3L));
+	}
+
+	/**
+	 * @see DATAMONGO-745
+	 */
+	@Test
+	public void findByCustomQueryLastnameAndStreetInList() {
+
+		repository.save(new Person("foo", "bar").withAddress(new Address("street1", "1", "SB")));
+		repository.save(new Person("bar", "bar").withAddress(new Address("street2", "1", "SB")));
+		repository.save(new Person("fuu", "bar").withAddress(new Address("street1", "2", "RGB")));
+		repository.save(new Person("notfound", "notfound"));
+
+		Page<Person> result = repository.findByCustomQueryLastnameAndAddressStreetInList("bar",
+				Arrays.asList("street1", "street2"), new PageRequest(0, 2));
+
+		assertThat(result.getContent(), hasSize(2));
+		assertThat(result.getTotalPages(), is(2));
+		assertThat(result.getTotalElements(), is(3L));
+	}
 }

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/Person.java

@@ -261,6 +261,12 @@ public class Person extends Contact {
 		return this.getId().equals(that.getId());
 	}
 
+	public Person withAddress(Address address) {
+
+		this.address = address;
+		return this;
+	}
+
 	/*
 	* (non-Javadoc)
 	*

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepository.java

@@ -37,6 +37,7 @@ import org.springframework.data.querydsl.QueryDslPredicateExecutor;
  * 
  * @author Oliver Gierke
  * @author Thomas Darimont
+ * @author Christoph Strobl
  */
 public interface PersonRepository extends MongoRepository<Person, String>, QueryDslPredicateExecutor<Person> {
 
@@ -70,6 +71,12 @@ public interface PersonRepository extends MongoRepository<Person, String>, Query
 	@Query(value = "{ 'firstname' : ?0 }", fields = "{ 'firstname': 1, 'lastname': 1}")
 	List<Person> findByThePersonsFirstname(String firstname);
 
+	/**
+	 * @see DATAMONGO-871
+	 */
+	@Query(value = "{ 'firstname' : ?0 }")
+	Person[] findByThePersonsFirstnameAsArray(String firstname);
+
 	/**
 	 * Returns all {@link Person}s with a firstname matching the given one (*-wildcard supported).
 	 * 
@@ -245,4 +252,26 @@ public interface PersonRepository extends MongoRepository<Person, String>, Query
 	 */
 	List<Person> findByFirstnameContainingIgnoreCase(String firstName);
 
+	/**
+	 * @see DATAMONGO-821
+	 */
+	@Query("{ creator : { $exists : true } }")
+	Page<Person> findByHavingCreator(Pageable page);
+
+	/**
+	 * @see DATAMONGO-893
+	 */
+	Page<Person> findByAddressIn(List<Address> address, Pageable page);
+
+	/**
+	 * @see DATAMONGO-745
+	 */
+	@Query("{firstname:{$in:?0}, lastname:?1}")
+	Page<Person> findByCustomQueryFirstnamesAndLastname(List<String> firstnames, String lastname, Pageable page);
+
+	/**
+	 * @see DATAMONGO-745
+	 */
+	@Query("{lastname:?0, address.street:{$in:?1}}")
+	Page<Person> findByCustomQueryLastnameAndAddressStreetInList(String lastname, List<String> streetNames, Pageable page);
 }