DATAMONGO-873 - Prepare next development iteration.

Updated readme, changelog,... to reflect recent version number. Updated reference to spring.io.

Original Pull Request: #144.

README.md

@@ -1,6 +1,6 @@
 # Spring Data MongoDB
 
-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 primary goal of the [Spring Data](http://www.springsource.org/spring-data) project is to make it easier to build Spring-powered applications that use new data access technologies such as non-relational databases, map-reduce frameworks, and cloud based data services.
 
 The Spring Data MongoDB 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://docs.spring.io/spring-data/mongodb/docs/current/reference/html/)
-* the [JavaDocs](http://docs.spring.io/spring-data/mongodb/docs/current/api/) have extensive comments in them as well.
-* the home page of [Spring Data MongoDB](http://projects.spring.io/spring-data-mongodb) contains links to articles and other resources.
-* for more detailed questions, use [Spring Data Mongodb on Stackoverflow](http://stackoverflow.com/questions/tagged/spring-data-mongodb).
+* the [User Guide](http://static.springsource.org/spring-data/data-mongodb/docs/current/reference/html/) 
+* the [JavaDocs](http://static.springsource.org/spring-data/data-mongodb/docs/current/api/) have extensive comments in them as well.
+* the home page of [Spring Data MongoDB](http://www.springsource.org/spring-data/mongodb) contains links to articles and other resources.
+* for more detailed questions, use the [forum](http://forum.springsource.org/forumdisplay.php?f=80). 
 
-If you are new to Spring as well as to Spring Data, look for information about [Spring projects](http://projects.spring.io/).
+If you are new to Spring as well as to Spring Data, look for information about [Spring projects](http://www.springsource.org/projects). 
 
 
 ## Quick Start
@@ -26,7 +26,7 @@ Add the Maven dependency:
 <dependency>
   <groupId>org.springframework.data</groupId>
   <artifactId>spring-data-mongodb</artifactId>
-  <version>1.5.0.RELEASE</version>
+  <version>1.3.5.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.6.0.BUILD-SNAPSHOT</version>
+  <version>1.4.0.BUILD-SNAPSHOT</version>
 </dependency>
 
 <repository>
   <id>spring-libs-snapshot</id>
   <name>Spring Snapshot Repository</name>
-  <url>http://repo.spring.io/libs-snapshot</url>
+  <url>http://repo.springsource.org/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://docs.spring.io/spring/docs/current/spring-framework-reference/html/dao.html#dao-exceptions).
+* Exception translation into Spring's [technology agnostic DAO exception hierarchy](http://static.springsource.org/spring/docs/3.0.x/spring-framework-reference/html/dao.html#dao-exceptions).
 
 ### Spring Data repositories
 
@@ -81,7 +81,7 @@ class ApplicationConfig extends AbstractMongoConfiguration {
 
   @Override
   public Mongo mongo() throws Exception {
-    return new MongoClient();
+    return new Mongo();
   }
 
   @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.mongodb.core.MongoTemplate">
+<bean id="template" class="org.springframework.data.document.mongodb.MongoTemplate">
   <constructor-arg>
-    <bean class="com.mongodb.MongoClient">
+    <bean class="com.mongodb.Mongo">
        <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 Stackoverflow and help out on the [spring-data-mongodb](http://stackoverflow.com/questions/tagged/spring-data-mongodb) tag by responding to questions and joining the debate.
+* Get involved with the Spring community on the Spring Community Forums.  Please help out on the [forum](http://forum.springsource.org/forumdisplay.php?f=80) by responding to questions and joining the debate.
 * Create [JIRA](https://jira.springframework.org/browse/DATADOC) tickets for bugs and new features and comment and vote on the ones that you are interested in.  
 * Github is for social coding: if you want to write code, we encourage contributions through pull requests from [forks of this repository](http://help.github.com/forking/). If you want to contribute code this way, please reference a JIRA ticket as well covering the specific issue you are addressing.
-* Watch for upcoming articles on Spring by [subscribing](http://spring.io/blog) to spring.io.
+* Watch for upcoming articles on Spring by [subscribing](http://www.springsource.org/node/feed) to springframework.org
 
 Before we accept a non-trivial patch or pull request we will need you to sign the [contributor's agreement](https://support.springsource.com/spring_committer_signup).  Signing the contributor's agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do.  Active contributors might be asked to join the core team, and given the ability to merge pull requests.

pom.xml

@@ -2,10 +2,10 @@
 <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.7.0.M1</version>
+	<version>1.3.6.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data MongoDB</name>
@@ -15,10 +15,10 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>1.6.0.M1</version>
+		<version>1.2.2.RELEASE</version>
 		<relativePath>../spring-data-build/parent/pom.xml</relativePath>
 	</parent>
-
+	
 	<modules>
 		<module>spring-data-mongodb</module>
 		<module>spring-data-mongodb-cross-store</module>
@@ -29,28 +29,27 @@
 	<properties>
 		<project.type>multi</project.type>
 		<dist.id>spring-data-mongodb</dist.id>
-		<springdata.commons>1.10.0.M1</springdata.commons>
-		<mongo>2.12.3</mongo>
-		<mongo.osgi>2.12.3</mongo.osgi>
+		<springdata.commons>1.6.5.RELEASE</springdata.commons>
+		<mongo>2.10.1</mongo>
 	</properties>
-
+	
 	<developers>
 		<developer>
 			<id>ogierke</id>
 			<name>Oliver Gierke</name>
 			<email>ogierke at gopivotal.com</email>
-			<organization>Pivotal</organization>
+			<organization>Pivotal Software, Inc.</organization>
 			<organizationUrl>http://www.gopivotal.com</organizationUrl>
 			<roles>
-				<role>Project Lead</role>
+				<role>Project Lean</role>
 			</roles>
 			<timezone>+1</timezone>
 		</developer>
 		<developer>
 			<id>trisberg</id>
 			<name>Thomas Risberg</name>
-			<email>trisberg at vmware.com</email>
-			<organization>Pivotal</organization>
+			<email>trisberg at gopivotal.com</email>
+			<organization>Pivotal Software, Inc.</organization>
 			<organizationUrl>http://www.gopivotal.com</organizationUrl>
 			<roles>
 				<role>Developer</role>
@@ -61,7 +60,7 @@
 			<id>mpollack</id>
 			<name>Mark Pollack</name>
 			<email>mpollack at gopivotal.com</email>
-			<organization>Pivotal</organization>
+			<organization>Pivotal Software, Inc.</organization>
 			<organizationUrl>http://www.gopivotal.com</organizationUrl>
 			<roles>
 				<role>Developer</role>
@@ -72,7 +71,7 @@
 			<id>jbrisbin</id>
 			<name>Jon Brisbin</name>
 			<email>jbrisbin at gopivotal.com</email>
-			<organization>Pivotal</organization>
+			<organization>Pivotal Software, Inc.</organization>
 			<organizationUrl>http://www.gopivotal.com</organizationUrl>
 			<roles>
 				<role>Developer</role>
@@ -83,7 +82,7 @@
 			<id>tdarimont</id>
 			<name>Thomas Darimont</name>
 			<email>tdarimont at gopivotal.com</email>
-			<organization>Pivotal</organization>
+			<organization>Pivotal Software, Inc.</organization>
 			<organizationUrl>http://www.gopivotal.com</organizationUrl>
 			<roles>
 				<role>Developer</role>
@@ -94,7 +93,7 @@
 			<id>cstrobl</id>
 			<name>Christoph Strobl</name>
 			<email>cstrobl at gopivotal.com</email>
-			<organization>Pivotal</organization>
+			<organization>Pivotal Software, Inc.</organization>
 			<organizationUrl>http://www.gopivotal.com</organizationUrl>
 			<roles>
 				<role>Developer</role>
@@ -103,40 +102,6 @@
 		</developer>
 	</developers>
 
-	<profiles>
-		<profile>
-
-			<id>mongo-next</id>
-			<properties>
-				<mongo>2.12.5-SNAPSHOT</mongo>
-			</properties>
-
-			<repositories>
-				<repository>
-					<id>mongo-snapshots</id>
-					<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-				</repository>
-			</repositories>
-
-		</profile>
-
-		<profile>
-
-			<id>mongo-3-next</id>
-			<properties>
-				<mongo>3.0.0-SNAPSHOT</mongo>
-			</properties>
-
-			<repositories>
-				<repository>
-					<id>mongo-snapshots</id>
-					<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-				</repository>
-			</repositories>
-
-		</profile>
-	</profiles>
-
 	<dependencies>
 		<!-- MongoDB -->
 		<dependency>
@@ -145,19 +110,19 @@
 			<version>${mongo}</version>
 		</dependency>
 	</dependencies>
-
+	
 	<repositories>
 		<repository>
-			<id>spring-libs-milestone</id>
-			<url>http://repo.spring.io/libs-milestone</url>
+			<id>spring-lib-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>
+ 		<pluginRepository>
+ 			<id>spring-plugins-release</id>
+ 			<url>http://repo.spring.io/plugins-release</url>
+ 		</pluginRepository>
+ 	</pluginRepositories>
 
 </project>

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

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

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

@@ -2,28 +2,29 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
-
+	
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.7.0.M1</version>
+		<version>1.3.6.BUILD-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
-
+	
 	<artifactId>spring-data-mongodb-cross-store</artifactId>
-	<name>Spring Data MongoDB - Cross-Store Support</name>
-
+	<name>Spring Data MongoDB - Cross-Store Persistence Support</name>
+	
 	<properties>
 		<jpa>1.0.0.Final</jpa>
 		<hibernate>3.6.10.Final</hibernate>
 	</properties>
-
+	
 	<dependencies>
 
 		<!-- Spring -->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
+			<version>${spring}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>commons-logging</groupId>
@@ -34,21 +35,24 @@
 		<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.7.0.M1</version>
+			<version>1.3.6.BUILD-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
@@ -56,13 +60,17 @@
 			<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 -->
@@ -98,7 +106,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>aspectj-maven-plugin</artifactId>
-				<version>1.6</version>
+				<version>1.4</version>
 				<dependencies>
 					<dependency>
 						<groupId>org.aspectj</groupId>
@@ -127,10 +135,8 @@
 							<artifactId>spring-aspects</artifactId>
 						</aspectLibrary>
 					</aspectLibraries>
-					<complianceLevel>${source.level}</complianceLevel>
 					<source>${source.level}</source>
 					<target>${source.level}</target>
-					<xmlConfigured>aop.xml</xmlConfigured>
 				</configuration>
 			</plugin>
 		</plugins>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 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.
@@ -41,13 +41,17 @@ 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) {
@@ -109,14 +113,12 @@ 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");
 		}
-
-		return entityManagerFactory.getPersistenceUnitUtil().getIdentifier(entity);
+		Object o = entityManagerFactory.getPersistenceUnitUtil().getIdentifier(entity);
+		return o;
 	}
 
 	/*

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

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

spring-data-mongodb-distribution/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
-
+	
 	<artifactId>spring-data-mongodb-distribution</artifactId>
 
 	<packaging>pom</packaging>
@@ -13,10 +13,10 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.7.0.M1</version>
+		<version>1.3.6.BUILD-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
-
+	
 	<properties>
 		<project.root>${basedir}/..</project.root>
 		<dist.key>SDMONGO</dist.key>
@@ -32,10 +32,6 @@
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>wagon-maven-plugin</artifactId>
 			</plugin>
-			<plugin>
-				<groupId>org.asciidoctor</groupId>
-				<artifactId>asciidoctor-maven-plugin</artifactId>
-			</plugin>
 		</plugins>
 	</build>
 

spring-data-mongodb-log4j/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.7.0.M1</version>
+		<version>1.3.6.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: Pivotal Software, Inc.
+Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Package:
  sun.reflect;version="0";resolution:=optional
 Import-Template:
- com.mongodb.*;version="${mongo.osgi:[=.=.=,+1.0.0)}",
+ com.mongodb.*;version="${mongo:[=.=,+1.0.0)}",
  org.apache.log4j.*;version="${log4j:[=.=.=,+1.0.0)}"

spring-data-mongodb/Spring Data MongoDB.sonargraph

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

spring-data-mongodb/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
-
+	
 	<artifactId>spring-data-mongodb</artifactId>
 
 	<name>Spring Data MongoDB - Core</name>
@@ -11,34 +11,36 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.7.0.M1</version>
+		<version>1.3.6.BUILD-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<properties>
 		<validation>1.0.0.GA</validation>
-		<objenesis>1.3</objenesis>
-		<equalsverifier>1.5</equalsverifier>
 	</properties>
 
 	<dependencies>
-
-		<!-- Spring -->
+		
+		<!--  Spring -->
 		<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>
@@ -49,10 +51,11 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-expression</artifactId>
+			<version>${spring}</version>
 		</dependency>
 
-		<!-- Spring Data -->
-		<dependency>
+		<!--  Spring Data -->
+			<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>spring-data-commons</artifactId>
 			<version>${springdata.commons}</version>
@@ -78,7 +81,7 @@
 			<version>1.0</version>
 			<optional>true</optional>
 		</dependency>
-
+		
 		<!-- CDI -->
 		<dependency>
 			<groupId>javax.enterprise</groupId>
@@ -87,21 +90,21 @@
 			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
-
+		
 		<dependency>
 			<groupId>javax.el</groupId>
 			<artifactId>el-api</artifactId>
 			<version>${cdi}</version>
 			<scope>test</scope>
 		</dependency>
-
+		
 		<dependency>
 			<groupId>org.apache.openwebbeans.test</groupId>
 			<artifactId>cditest-owb</artifactId>
 			<version>${webbeans}</version>
 			<scope>test</scope>
 		</dependency>
-
+		
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
@@ -117,49 +120,36 @@
 			<optional>true</optional>
 		</dependency>
 
-		<dependency>
-			<groupId>org.objenesis</groupId>
-			<artifactId>objenesis</artifactId>
-			<version>${objenesis}</version>
-			<optional>true</optional>
-		</dependency>
-
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-validator</artifactId>
 			<version>4.2.0.Final</version>
 			<scope>test</scope>
 		</dependency>
-
+		
 		<dependency>
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time</artifactId>
 			<version>${jodatime}</version>
 			<scope>test</scope>
 		</dependency>
-
+		
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jul-to-slf4j</artifactId>
 			<version>${slf4j}</version>
 			<scope>test</scope>
 		</dependency>
-
-		<dependency>
-			<groupId>nl.jqno.equalsverifier</groupId>
-			<artifactId>equalsverifier</artifactId>
-			<version>${equalsverifier}</version>
-			<scope>test</scope>
-		</dependency>
+		
 	</dependencies>
-
+	
 	<build>
 		<plugins>
 
 			<plugin>
 				<groupId>com.mysema.maven</groupId>
 				<artifactId>apt-maven-plugin</artifactId>
-				<version>${apt}</version>
+				<version>1.0.8</version>
 				<dependencies>
 					<dependency>
 						<groupId>com.mysema.querydsl</groupId>
@@ -196,14 +186,9 @@
 					<systemPropertyVariables>
 						<java.util.logging.config.file>src/test/resources/logging.properties</java.util.logging.config.file>
 					</systemPropertyVariables>
-					<properties>
-						<property>
-							<name>listener</name>
-							<value>org.springframework.data.mongodb.test.util.CleanMongoDBJunitRunListener</value>
-						</property>
-					</properties>
 				</configuration>
 			</plugin>
 		</plugins>
 	</build>
+
 </project>

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 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.
@@ -28,16 +28,11 @@ import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.data.annotation.Persistent;
 import org.springframework.data.authentication.UserCredentials;
 import org.springframework.data.mapping.context.MappingContextIsNewStrategyFactory;
-import org.springframework.data.mapping.model.CamelCaseAbbreviatingFieldNamingStrategy;
-import org.springframework.data.mapping.model.FieldNamingStrategy;
-import org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy;
-import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
 import org.springframework.data.mongodb.core.convert.CustomConversions;
-import org.springframework.data.mongodb.core.convert.DbRefResolver;
-import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.mapping.CamelCaseAbbreviatingFieldNamingStrategy;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.support.CachingIsNewStrategyFactory;
@@ -52,8 +47,6 @@ import com.mongodb.Mongo;
  * 
  * @author Mark Pollack
  * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Ryan Tenney
  */
 @Configuration
 public abstract class AbstractMongoConfiguration {
@@ -65,16 +58,6 @@ public abstract class AbstractMongoConfiguration {
 	 */
 	protected abstract String getDatabaseName();
 
-	/**
-	 * Return the name of the authentication database to use. Defaults to {@literal null} and will turn into the value
-	 * returned by {@link #getDatabaseName()} later on effectively.
-	 * 
-	 * @return
-	 */
-	protected String getAuthenticationDatabaseName() {
-		return null;
-	}
-
 	/**
 	 * Return the {@link Mongo} instance to connect to. Annotate with {@link Bean} in case you want to expose a
 	 * {@link Mongo} instance to the {@link org.springframework.context.ApplicationContext}.
@@ -105,8 +88,15 @@ public abstract class AbstractMongoConfiguration {
 	 * @throws Exception
 	 */
 	@Bean
-	public MongoDbFactory mongoDbFactory() throws Exception {
-		return new SimpleMongoDbFactory(mongo(), getDatabaseName(), getUserCredentials(), getAuthenticationDatabaseName());
+	public SimpleMongoDbFactory mongoDbFactory() throws Exception {
+
+		UserCredentials credentials = getUserCredentials();
+
+		if (credentials == null) {
+			return new SimpleMongoDbFactory(mongo(), getDatabaseName());
+		} else {
+			return new SimpleMongoDbFactory(mongo(), getDatabaseName(), credentials);
+		}
 	}
 
 	/**
@@ -147,7 +137,10 @@ public abstract class AbstractMongoConfiguration {
 		MongoMappingContext mappingContext = new MongoMappingContext();
 		mappingContext.setInitialEntitySet(getInitialEntitySet());
 		mappingContext.setSimpleTypeHolder(customConversions().getSimpleTypeHolder());
-		mappingContext.setFieldNamingStrategy(fieldNamingStrategy());
+
+		if (abbreviateFieldNames()) {
+			mappingContext.setFieldNamingStrategy(new CamelCaseAbbreviatingFieldNamingStrategy());
+		}
 
 		return mappingContext;
 	}
@@ -187,11 +180,8 @@ public abstract class AbstractMongoConfiguration {
 	 */
 	@Bean
 	public MappingMongoConverter mappingMongoConverter() throws Exception {
-
-		DbRefResolver dbRefResolver = new DefaultDbRefResolver(mongoDbFactory());
-		MappingMongoConverter converter = new MappingMongoConverter(dbRefResolver, mongoMappingContext());
+		MappingMongoConverter converter = new MappingMongoConverter(mongoDbFactory(), mongoMappingContext());
 		converter.setCustomConversions(customConversions());
-
 		return converter;
 	}
 
@@ -232,15 +222,4 @@ public abstract class AbstractMongoConfiguration {
 	protected boolean abbreviateFieldNames() {
 		return false;
 	}
-
-	/**
-	 * Configures a {@link FieldNamingStrategy} on the {@link MongoMappingContext} instance created.
-	 * 
-	 * @return
-	 * @since 1.5
-	 */
-	protected FieldNamingStrategy fieldNamingStrategy() {
-		return abbreviateFieldNames() ? new CamelCaseAbbreviatingFieldNamingStrategy()
-				: PropertyNameFieldNamingStrategy.INSTANCE;
-	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,14 +24,13 @@ package org.springframework.data.mongodb.config;
  */
 public abstract class BeanNames {
 
-	public static final String MAPPING_CONTEXT_BEAN_NAME = "mongoMappingContext";
-
-	static final String INDEX_HELPER_BEAN_NAME = "indexCreationHelper";
-	static final String MONGO_BEAN_NAME = "mongo";
-	static final String DB_FACTORY_BEAN_NAME = "mongoDbFactory";
-	static final String VALIDATING_EVENT_LISTENER_BEAN_NAME = "validatingMongoEventListener";
-	static final String IS_NEW_STRATEGY_FACTORY_BEAN_NAME = "isNewStrategyFactory";
+	static final String MAPPING_CONTEXT = "mappingContext";
+	static final String INDEX_HELPER = "indexCreationHelper";
+	static final String MONGO = "mongo";
+	static final String DB_FACTORY = "mongoDbFactory";
+	static final String VALIDATING_EVENT_LISTENER = "validatingMongoEventListener";
+	static final String IS_NEW_STRATEGY_FACTORY = "isNewStrategyFactory";
 	static final String DEFAULT_CONVERTER_BEAN_NAME = "mappingConverter";
-	static final String MONGO_TEMPLATE_BEAN_NAME = "mongoTemplate";
-	static final String GRID_FS_TEMPLATE_BEAN_NAME = "gridFsTemplate";
+	static final String MONGO_TEMPLATE = "mongoTemplate";
+	static final String GRID_FS_TEMPLATE = "gridFsTemplate";
 }

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 the original author or authors.
+ * 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.
@@ -43,7 +43,7 @@ class GridFsTemplateParser extends AbstractBeanDefinitionParser {
 			throws BeanDefinitionStoreException {
 
 		String id = super.resolveId(element, definition, parserContext);
-		return StringUtils.hasText(id) ? id : BeanNames.GRID_FS_TEMPLATE_BEAN_NAME;
+		return StringUtils.hasText(id) ? id : BeanNames.GRID_FS_TEMPLATE;
 	}
 
 	/*
@@ -57,14 +57,13 @@ 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);
 
 		if (StringUtils.hasText(dbFactoryRef)) {
 			gridFsTemplateBuilder.addConstructorArgReference(dbFactoryRef);
 		} else {
-			gridFsTemplateBuilder.addConstructorArgReference(BeanNames.DB_FACTORY_BEAN_NAME);
+			gridFsTemplateBuilder.addConstructorArgReference(BeanNames.DB_FACTORY);
 		}
 
 		if (StringUtils.hasText(converterRef)) {
@@ -73,11 +72,7 @@ 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_BEAN_NAME)
+		return (AbstractBeanDefinition) helper.getComponentIdButFallback(gridFsTemplateBuilder, BeanNames.GRID_FS_TEMPLATE)
 				.getBeanDefinition();
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 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.
@@ -30,7 +30,6 @@ import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.parsing.BeanComponentDefinition;
 import org.springframework.beans.factory.parsing.CompositeComponentDefinition;
-import org.springframework.beans.factory.parsing.ReaderContext;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -52,10 +51,10 @@ import org.springframework.core.type.filter.TypeFilter;
 import org.springframework.data.annotation.Persistent;
 import org.springframework.data.config.BeanComponentDefinitionBuilder;
 import org.springframework.data.mapping.context.MappingContextIsNewStrategyFactory;
-import org.springframework.data.mapping.model.CamelCaseAbbreviatingFieldNamingStrategy;
 import org.springframework.data.mongodb.core.convert.CustomConversions;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.index.MongoPersistentEntityIndexCreator;
+import org.springframework.data.mongodb.core.mapping.CamelCaseAbbreviatingFieldNamingStrategy;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.event.ValidatingMongoEventListener;
@@ -72,12 +71,11 @@ 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 JSR_303_PRESENT = ClassUtils.isPresent("javax.validation.Validator",
+	private static final boolean jsr303Present = ClassUtils.isPresent("javax.validation.Validator",
 			MappingMongoConverterParser.class.getClassLoader());
 
 	/* (non-Javadoc)
@@ -85,13 +83,10 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 	 */
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 
-		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 : DEFAULT_CONVERTER_BEAN_NAME;
+		id = StringUtils.hasText(id) ? id : "mappingConverter";
 
 		parserContext.pushContainingComponent(new CompositeComponentDefinition("Mapping Mongo Converter", element));
 
@@ -103,7 +98,7 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 		// Need a reference to a Mongo instance
 		String dbFactoryRef = element.getAttribute("db-factory-ref");
 		if (!StringUtils.hasText(dbFactoryRef)) {
-			dbFactoryRef = DB_FACTORY_BEAN_NAME;
+			dbFactoryRef = DB_FACTORY;
 		}
 
 		// Converter
@@ -121,10 +116,10 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 		}
 
 		try {
-			registry.getBeanDefinition(INDEX_HELPER_BEAN_NAME);
+			registry.getBeanDefinition(INDEX_HELPER);
 		} catch (NoSuchBeanDefinitionException ignored) {
 			if (!StringUtils.hasText(dbFactoryRef)) {
-				dbFactoryRef = DB_FACTORY_BEAN_NAME;
+				dbFactoryRef = DB_FACTORY;
 			}
 			BeanDefinitionBuilder indexHelperBuilder = BeanDefinitionBuilder
 					.genericBeanDefinition(MongoPersistentEntityIndexCreator.class);
@@ -133,14 +128,14 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 			indexHelperBuilder.addDependsOn(ctxRef);
 
 			parserContext.registerBeanComponent(new BeanComponentDefinition(indexHelperBuilder.getBeanDefinition(),
-					INDEX_HELPER_BEAN_NAME));
+					INDEX_HELPER));
 		}
 
 		BeanDefinition validatingMongoEventListener = potentiallyCreateValidatingMongoEventListener(element, parserContext);
 
 		if (validatingMongoEventListener != null) {
 			parserContext.registerBeanComponent(new BeanComponentDefinition(validatingMongoEventListener,
-					VALIDATING_EVENT_LISTENER_BEAN_NAME));
+					VALIDATING_EVENT_LISTENER));
 		}
 
 		parserContext.registerBeanComponent(new BeanComponentDefinition(converterBuilder.getBeanDefinition(), id));
@@ -171,7 +166,7 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 
 	private RuntimeBeanReference getValidator(Object source, ParserContext parserContext) {
 
-		if (!JSR_303_PRESENT) {
+		if (!jsr303Present) {
 			return null;
 		}
 
@@ -185,7 +180,7 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 		return new RuntimeBeanReference(validatorName);
 	}
 
-	public static String potentiallyCreateMappingContext(Element element, ParserContext parserContext,
+	static String potentiallyCreateMappingContext(Element element, ParserContext parserContext,
 			BeanDefinition conversionsDefinition, String converterId) {
 
 		String ctxRef = element.getAttribute("mapping-context-ref");
@@ -200,8 +195,7 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 		BeanDefinitionBuilder mappingContextBuilder = BeanDefinitionBuilder
 				.genericBeanDefinition(MongoMappingContext.class);
 
-		Set<String> classesToAdd = getInititalEntityClasses(element);
-
+		Set<String> classesToAdd = getInititalEntityClasses(element, mappingContextBuilder);
 		if (classesToAdd != null) {
 			mappingContextBuilder.addPropertyValue("initialEntitySet", classesToAdd);
 		}
@@ -214,43 +208,18 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 			mappingContextBuilder.addPropertyValue("simpleTypeHolder", simpleTypesDefinition);
 		}
 
-		parseFieldNamingStrategy(element, parserContext.getReaderContext(), mappingContextBuilder);
+		String abbreviateFieldNames = element.getAttribute("abbreviate-field-names");
+		if ("true".equals(abbreviateFieldNames)) {
+			mappingContextBuilder.addPropertyValue("fieldNamingStrategy", new RootBeanDefinition(
+					CamelCaseAbbreviatingFieldNamingStrategy.class));
+		}
 
-		ctxRef = converterId == null || DEFAULT_CONVERTER_BEAN_NAME.equals(converterId) ? MAPPING_CONTEXT_BEAN_NAME
-				: converterId + "." + MAPPING_CONTEXT_BEAN_NAME;
+		ctxRef = converterId + "." + MAPPING_CONTEXT;
 
 		parserContext.registerBeanComponent(componentDefinitionBuilder.getComponent(mappingContextBuilder, ctxRef));
 		return ctxRef;
 	}
 
-	private static void parseFieldNamingStrategy(Element element, ReaderContext context, BeanDefinitionBuilder builder) {
-
-		String abbreviateFieldNames = element.getAttribute("abbreviate-field-names");
-		String fieldNamingStrategy = element.getAttribute("field-naming-strategy-ref");
-
-		boolean fieldNamingStrategyReferenced = StringUtils.hasText(fieldNamingStrategy);
-		boolean abbreviationActivated = StringUtils.hasText(abbreviateFieldNames)
-				&& Boolean.parseBoolean(abbreviateFieldNames);
-
-		if (fieldNamingStrategyReferenced && abbreviationActivated) {
-			context.error("Field name abbreviation cannot be activated if a field-naming-strategy-ref is configured!",
-					element);
-			return;
-		}
-
-		Object value = null;
-
-		if ("true".equals(abbreviateFieldNames)) {
-			value = new RootBeanDefinition(CamelCaseAbbreviatingFieldNamingStrategy.class);
-		} else if (fieldNamingStrategyReferenced) {
-			value = new RuntimeBeanReference(fieldNamingStrategy);
-		}
-
-		if (value != null) {
-			builder.addPropertyValue("fieldNamingStrategy", value);
-		}
-	}
-
 	private BeanDefinition getCustomConversions(Element element, ParserContext parserContext) {
 
 		List<Element> customConvertersElements = DomUtils.getChildElementsByTagName(element, "custom-converters");
@@ -293,7 +262,7 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 		return null;
 	}
 
-	private static Set<String> getInititalEntityClasses(Element element) {
+	private static Set<String> getInititalEntityClasses(Element element, BeanDefinitionBuilder builder) {
 
 		String basePackage = element.getAttribute(BASE_PACKAGE);
 
@@ -340,10 +309,9 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 		mappingContextStrategyFactoryBuilder.addConstructorArgReference(mappingContextRef);
 
 		BeanComponentDefinitionBuilder builder = new BeanComponentDefinitionBuilder(element, context);
-		context.registerBeanComponent(builder.getComponent(mappingContextStrategyFactoryBuilder,
-				IS_NEW_STRATEGY_FACTORY_BEAN_NAME));
+		context.registerBeanComponent(builder.getComponent(mappingContextStrategyFactoryBuilder, IS_NEW_STRATEGY_FACTORY));
 
-		return IS_NEW_STRATEGY_FACTORY_BEAN_NAME;
+		return IS_NEW_STRATEGY_FACTORY;
 	}
 
 	/**

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,19 +15,14 @@
  */
 package org.springframework.data.mongodb.config;
 
-import static org.springframework.data.config.ParsingUtils.*;
-import static org.springframework.data.mongodb.config.BeanNames.*;
-
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.data.auditing.config.IsNewAwareAuditingHandlerBeanDefinitionParser;
-import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.config.IsNewAwareAuditingHandlerBeanDefinitionParser;
 import org.springframework.data.mongodb.core.mapping.event.AuditingEventListener;
-import org.springframework.util.StringUtils;
 import org.w3c.dom.Element;
 
 /**
@@ -63,24 +58,23 @@ public class MongoAuditingBeanDefinitionParser extends AbstractSingleBeanDefinit
 	@Override
 	protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
 
-		String mappingContextRef = element.getAttribute("mapping-context-ref");
+		BeanDefinitionRegistry registry = parserContext.getRegistry();
 
-		if (!StringUtils.hasText(mappingContextRef)) {
+		if (!registry.containsBeanDefinition(BeanNames.IS_NEW_STRATEGY_FACTORY)) {
 
-			BeanDefinitionRegistry registry = parserContext.getRegistry();
+			String mappingContextName = BeanNames.MAPPING_CONTEXT;
 
-			if (!registry.containsBeanDefinition(MAPPING_CONTEXT_BEAN_NAME)) {
-				registry.registerBeanDefinition(MAPPING_CONTEXT_BEAN_NAME, new RootBeanDefinition(MongoMappingContext.class));
+			if (!registry.containsBeanDefinition(BeanNames.MAPPING_CONTEXT)) {
+				mappingContextName = MappingMongoConverterParser.potentiallyCreateMappingContext(element, parserContext, null,
+						BeanNames.DEFAULT_CONVERTER_BEAN_NAME);
 			}
 
-			mappingContextRef = MAPPING_CONTEXT_BEAN_NAME;
+			MappingMongoConverterParser.createIsNewStrategyFactoryBeanDefinition(mappingContextName, parserContext, element);
 		}
 
-		IsNewAwareAuditingHandlerBeanDefinitionParser parser = new IsNewAwareAuditingHandlerBeanDefinitionParser(
-				mappingContextRef);
-		parser.parse(element, parserContext);
+		BeanDefinitionParser parser = new IsNewAwareAuditingHandlerBeanDefinitionParser(BeanNames.IS_NEW_STRATEGY_FACTORY);
+		BeanDefinition handlerBeanDefinition = parser.parse(element, parserContext);
 
-		builder.addConstructorArgValue(getObjectFactoryBeanDefinition(parser.getResolvedBeanName(),
-				parserContext.extractSource(element)));
+		builder.addConstructorArgValue(handlerBeanDefinition);
 	}
 }

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

@@ -1,130 +0,0 @@
-/*
- * Copyright 2013-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.config;
-
-import 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.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.AuditingBeanDefinitionRegistrarSupport;
-import org.springframework.data.auditing.config.AuditingConfiguration;
-import org.springframework.data.config.ParsingUtils;
-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;
-
-/**
- * {@link ImportBeanDefinitionRegistrar} to enable {@link EnableMongoAuditing} annotation.
- * 
- * @author Thomas Darimont
- * @author Oliver Gierke
- */
-class MongoAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#getAnnotation()
-	 */
-	@Override
-	protected Class<? extends Annotation> getAnnotation() {
-		return EnableMongoAuditing.class;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#getAuditingHandlerBeanName()
-	 */
-	@Override
-	protected String getAuditingHandlerBeanName() {
-		return "mongoAuditingHandler";
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#registerBeanDefinitions(org.springframework.core.type.AnnotationMetadata, org.springframework.beans.factory.support.BeanDefinitionRegistry)
-	 */
-	@Override
-	public void registerBeanDefinitions(AnnotationMetadata annotationMetadata, BeanDefinitionRegistry registry) {
-
-		Assert.notNull(annotationMetadata, "AnnotationMetadata must not be null!");
-		Assert.notNull(registry, "BeanDefinitionRegistry must not be null!");
-
-		defaultDependenciesIfNecessary(registry, annotationMetadata);
-		super.registerBeanDefinitions(annotationMetadata, registry);
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#getAuditHandlerBeanDefinitionBuilder(org.springframework.data.auditing.config.AuditingConfiguration)
-	 */
-	@Override
-	protected BeanDefinitionBuilder getAuditHandlerBeanDefinitionBuilder(AuditingConfiguration configuration) {
-
-		Assert.notNull(configuration, "AuditingConfiguration must not be null!");
-
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(IsNewAwareAuditingHandler.class);
-		builder.addConstructorArgReference(MAPPING_CONTEXT_BEAN_NAME);
-		return configureDefaultAuditHandlerAttributes(configuration, builder);
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#registerAuditListener(org.springframework.beans.factory.config.BeanDefinition, org.springframework.beans.factory.support.BeanDefinitionRegistry)
-	 */
-	@Override
-	protected void registerAuditListenerBeanDefinition(BeanDefinition auditingHandlerDefinition,
-			BeanDefinitionRegistry registry) {
-
-		Assert.notNull(auditingHandlerDefinition, "BeanDefinition must not be null!");
-		Assert.notNull(registry, "BeanDefinitionRegistry must not be null!");
-
-		BeanDefinitionBuilder listenerBeanDefinitionBuilder = BeanDefinitionBuilder
-				.rootBeanDefinition(AuditingEventListener.class);
-		listenerBeanDefinitionBuilder.addConstructorArgValue(ParsingUtils.getObjectFactoryBeanDefinition(
-				getAuditingHandlerBeanName(), registry));
-
-		registerInfrastructureBeanWithId(listenerBeanDefinitionBuilder.getBeanDefinition(),
-				AuditingEventListener.class.getName(), registry);
-	}
-
-	/**
-	 * 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 defaultDependenciesIfNecessary(BeanDefinitionRegistry registry, Object source) {
-
-		if (!registry.containsBeanDefinition(MAPPING_CONTEXT_BEAN_NAME)) {
-
-			RootBeanDefinition definition = new RootBeanDefinition(MongoMappingContext.class);
-			definition.setRole(ROLE_INFRASTRUCTURE);
-			definition.setSource(source);
-
-			registry.registerBeanDefinition(MAPPING_CONTEXT_BEAN_NAME, definition);
-		}
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 by the original author(s).
+ * Copyright 2011-2012 by the original author(s).
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,7 +41,6 @@ import com.mongodb.MongoURI;
  * 
  * @author Jon Brisbin
  * @author Oliver Gierke
- * @author Thomas Darimont
  */
 public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 
@@ -54,7 +53,7 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 			throws BeanDefinitionStoreException {
 
 		String id = super.resolveId(element, definition, parserContext);
-		return StringUtils.hasText(id) ? id : BeanNames.DB_FACTORY_BEAN_NAME;
+		return StringUtils.hasText(id) ? id : BeanNames.DB_FACTORY;
 	}
 
 	/* 
@@ -71,7 +70,6 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 		String uri = element.getAttribute("uri");
 		String mongoRef = element.getAttribute("mongo-ref");
 		String dbname = element.getAttribute("dbname");
-
 		BeanDefinition userCredentials = getUserCredentialsBeanDefinition(element, parserContext);
 
 		// Common setup
@@ -94,16 +92,19 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 			dbFactoryBuilder.addConstructorArgValue(registerMongoBeanDefinition(element, parserContext));
 		}
 
-		dbFactoryBuilder.addConstructorArgValue(StringUtils.hasText(dbname) ? dbname : "db");
-		dbFactoryBuilder.addConstructorArgValue(userCredentials);
-		dbFactoryBuilder.addConstructorArgValue(element.getAttribute("authentication-dbname"));
+		dbname = StringUtils.hasText(dbname) ? dbname : "db";
+		dbFactoryBuilder.addConstructorArgValue(dbname);
+
+		if (userCredentials != null) {
+			dbFactoryBuilder.addConstructorArgValue(userCredentials);
+		}
 
 		BeanDefinitionBuilder writeConcernPropertyEditorBuilder = getWriteConcernPropertyEditorBuilder();
 
 		BeanComponentDefinition component = helper.getComponent(writeConcernPropertyEditorBuilder);
 		parserContext.registerBeanComponent(component);
 
-		return (AbstractBeanDefinition) helper.getComponentIdButFallback(dbFactoryBuilder, BeanNames.DB_FACTORY_BEAN_NAME)
+		return (AbstractBeanDefinition) helper.getComponentIdButFallback(dbFactoryBuilder, BeanNames.DB_FACTORY)
 				.getBeanDefinition();
 	}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 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.
@@ -16,6 +16,9 @@
 package org.springframework.data.mongodb.config;
 
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+import org.springframework.data.mongodb.repository.config.MongoRepositoryConfigurationExtension;
+import org.springframework.data.repository.config.RepositoryBeanDefinitionParser;
+import org.springframework.data.repository.config.RepositoryConfigurationExtension;
 
 /**
  * {@link org.springframework.beans.factory.xml.NamespaceHandler} for Mongo DB configuration.
@@ -31,6 +34,10 @@ public class MongoNamespaceHandler extends NamespaceHandlerSupport {
 	 */
 	public void init() {
 
+		RepositoryConfigurationExtension extension = new MongoRepositoryConfigurationExtension();
+		RepositoryBeanDefinitionParser repositoryBeanDefinitionParser = new RepositoryBeanDefinitionParser(extension);
+
+		registerBeanDefinitionParser("repositories", repositoryBeanDefinitionParser);
 		registerBeanDefinitionParser("mapping-converter", new MappingMongoConverterParser());
 		registerBeanDefinitionParser("mongo", new MongoParser());
 		registerBeanDefinitionParser("db-factory", new MongoDbFactoryParser());

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,7 +58,7 @@ public class MongoParser implements BeanDefinitionParser {
 		MongoParsingUtils.parseMongoOptions(element, builder);
 		MongoParsingUtils.parseReplicaSet(element, builder);
 
-		String defaultedId = StringUtils.hasText(id) ? id : BeanNames.MONGO_BEAN_NAME;
+		String defaultedId = StringUtils.hasText(id) ? id : BeanNames.MONGO;
 
 		parserContext.pushContainingComponent(new CompositeComponentDefinition("Mongo", source));
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2013 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,6 @@ import org.w3c.dom.Element;
  * 
  * @author Mark Pollack
  * @author Oliver Gierke
- * @author Thomas Darimont
  */
 abstract class MongoParsingUtils {
 
@@ -80,8 +79,6 @@ abstract class MongoParsingUtils {
 		setPropertyValue(optionsDefBuilder, optionsElement, "write-timeout", "writeTimeout");
 		setPropertyValue(optionsDefBuilder, optionsElement, "write-fsync", "writeFsync");
 		setPropertyValue(optionsDefBuilder, optionsElement, "slave-ok", "slaveOk");
-		setPropertyValue(optionsDefBuilder, optionsElement, "ssl", "ssl");
-		setPropertyReference(optionsDefBuilder, optionsElement, "ssl-socket-factory-ref", "sslSocketFactory");
 
 		mongoBuilder.addPropertyValue("mongoOptions", optionsDefBuilder.getBeanDefinition());
 		return true;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 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.
@@ -35,7 +35,6 @@ import org.w3c.dom.Element;
  * {@link BeanDefinitionParser} to parse {@code template} elements into {@link BeanDefinition}s.
  * 
  * @author Martin Baumgartner
- * @author Oliver Gierke
  */
 class MongoTemplateParser extends AbstractBeanDefinitionParser {
 
@@ -48,7 +47,7 @@ class MongoTemplateParser extends AbstractBeanDefinitionParser {
 			throws BeanDefinitionStoreException {
 
 		String id = super.resolveId(element, definition, parserContext);
-		return StringUtils.hasText(id) ? id : BeanNames.MONGO_TEMPLATE_BEAN_NAME;
+		return StringUtils.hasText(id) ? id : BeanNames.MONGO_TEMPLATE;
 	}
 
 	/*
@@ -69,7 +68,7 @@ class MongoTemplateParser extends AbstractBeanDefinitionParser {
 		if (StringUtils.hasText(dbFactoryRef)) {
 			mongoTemplateBuilder.addConstructorArgReference(dbFactoryRef);
 		} else {
-			mongoTemplateBuilder.addConstructorArgReference(BeanNames.DB_FACTORY_BEAN_NAME);
+			mongoTemplateBuilder.addConstructorArgReference(BeanNames.DB_FACTORY);
 		}
 
 		if (StringUtils.hasText(converterRef)) {
@@ -81,7 +80,7 @@ class MongoTemplateParser extends AbstractBeanDefinitionParser {
 		BeanComponentDefinition component = helper.getComponent(writeConcernPropertyEditorBuilder);
 		parserContext.registerBeanComponent(component);
 
-		return (AbstractBeanDefinition) helper.getComponentIdButFallback(mongoTemplateBuilder,
-				BeanNames.MONGO_TEMPLATE_BEAN_NAME).getBeanDefinition();
+		return (AbstractBeanDefinition) helper.getComponentIdButFallback(mongoTemplateBuilder, BeanNames.MONGO_TEMPLATE)
+				.getBeanDefinition();
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,6 @@ package org.springframework.data.mongodb.core;
 import static org.springframework.data.domain.Sort.Direction.*;
 
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
 
 import org.springframework.dao.DataAccessException;
@@ -38,13 +36,11 @@ import com.mongodb.MongoException;
  * @author Mark Pollack
  * @author Oliver Gierke
  * @author Komi Innocent
- * @author Christoph Strobl
  */
 public class DefaultIndexOperations implements IndexOperations {
 
 	private static final Double ONE = Double.valueOf(1);
 	private static final Double MINUS_ONE = Double.valueOf(-1);
-	private static final Collection<String> TWO_D_IDENTIFIERS = Arrays.asList("2d", "2dsphere");
 
 	private final MongoOperations mongoOperations;
 	private final String collectionName;
@@ -144,15 +140,8 @@ public class DefaultIndexOperations implements IndexOperations {
 
 						Object value = keyDbObject.get(key);
 
-						if (TWO_D_IDENTIFIERS.contains(value)) {
+						if ("2d".equals(value)) {
 							indexFields.add(IndexField.geo(key));
-						} else if ("text".equals(value)) {
-
-							DBObject weights = (DBObject) ix.get("weights");
-							for (String fieldName : weights.keySet()) {
-								indexFields.add(IndexField.text(fieldName, Float.valueOf(weights.get(fieldName).toString())));
-							}
-
 						} else {
 
 							Double keyValue = new Double(value.toString());
@@ -170,8 +159,8 @@ public class DefaultIndexOperations implements IndexOperations {
 					boolean unique = ix.containsField("unique") ? (Boolean) ix.get("unique") : false;
 					boolean dropDuplicates = ix.containsField("dropDups") ? (Boolean) ix.get("dropDups") : false;
 					boolean sparse = ix.containsField("sparse") ? (Boolean) ix.get("sparse") : false;
-					String language = ix.containsField("default_language") ? (String) ix.get("default_language") : "";
-					indexInfoList.add(new IndexInfo(indexFields, name, unique, dropDuplicates, sparse, language));
+
+					indexInfoList.add(new IndexInfo(indexFields, name, unique, dropDuplicates, sparse));
 				}
 
 				return indexInfoList;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2013 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@ import com.mongodb.Mongo;
  * Mongo server administration exposed via JMX annotations
  * 
  * @author Mark Pollack
- * @author Thomas Darimont
  */
 @ManagedResource(description = "Mongo Admin Operations")
 public class MongoAdmin implements MongoAdminOperations {
@@ -35,7 +34,6 @@ public class MongoAdmin implements MongoAdminOperations {
 	private final Mongo mongo;
 	private String username;
 	private String password;
-	private String authenticationDatabaseName;
 
 	public MongoAdmin(Mongo mongo) {
 		Assert.notNull(mongo);
@@ -84,16 +82,7 @@ public class MongoAdmin implements MongoAdminOperations {
 		this.password = password;
 	}
 
-	/**
-	 * Sets the authenticationDatabaseName to use to authenticate with the Mongo database.
-	 * 
-	 * @param authenticationDatabaseName The authenticationDatabaseName to use.
-	 */
-	public void setAuthenticationDatabaseName(String authenticationDatabaseName) {
-		this.authenticationDatabaseName = authenticationDatabaseName;
-	}
-
 	DB getDB(String databaseName) {
-		return MongoDbUtils.getDB(mongo, databaseName, new UserCredentials(username, password), authenticationDatabaseName);
+		return MongoDbUtils.getDB(mongo, databaseName, new UserCredentials(username, password));
 	}
 }

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

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

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

@@ -33,7 +33,6 @@ import com.mongodb.Mongo;
  * @author Graeme Rocher
  * @author Oliver Gierke
  * @author Randy Watler
- * @author Thomas Darimont
  * @since 1.0
  */
 public abstract class MongoDbUtils {
@@ -55,7 +54,7 @@ public abstract class MongoDbUtils {
 	 * @return the {@link DB} connection
 	 */
 	public static DB getDB(Mongo mongo, String databaseName) {
-		return doGetDB(mongo, databaseName, UserCredentials.NO_CREDENTIALS, true, databaseName);
+		return doGetDB(mongo, databaseName, UserCredentials.NO_CREDENTIALS, true);
 	}
 
 	/**
@@ -67,22 +66,15 @@ public abstract class MongoDbUtils {
 	 * @return the {@link DB} connection
 	 */
 	public static DB getDB(Mongo mongo, String databaseName, UserCredentials credentials) {
-		return getDB(mongo, databaseName, credentials, databaseName);
-	}
-
-	public static DB getDB(Mongo mongo, String databaseName, UserCredentials credentials,
-			String authenticationDatabaseName) {
 
 		Assert.notNull(mongo, "No Mongo instance specified!");
 		Assert.hasText(databaseName, "Database name must be given!");
 		Assert.notNull(credentials, "Credentials must not be null, use UserCredentials.NO_CREDENTIALS!");
-		Assert.hasText(authenticationDatabaseName, "Authentication database name must not be null or empty!");
 
-		return doGetDB(mongo, databaseName, credentials, true, authenticationDatabaseName);
+		return doGetDB(mongo, databaseName, credentials, true);
 	}
 
-	private static DB doGetDB(Mongo mongo, String databaseName, UserCredentials credentials, boolean allowCreate,
-			String authenticationDatabaseName) {
+	private static DB doGetDB(Mongo mongo, String databaseName, UserCredentials credentials, boolean allowCreate) {
 
 		DbHolder dbHolder = (DbHolder) TransactionSynchronizationManager.getResource(mongo);
 
@@ -111,16 +103,14 @@ public abstract class MongoDbUtils {
 		DB db = mongo.getDB(databaseName);
 		boolean credentialsGiven = credentials.hasUsername() && credentials.hasPassword();
 
-		DB authDb = databaseName.equals(authenticationDatabaseName) ? db : mongo.getDB(authenticationDatabaseName);
+		synchronized (db) {
 
-		synchronized (authDb) {
-
-			if (credentialsGiven && !authDb.isAuthenticated()) {
+			if (credentialsGiven && !db.isAuthenticated()) {
 
 				String username = credentials.getUsername();
 				String password = credentials.hasPassword() ? credentials.getPassword() : null;
 
-				if (!authDb.authenticate(username, password == null ? null : password.toCharArray())) {
+				if (!db.authenticate(username, password == null ? null : password.toCharArray())) {
 					throw new CannotGetMongoDbConnectionException("Failed to authenticate to database [" + databaseName + "], "
 							+ credentials.toString(), databaseName, credentials);
 				}

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

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

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

@@ -23,15 +23,11 @@ import org.springframework.dao.InvalidDataAccessResourceUsageException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.mongodb.UncategorizedMongoDbException;
 
-import com.mongodb.MongoCursorNotFoundException;
 import com.mongodb.MongoException;
 import com.mongodb.MongoException.CursorNotFound;
 import com.mongodb.MongoException.DuplicateKey;
 import com.mongodb.MongoException.Network;
 import com.mongodb.MongoInternalException;
-import com.mongodb.MongoServerSelectionException;
-import com.mongodb.MongoSocketException;
-import com.mongodb.MongoTimeoutException;
 
 /**
  * Simple {@link PersistenceExceptionTranslator} for Mongo. Convert the given runtime exception to an appropriate
@@ -51,23 +47,16 @@ public class MongoExceptionTranslator implements PersistenceExceptionTranslator
 
 		// Check for well-known MongoException subclasses.
 
-		if (ex instanceof DuplicateKey || ex instanceof DuplicateKeyException) {
+		// All other MongoExceptions
+		if (ex instanceof DuplicateKey) {
 			return new DuplicateKeyException(ex.getMessage(), ex);
 		}
 
-		if (ex instanceof Network || ex instanceof MongoSocketException) {
+		if (ex instanceof Network) {
 			return new DataAccessResourceFailureException(ex.getMessage(), ex);
 		}
 
-		if (ex instanceof CursorNotFound || ex instanceof MongoCursorNotFoundException) {
-			return new DataAccessResourceFailureException(ex.getMessage(), ex);
-		}
-
-		if (ex instanceof MongoServerSelectionException) {
-			return new DataAccessResourceFailureException(ex.getMessage(), ex);
-		}
-
-		if (ex instanceof MongoTimeoutException) {
+		if (ex instanceof CursorNotFound) {
 			return new DataAccessResourceFailureException(ex.getMessage(), ex);
 		}
 
@@ -75,7 +64,6 @@ public class MongoExceptionTranslator implements PersistenceExceptionTranslator
 			return new InvalidDataAccessResourceUsageException(ex.getMessage(), ex);
 		}
 
-		// All other MongoExceptions
 		if (ex instanceof MongoException) {
 
 			int code = ((MongoException) ex).getCode();

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

@@ -1,6 +1,6 @@
 /*
- * Copyright 2011-2014 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.
  * You may obtain a copy of the License at
@@ -19,11 +19,12 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 
-import org.springframework.data.geo.GeoResults;
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
 import org.springframework.data.mongodb.core.aggregation.AggregationResults;
 import org.springframework.data.mongodb.core.aggregation.TypedAggregation;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.data.mongodb.core.geo.GeoResult;
+import org.springframework.data.mongodb.core.geo.GeoResults;
 import org.springframework.data.mongodb.core.mapreduce.GroupBy;
 import org.springframework.data.mongodb.core.mapreduce.GroupByResults;
 import org.springframework.data.mongodb.core.mapreduce.MapReduceOptions;
@@ -49,8 +50,6 @@ import com.mongodb.WriteResult;
  * @author Oliver Gierke
  * @author Tobias Trelle
  * @author Chuong Ngo
- * @author Christoph Strobl
- * @author Thomas Darimont
  */
 public interface MongoOperations {
 
@@ -414,7 +413,7 @@ public interface MongoOperations {
 			MapReduceOptions mapReduceOptions, Class<T> entityClass);
 
 	/**
-	 * Returns {@link GeoResults} for all entities matching the given {@link NearQuery}. Will consider entity mapping
+	 * Returns {@link GeoResult} for all entities matching the given {@link NearQuery}. Will consider entity mapping
 	 * information to determine the collection the query is ran against.
 	 * 
 	 * @param near must not be {@literal null}.
@@ -424,7 +423,7 @@ public interface MongoOperations {
 	<T> GeoResults<T> geoNear(NearQuery near, Class<T> entityClass);
 
 	/**
-	 * Returns {@link GeoResults} for all entities matching the given {@link NearQuery}.
+	 * Returns {@link GeoResult} for all entities matching the given {@link NearQuery}.
 	 * 
 	 * @param near must not be {@literal null}.
 	 * @param entityClass must not be {@literal null}.
@@ -469,32 +468,10 @@ 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);
 
 	/**
@@ -552,58 +529,12 @@ 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);
 
@@ -667,9 +598,9 @@ public interface MongoOperations {
 	 * <p/>
 	 * If you object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
 	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
-	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See <a
-	 * href="http://docs.spring.io/spring/docs/current/spring-framework-reference/html/validation.html#core-convert"
-	 * >Spring's Type Conversion"</a> for more details.
+	 * property type will be handled by Spring's BeanWrapper class that leverages Spring 3.0's new Type Conversion API.
+	 * See <a href="http://static.springsource.org/spring/docs/3.0.x/reference/validation.html#core-convert">Spring 3 Type
+	 * Conversion"</a> for more details.
 	 * <p/>
 	 * <p/>
 	 * Insert is used to initially store the object into the database. To update an existing object use the save method.
@@ -724,9 +655,9 @@ public interface MongoOperations {
 	 * <p/>
 	 * If you object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
 	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
-	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See <a
-	 * href="http://docs.spring.io/spring/docs/current/spring-framework-reference/html/validation.html#core-convert"
-	 * >Spring's Type Conversion"</a> for more details.
+	 * property type will be handled by Spring's BeanWrapper class that leverages Spring 3.0's new Type Conversion API.
+	 * See <a href="http://static.springsource.org/spring/docs/3.0.x/reference/validation.html#core-convert">Spring 3 Type
+	 * Conversion"</a> for more details.
 	 * 
 	 * @param objectToSave the object to store in the collection
 	 */
@@ -741,9 +672,9 @@ public interface MongoOperations {
 	 * <p/>
 	 * If you object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
 	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
-	 * property type will be handled by Spring's BeanWrapper class that leverages Type Cobnversion API. See <a
-	 * http://docs.spring.io/spring/docs/current/spring-framework-reference/html/validation.html#core-convert">Spring's
-	 * Type Conversion"</a> for more details.
+	 * property type will be handled by Spring's BeanWrapper class that leverages Spring 3.0's new Type Cobnversion API.
+	 * See <a href="http://static.springsource.org/spring/docs/3.0.x/reference/validation.html#core-convert">Spring 3 Type
+	 * Conversion"</a> for more details.
 	 * 
 	 * @param objectToSave the object to store in the collection
 	 * @param collectionName name of the collection to store the object in
@@ -864,7 +795,7 @@ public interface MongoOperations {
 	 * 
 	 * @param object
 	 */
-	WriteResult remove(Object object);
+	void remove(Object object);
 
 	/**
 	 * Removes the given object from the given collection.
@@ -872,7 +803,7 @@ public interface MongoOperations {
 	 * @param object
 	 * @param collection must not be {@literal null} or empty.
 	 */
-	WriteResult remove(Object object, String collection);
+	void remove(Object object, String collection);
 
 	/**
 	 * Remove all documents that match the provided query document criteria from the the collection used to store the
@@ -881,17 +812,9 @@ public interface MongoOperations {
 	 * @param query
 	 * @param entityClass
 	 */
-	WriteResult remove(Query query, Class<?> entityClass);
+	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
-	 */
-	WriteResult remove(Query query, Class<?> entityClass, String collectionName);
+	void remove(Query query, Class<?> entityClass, String collectionName);
 
 	/**
 	 * Remove all documents from the specified collection that match the provided query document criteria. There is no
@@ -900,40 +823,7 @@ public interface MongoOperations {
 	 * @param query the query document that specifies the criteria used to remove a record
 	 * @param collectionName name of the collection where the objects will removed
 	 */
-	WriteResult remove(Query query, String collectionName);
-
-	/**
-	 * Returns and removes all documents form the specified collection that match the provided query.
-	 * 
-	 * @param query
-	 * @param collectionName
-	 * @return
-	 * @since 1.5
-	 */
-	<T> List<T> findAllAndRemove(Query query, String collectionName);
-
-	/**
-	 * Returns and removes all documents matching the given query form the collection used to store the entityClass.
-	 * 
-	 * @param query
-	 * @param entityClass
-	 * @return
-	 * @since 1.5
-	 */
-	<T> List<T> findAllAndRemove(Query query, Class<T> entityClass);
-
-	/**
-	 * Returns and removes all documents that match the provided query document criteria from the the collection used to
-	 * store the entityClass. The Class parameter is also used to help convert the Id of the object if it is present in
-	 * the query.
-	 * 
-	 * @param query
-	 * @param entityClass
-	 * @param collectionName
-	 * @return
-	 * @since 1.5
-	 */
-	<T> List<T> findAllAndRemove(Query query, Class<T> entityClass, String collectionName);
+	void remove(Query query, String collectionName);
 
 	/**
 	 * Returns the underlying {@link MongoConverter}.

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

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

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

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

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

@@ -27,7 +27,6 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Scanner;
 import java.util.Set;
 
@@ -47,17 +46,11 @@ import org.springframework.core.io.ResourceLoader;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.dao.OptimisticLockingFailureException;
-import org.springframework.dao.support.PersistenceExceptionTranslator;
-import org.springframework.data.annotation.Id;
 import org.springframework.data.authentication.UserCredentials;
 import org.springframework.data.convert.EntityReader;
-import org.springframework.data.geo.Distance;
-import org.springframework.data.geo.GeoResult;
-import org.springframework.data.geo.GeoResults;
-import org.springframework.data.geo.Metric;
-import org.springframework.data.mapping.PersistentPropertyAccessor;
+import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.mapping.model.ConvertingPropertyAccessor;
+import org.springframework.data.mapping.model.BeanWrapper;
 import org.springframework.data.mapping.model.MappingException;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
@@ -66,13 +59,15 @@ import org.springframework.data.mongodb.core.aggregation.AggregationResults;
 import org.springframework.data.mongodb.core.aggregation.Fields;
 import org.springframework.data.mongodb.core.aggregation.TypeBasedAggregationOperationContext;
 import org.springframework.data.mongodb.core.aggregation.TypedAggregation;
-import org.springframework.data.mongodb.core.convert.DbRefResolver;
-import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoWriter;
 import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.convert.UpdateMapper;
+import org.springframework.data.mongodb.core.geo.Distance;
+import org.springframework.data.mongodb.core.geo.GeoResult;
+import org.springframework.data.mongodb.core.geo.GeoResults;
+import org.springframework.data.mongodb.core.geo.Metric;
 import org.springframework.data.mongodb.core.index.MongoMappingEventPublisher;
 import org.springframework.data.mongodb.core.index.MongoPersistentEntityIndexCreator;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
@@ -97,7 +92,6 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.jca.cci.core.ConnectionCallback;
 import org.springframework.util.Assert;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.ResourceUtils;
 import org.springframework.util.StringUtils;
 
@@ -132,7 +126,6 @@ import com.mongodb.util.JSONParseException;
  * @author Chuong Ngo
  * @author Christoph Strobl
  */
-@SuppressWarnings("deprecation")
 public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(MongoTemplate.class);
@@ -153,7 +146,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	private final MongoConverter mongoConverter;
 	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
 	private final MongoDbFactory mongoDbFactory;
-	private final PersistenceExceptionTranslator exceptionTranslator;
+	private final MongoExceptionTranslator exceptionTranslator = new MongoExceptionTranslator();
 	private final QueryMapper queryMapper;
 	private final UpdateMapper updateMapper;
 
@@ -207,7 +200,6 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		Assert.notNull(mongoDbFactory);
 
 		this.mongoDbFactory = mongoDbFactory;
-		this.exceptionTranslator = mongoDbFactory.getExceptionTranslator();
 		this.mongoConverter = mongoConverter == null ? getDefaultMongoConverter(mongoDbFactory) : mongoConverter;
 		this.queryMapper = new QueryMapper(this.mongoConverter);
 		this.updateMapper = new UpdateMapper(this.mongoConverter);
@@ -356,7 +348,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	}
 
 	public void executeQuery(Query query, String collectionName, DocumentCallbackHandler dch) {
-		executeQuery(query, collectionName, dch, new QueryCursorPreparer(query, null));
+		executeQuery(query, collectionName, dch, new QueryCursorPreparer(query));
 	}
 
 	/**
@@ -379,7 +371,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		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));
 		}
 
@@ -534,7 +526,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		}
 
 		return doFind(collectionName, query.getQueryObject(), query.getFieldsObject(), entityClass,
-				new QueryCursorPreparer(query, entityClass));
+				new QueryCursorPreparer(query));
 	}
 
 	public <T> T findById(Object id, Class<T> entityClass) {
@@ -616,8 +608,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(),
-				getMappedSortObject(query, entityClass), entityClass, update, options);
+		return doFindAndModify(collectionName, query.getQueryObject(), query.getFieldsObject(), query.getSortObject(),
+				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
@@ -628,9 +620,8 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	}
 
 	public <T> T findAndRemove(Query query, Class<T> entityClass, String collectionName) {
-
-		return doFindAndRemove(collectionName, query.getQueryObject(), query.getFieldsObject(),
-				getMappedSortObject(query, entityClass), entityClass);
+		return doFindAndRemove(collectionName, query.getQueryObject(), query.getFieldsObject(), query.getSortObject(),
+				entityClass);
 	}
 
 	public long count(Query query, Class<?> entityClass) {
@@ -746,9 +737,9 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		MongoPersistentEntity<?> mongoPersistentEntity = getPersistentEntity(entity.getClass());
 
 		if (mongoPersistentEntity != null && mongoPersistentEntity.hasVersionProperty()) {
-			ConvertingPropertyAccessor accessor = new ConvertingPropertyAccessor(
-					mongoPersistentEntity.getPropertyAccessor(entity), mongoConverter.getConversionService());
-			accessor.setProperty(mongoPersistentEntity.getVersionProperty(), 0);
+			BeanWrapper<PersistentEntity<Object, ?>, Object> wrapper = BeanWrapper.create(entity,
+					this.mongoConverter.getConversionService());
+			wrapper.setProperty(mongoPersistentEntity.getVersionProperty(), 0);
 		}
 	}
 
@@ -841,14 +832,12 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 
 	private <T> void doSaveVersioned(T objectToSave, MongoPersistentEntity<?> entity, String collectionName) {
 
-		ConvertingPropertyAccessor convertingAccessor = new ConvertingPropertyAccessor(
-				entity.getPropertyAccessor(objectToSave), mongoConverter.getConversionService());
-
+		BeanWrapper<PersistentEntity<T, ?>, T> beanWrapper = BeanWrapper.create(objectToSave,
+				this.mongoConverter.getConversionService());
 		MongoPersistentProperty idProperty = entity.getIdProperty();
 		MongoPersistentProperty versionProperty = entity.getVersionProperty();
 
-		Object version = convertingAccessor.getProperty(versionProperty);
-		Number versionNumber = convertingAccessor.getProperty(versionProperty, Number.class);
+		Number version = beanWrapper.getProperty(versionProperty, Number.class, !versionProperty.usePropertyAccess());
 
 		// Fresh instance -> initialize version property
 		if (version == null) {
@@ -858,11 +847,12 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 			assertUpdateableIdIfNotSet(objectToSave);
 
 			// Create query for entity with the id and old version
-			Object id = convertingAccessor.getProperty(idProperty);
+			Object id = beanWrapper.getProperty(idProperty);
 			Query query = new Query(Criteria.where(idProperty.getName()).is(id).and(versionProperty.getName()).is(version));
 
 			// Bump version number
-			convertingAccessor.setProperty(versionProperty, versionNumber.longValue() + 1);
+			Number number = beanWrapper.getProperty(versionProperty, Number.class, false);
+			beanWrapper.setProperty(versionProperty, number.longValue() + 1);
 
 			BasicDBObject dbObject = new BasicDBObject();
 
@@ -1011,8 +1001,8 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 						update.getUpdateObject(), entity);
 
 				if (LOGGER.isDebugEnabled()) {
-					LOGGER.debug(String.format("Calling update using query: %s and update: %s in collection: %s",
-						serializeToJsonSafely(queryObj), serializeToJsonSafely(updateObj), collectionName));
+					LOGGER.debug("Calling update using query: " + queryObj + " and update: " + updateObj + " in collection: "
+							+ collectionName);
 				}
 
 				MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.UPDATE, collectionName,
@@ -1037,9 +1027,8 @@ 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);
+			if (!dbObjectContainsVersionProperty(update.getUpdateObject(), persistentEntity)) {
+				update.inc(persistentEntity.getVersionProperty().getFieldName(), 1L);
 			}
 		}
 	}
@@ -1053,52 +1042,24 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		return dbObject.containsField(persistentEntity.getVersionProperty().getFieldName());
 	}
 
-	public WriteResult remove(Object object) {
+	public void remove(Object object) {
 
 		if (object == null) {
-			return null;
+			return;
 		}
 
-		return remove(getIdQueryFor(object), object.getClass());
+		remove(getIdQueryFor(object), object.getClass());
 	}
 
-	public WriteResult remove(Object object, String collection) {
+	public void remove(Object object, String collection) {
 
 		Assert.hasText(collection);
 
 		if (object == null) {
-			return null;
+			return;
 		}
 
-		return doRemove(collection, getIdQueryFor(object), object.getClass());
-	}
-
-	/**
-	 * Returns {@link Entry} containing the field name of the id property as {@link Entry#getKey()} and the {@link Id}s
-	 * property value as its {@link Entry#getValue()}.
-	 * 
-	 * @param object
-	 * @return
-	 */
-	private Entry<String, Object> extractIdPropertyAndValue(Object object) {
-
-		Assert.notNull(object, "Id cannot be extracted from 'null'.");
-
-		Class<?> objectType = object.getClass();
-
-		if (object instanceof DBObject) {
-			return Collections.singletonMap(ID_FIELD, ((DBObject) object).get(ID_FIELD)).entrySet().iterator().next();
-		}
-
-		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(objectType);
-		MongoPersistentProperty idProp = entity == null ? null : entity.getIdProperty();
-
-		if (idProp == null || entity == null) {
-			throw new MappingException("No id property found for object of type " + objectType);
-		}
-
-		Object idValue = entity.getPropertyAccessor(object).getProperty(idProp);
-		return Collections.singletonMap(idProp.getFieldName(), idValue).entrySet().iterator().next();
+		doRemove(collection, getIdQueryFor(object), object.getClass());
 	}
 
 	/**
@@ -1109,31 +1070,21 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 */
 	private Query getIdQueryFor(Object object) {
 
-		Entry<String, Object> id = extractIdPropertyAndValue(object);
-		return new Query(where(id.getKey()).is(id.getValue()));
-	}
+		Assert.notNull(object);
 
-	/**
-	 * Returns a {@link Query} for the given entities by their ids.
-	 * 
-	 * @param objects must not be {@literal null} or {@literal empty}.
-	 * @return
-	 */
-	private Query getIdInQueryFor(Collection<?> objects) {
+		Class<?> objectType = object.getClass();
+		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(objectType);
+		MongoPersistentProperty idProp = entity == null ? null : entity.getIdProperty();
 
-		Assert.notEmpty(objects, "Cannot create Query for empty collection.");
-
-		Iterator<?> it = objects.iterator();
-		Entry<String, Object> firstEntry = extractIdPropertyAndValue(it.next());
-
-		ArrayList<Object> ids = new ArrayList<Object>(objects.size());
-		ids.add(firstEntry.getValue());
-
-		while (it.hasNext()) {
-			ids.add(extractIdPropertyAndValue(it.next()).getValue());
+		if (idProp == null) {
+			throw new MappingException("No id property found for object of type " + objectType);
 		}
 
-		return new Query(where(firstEntry.getKey()).in(ids));
+		ConversionService service = mongoConverter.getConversionService();
+		Object idProperty = null;
+
+		idProperty = BeanWrapper.create(object, service).getProperty(idProp, Object.class, true);
+		return new Query(where(idProp.getFieldName()).is(idProperty));
 	}
 
 	private void assertUpdateableIdIfNotSet(Object entity) {
@@ -1141,11 +1092,12 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		MongoPersistentEntity<?> persistentEntity = mappingContext.getPersistentEntity(entity.getClass());
 		MongoPersistentProperty idProperty = persistentEntity == null ? null : persistentEntity.getIdProperty();
 
-		if (idProperty == null || persistentEntity == null) {
+		if (idProperty == null) {
 			return;
 		}
 
-		Object idValue = persistentEntity.getPropertyAccessor(entity).getProperty(idProperty);
+		ConversionService service = mongoConverter.getConversionService();
+		Object idValue = BeanWrapper.create(entity, service).getProperty(idProperty, Object.class, true);
 
 		if (idValue == null && !MongoSimpleTypes.AUTOGENERATED_ID_TYPES.contains(idProperty.getType())) {
 			throw new InvalidDataAccessApiUsageException(String.format(
@@ -1154,19 +1106,19 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		}
 	}
 
-	public WriteResult remove(Query query, String collectionName) {
-		return remove(query, null, collectionName);
+	public void remove(Query query, String collectionName) {
+		remove(query, null, collectionName);
 	}
 
-	public WriteResult remove(Query query, Class<?> entityClass) {
-		return remove(query, entityClass, determineCollectionName(entityClass));
+	public void remove(Query query, Class<?> entityClass) {
+		remove(query, entityClass, determineCollectionName(entityClass));
 	}
 
-	public WriteResult remove(Query query, Class<?> entityClass, String collectionName) {
-		return doRemove(collectionName, query, entityClass);
+	public void remove(Query query, Class<?> entityClass, String collectionName) {
+		doRemove(collectionName, query, entityClass);
 	}
 
-	protected <T> WriteResult doRemove(final String collectionName, final Query query, final Class<T> entityClass) {
+	protected <T> void doRemove(final String collectionName, final Query query, final Class<T> entityClass) {
 
 		if (query == null) {
 			throw new InvalidDataAccessApiUsageException("Query passed in to remove can't be null!");
@@ -1177,8 +1129,8 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		final DBObject queryObject = query.getQueryObject();
 		final MongoPersistentEntity<?> entity = getPersistentEntity(entityClass);
 
-		return execute(collectionName, new CollectionCallback<WriteResult>() {
-			public WriteResult doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+		execute(collectionName, new CollectionCallback<Void>() {
+			public Void doInCollection(DBCollection collection) throws MongoException, DataAccessException {
 
 				maybeEmitEvent(new BeforeDeleteEvent<T>(queryObject, entityClass));
 
@@ -1189,18 +1141,16 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 				WriteConcern writeConcernToUse = prepareWriteConcern(mongoAction);
 
 				if (LOGGER.isDebugEnabled()) {
-					LOGGER.debug("Remove using query: {} in collection: {}.",
-						new Object[] { serializeToJsonSafely(dboq), collection.getName() });
+					LOGGER.debug("Remove using query: {} in collection: {}.", new Object[] { dboq, collection.getName() });
 				}
 
 				WriteResult wr = writeConcernToUse == null ? collection.remove(dboq) : collection.remove(dboq,
 						writeConcernToUse);
-
 				handleAnyWriteResultErrors(wr, dboq, MongoActionOperation.REMOVE);
 
 				maybeEmitEvent(new AfterDeleteEvent<T>(queryObject, entityClass));
 
-				return wr;
+				return null;
 			}
 		});
 	}
@@ -1234,7 +1184,6 @@ 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);
@@ -1259,12 +1208,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));
 		}
 
-		return new MapReduceResults<T>(mappedResults, commandResult);
+		MapReduceResults<T> mapReduceResult = new MapReduceResults<T>(mappedResults, commandResult);
+		return mapReduceResult;
 	}
 
 	public <T> GroupByResults<T> group(String inputCollectionName, GroupBy groupBy, Class<T> entityClass) {
@@ -1318,14 +1267,15 @@ 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
@@ -1356,54 +1306,6 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		return aggregate(aggregation, collectionName, outputType, null);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#findAllAndRemove(org.springframework.data.mongodb.core.query.Query, java.lang.String)
-	 */
-	@Override
-	public <T> List<T> findAllAndRemove(Query query, String collectionName) {
-		return findAndRemove(query, null, collectionName);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#findAllAndRemove(org.springframework.data.mongodb.core.query.Query, java.lang.Class)
-	 */
-	@Override
-	public <T> List<T> findAllAndRemove(Query query, Class<T> entityClass) {
-		return findAllAndRemove(query, entityClass, determineCollectionName(entityClass));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#findAllAndRemove(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
-	 */
-	@Override
-	public <T> List<T> findAllAndRemove(Query query, Class<T> entityClass, String collectionName) {
-		return doFindAndDelete(collectionName, query, entityClass);
-	}
-
-	/**
-	 * Retrieve and remove all documents matching the given {@code query} by calling {@link #find(Query, Class, String)}
-	 * and {@link #remove(Query, Class, String)}, whereas the {@link Query} for {@link #remove(Query, Class, String)} is
-	 * constructed out of the find result.
-	 * 
-	 * @param collectionName
-	 * @param query
-	 * @param entityClass
-	 * @return
-	 */
-	protected <T> List<T> doFindAndDelete(String collectionName, Query query, Class<T> entityClass) {
-
-		List<T> result = find(query, entityClass, collectionName);
-
-		if (!CollectionUtils.isEmpty(result)) {
-			remove(getIdInQueryFor(result), entityClass, collectionName);
-		}
-
-		return result;
-	}
-
 	protected <O> AggregationResults<O> aggregate(Aggregation aggregation, String collectionName, Class<O> outputType,
 			AggregationOperationContext context) {
 
@@ -1421,32 +1323,17 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		CommandResult commandResult = executeCommand(command);
 		handleCommandError(commandResult, command);
 
-		return new AggregationResults<O>(returnPotentiallyMappedResults(outputType, commandResult), commandResult);
-	}
-
-	/**
-	 * Returns the potentially mapped results of the given {@commandResult} contained some.
-	 * 
-	 * @param outputType
-	 * @param commandResult
-	 * @return
-	 */
-	private <O> List<O> returnPotentiallyMappedResults(Class<O> outputType, CommandResult commandResult) {
-
+		// map results
 		@SuppressWarnings("unchecked")
 		Iterable<DBObject> resultSet = (Iterable<DBObject>) commandResult.get("result");
-		if (resultSet == null) {
-			return Collections.emptyList();
-		}
-
+		List<O> mappedResults = new ArrayList<O>();
 		DbObjectCallback<O> callback = new UnwrapAndReadDbObjectCallback<O>(mongoConverter, outputType);
 
-		List<O> mappedResults = new ArrayList<O>();
 		for (DBObject dbObject : resultSet) {
 			mappedResults.add(callback.doWith(dbObject));
 		}
 
-		return mappedResults;
+		return new AggregationResults<O>(mappedResults, commandResult);
 	}
 
 	protected String replaceWithResourceIfNecessary(String function) {
@@ -1478,13 +1365,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", queryMapper.getMappedObject(query.getQueryObject(), null));
+				copyMapReduceOptions.put("query", query.getQueryObject());
 			}
 			if (query.getLimit() > 0) {
 				copyMapReduceOptions.put("limit", query.getLimit());
 			}
 			if (query.getSortObject() != null) {
-				copyMapReduceOptions.put("sort", queryMapper.getMappedObject(query.getSortObject(), null));
+				copyMapReduceOptions.put("sort", query.getSortObject());
 			}
 		}
 		return copyMapReduceOptions;
@@ -1619,13 +1506,12 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 			CursorPreparer preparer, DbObjectCallback<T> objectCallback) {
 
 		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(entityClass);
-
-		DBObject mappedFields = queryMapper.getMappedFields(fields, entity);
+		DBObject mappedFields = fields == null ? null : queryMapper.getMappedObject(fields, entity);
 		DBObject mappedQuery = queryMapper.getMappedObject(query, entity);
 
 		if (LOGGER.isDebugEnabled()) {
 			LOGGER.debug(String.format("find using query: %s fields: %s for class: %s in collection: %s",
-					serializeToJsonSafely(mappedQuery), mappedFields, entityClass, collectionName));
+					serializeToJsonSafely(query), mappedFields, entityClass, collectionName));
 		}
 
 		return executeFindMultiInternal(new FindCallback(mappedQuery, mappedFields), preparer, objectCallback,
@@ -1663,8 +1549,8 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 			Class<T> entityClass) {
 		EntityReader<? super T, DBObject> readerToUse = this.mongoConverter;
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug(String.format("findAndRemove using query: %s fields: %s sort: %s for class: %s in collection: %s",
-				serializeToJsonSafely(query), fields, sort, entityClass, collectionName));
+			LOGGER.debug("findAndRemove using query: " + query + " fields: " + fields + " sort: " + sort + " for class: "
+					+ entityClass + " in collection: " + collectionName);
 		}
 		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(entityClass);
 		return executeFindOneInternal(new FindAndRemoveCallback(queryMapper.getMappedObject(query, entity), fields, sort),
@@ -1682,15 +1568,12 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 
 		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(entityClass);
 
-		increaseVersionForUpdateIfNecessary(entity, update);
-
 		DBObject mappedQuery = queryMapper.getMappedObject(query, entity);
 		DBObject mappedUpdate = updateMapper.getMappedObject(update.getUpdateObject(), entity);
 
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug(String.format("findAndModify using query: %s fields: %s sort: %s for class: %s and update: %s " +
-				"in collection: %s", serializeToJsonSafely(mappedQuery), fields, sort, entityClass,
-				serializeToJsonSafely(mappedUpdate), collectionName));
+			LOGGER.debug("findAndModify using query: " + mappedQuery + " fields: " + fields + " sort: " + sort
+					+ " for class: " + entityClass + " and update: " + mappedUpdate + " in collection: " + collectionName);
 		}
 
 		return executeFindOneInternal(new FindAndModifyCallback(mappedQuery, fields, sort, mappedUpdate, options),
@@ -1722,14 +1605,15 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		}
 
 		ConversionService conversionService = mongoConverter.getConversionService();
-		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(savedObject.getClass());
-		PersistentPropertyAccessor accessor = entity.getPropertyAccessor(savedObject);
+		BeanWrapper<PersistentEntity<Object, ?>, Object> wrapper = BeanWrapper.create(savedObject, conversionService);
 
-		if (accessor.getProperty(idProp) != null) {
+		Object idValue = wrapper.getProperty(idProp, idProp.getType(), true);
+
+		if (idValue != null) {
 			return;
 		}
 
-		new ConvertingPropertyAccessor(accessor, conversionService).setProperty(idProp, id);
+		wrapper.setProperty(idProp, id);
 	}
 
 	private DBCollection getAndPrepareCollection(DB db, String collectionName) {
@@ -1960,22 +1844,11 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	}
 
 	private static final MongoConverter getDefaultMongoConverter(MongoDbFactory factory) {
-
-		DbRefResolver dbRefResolver = new DefaultDbRefResolver(factory);
-		MappingMongoConverter converter = new MappingMongoConverter(dbRefResolver, new MongoMappingContext());
+		MappingMongoConverter converter = new MappingMongoConverter(factory, new MongoMappingContext());
 		converter.afterPropertiesSet();
 		return converter;
 	}
 
-	private DBObject getMappedSortObject(Query query, Class<?> type) {
-
-		if (query == null || query.getSortObject() == null) {
-			return null;
-		}
-
-		return queryMapper.getMappedSort(query.getSortObject(), mappingContext.getPersistentEntity(type));
-	}
-
 	// Callback implementations
 
 	/**
@@ -1998,14 +1871,13 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		public DBObject doInCollection(DBCollection collection) throws MongoException, DataAccessException {
 			if (fields == null) {
 				if (LOGGER.isDebugEnabled()) {
-					LOGGER.debug(String.format("findOne using query: %s in db.collection: %s",
-						serializeToJsonSafely(query), collection.getFullName()));
+					LOGGER.debug("findOne using query: " + query + " in db.collection: " + collection.getFullName());
 				}
 				return collection.findOne(query);
 			} else {
 				if (LOGGER.isDebugEnabled()) {
-					LOGGER.debug(String.format("findOne using query: %s fields: %s in db.collection: %s",
-						serializeToJsonSafely(query), fields, collection.getFullName()));
+					LOGGER.debug("findOne using query: " + query + " fields: " + fields + " in db.collection: "
+							+ collection.getFullName());
 				}
 				return collection.findOne(query, fields);
 			}
@@ -2034,8 +1906,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		}
 
 		public DBCursor doInCollection(DBCollection collection) throws MongoException, DataAccessException {
-
-			if (fields == null || fields.toMap().isEmpty()) {
+			if (fields == null) {
 				return collection.find(query);
 			} else {
 				return collection.find(query, fields);
@@ -2171,12 +2042,9 @@ 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;
 		}
 
 		/*
@@ -2190,11 +2058,11 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 			}
 
 			if (query.getSkip() <= 0 && query.getLimit() <= 0 && query.getSortObject() == null
-					&& !StringUtils.hasText(query.getHint()) && !query.getMeta().hasValues()) {
+					&& !StringUtils.hasText(query.getHint())) {
 				return cursor;
 			}
 
-			DBCursor cursorToUse = cursor.copy();
+			DBCursor cursorToUse = cursor;
 
 			try {
 				if (query.getSkip() > 0) {
@@ -2204,18 +2072,11 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 					cursorToUse = cursorToUse.limit(query.getLimit());
 				}
 				if (query.getSortObject() != null) {
-					DBObject sortDbo = type != null ? getMappedSortObject(query, type) : query.getSortObject();
-					cursorToUse = cursorToUse.sort(sortDbo);
+					cursorToUse = cursorToUse.sort(query.getSortObject());
 				}
 				if (StringUtils.hasText(query.getHint())) {
 					cursorToUse = cursorToUse.hint(query.getHint());
 				}
-				if (query.getMeta().hasValues()) {
-					for (Entry<String, Object> entry : query.getMeta().values()) {
-						cursorToUse = cursorToUse.addSpecial(entry.getKey(), entry.getValue());
-					}
-				}
-
 			} catch (RuntimeException e) {
 				throw potentiallyConvertRuntimeException(e);
 			}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2013 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,11 +19,9 @@ import java.net.UnknownHostException;
 
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.dao.DataAccessException;
-import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.authentication.UserCredentials;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
 
 import com.mongodb.DB;
 import com.mongodb.Mongo;
@@ -36,7 +34,6 @@ import com.mongodb.WriteConcern;
  * 
  * @author Mark Pollack
  * @author Oliver Gierke
- * @author Thomas Darimont
  */
 public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 
@@ -44,9 +41,6 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	private final String databaseName;
 	private final boolean mongoInstanceCreated;
 	private final UserCredentials credentials;
-	private final PersistenceExceptionTranslator exceptionTranslator;
-	private final String authenticationDatabaseName;
-
 	private WriteConcern writeConcern;
 
 	/**
@@ -56,7 +50,7 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	 * @param databaseName database name, not be {@literal null} or empty.
 	 */
 	public SimpleMongoDbFactory(Mongo mongo, String databaseName) {
-		this(mongo, databaseName, null);
+		this(mongo, databaseName, UserCredentials.NO_CREDENTIALS, false);
 	}
 
 	/**
@@ -67,20 +61,7 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	 * @param credentials username and password.
 	 */
 	public SimpleMongoDbFactory(Mongo mongo, String databaseName, UserCredentials credentials) {
-		this(mongo, databaseName, credentials, false, null);
-	}
-
-	/**
-	 * Create an instance of SimpleMongoDbFactory given the Mongo instance, database name, and username/password
-	 * 
-	 * @param mongo Mongo instance, must not be {@literal null}.
-	 * @param databaseName Database name, must not be {@literal null} or empty.
-	 * @param credentials username and password.
-	 * @param authenticationDatabaseName the database name to use for authentication
-	 */
-	public SimpleMongoDbFactory(Mongo mongo, String databaseName, UserCredentials credentials,
-			String authenticationDatabaseName) {
-		this(mongo, databaseName, credentials, false, authenticationDatabaseName);
+		this(mongo, databaseName, credentials, false);
 	}
 
 	/**
@@ -91,14 +72,12 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	 * @throws UnknownHostException
 	 * @see MongoURI
 	 */
-	@SuppressWarnings("deprecation")
 	public SimpleMongoDbFactory(MongoURI uri) throws MongoException, UnknownHostException {
-		this(new Mongo(uri), uri.getDatabase(), new UserCredentials(uri.getUsername(), parseChars(uri.getPassword())),
-				true, uri.getDatabase());
+		this(new Mongo(uri), uri.getDatabase(), new UserCredentials(uri.getUsername(), parseChars(uri.getPassword())), true);
 	}
 
 	private SimpleMongoDbFactory(Mongo mongo, String databaseName, UserCredentials credentials,
-			boolean mongoInstanceCreated, String authenticationDatabaseName) {
+			boolean mongoInstanceCreated) {
 
 		Assert.notNull(mongo, "Mongo must not be null");
 		Assert.hasText(databaseName, "Database name must not be empty");
@@ -109,12 +88,6 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 		this.databaseName = databaseName;
 		this.mongoInstanceCreated = mongoInstanceCreated;
 		this.credentials = credentials == null ? UserCredentials.NO_CREDENTIALS : credentials;
-		this.exceptionTranslator = new MongoExceptionTranslator();
-		this.authenticationDatabaseName = StringUtils.hasText(authenticationDatabaseName) ? authenticationDatabaseName
-				: databaseName;
-
-		Assert.isTrue(this.authenticationDatabaseName.matches("[\\w-]+"),
-				"Authentication database name must only contain letters, numbers, underscores and dashes!");
 	}
 
 	/**
@@ -142,7 +115,7 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 
 		Assert.hasText(dbName, "Database name must not be empty.");
 
-		DB db = MongoDbUtils.getDB(mongo, dbName, credentials, authenticationDatabaseName);
+		DB db = MongoDbUtils.getDB(mongo, dbName, credentials);
 
 		if (writeConcern != null) {
 			db.setWriteConcern(writeConcern);
@@ -165,13 +138,4 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	private static String parseChars(char[] chars) {
 		return chars == null ? null : String.valueOf(chars);
 	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.MongoDbFactory#getExceptionTranslator()
-	 */
-	@Override
-	public PersistenceExceptionTranslator getExceptionTranslator() {
-		return this.exceptionTranslator;
-	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 the original author or authors.
+ * 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.
@@ -44,23 +44,9 @@ import com.mongodb.DBObject;
  */
 public class Aggregation {
 
-	/**
-	 * References the root document, i.e. the top-level document, currently being processed in the aggregation pipeline
-	 * stage.
-	 */
-	public static final String ROOT = SystemVariable.ROOT.toString();
-
-	/**
-	 * References the start of the field path being processed in the aggregation pipeline stage. Unless documented
-	 * otherwise, all stages start with CURRENT the same as ROOT.
-	 */
-	public static final String CURRENT = SystemVariable.CURRENT.toString();
-
 	public static final AggregationOperationContext DEFAULT_CONTEXT = new NoOpAggregationOperationContext();
-	public static final AggregationOptions DEFAULT_OPTIONS = newAggregationOptions().build();
 
-	protected final List<AggregationOperation> operations;
-	private final AggregationOptions options;
+	private final List<AggregationOperation> operations;
 
 	/**
 	 * Creates a new {@link Aggregation} from the given {@link AggregationOperation}s.
@@ -80,20 +66,6 @@ public class Aggregation {
 		return new Aggregation(operations);
 	}
 
-	/**
-	 * Returns a copy of this {@link Aggregation} with the given {@link AggregationOptions} set. Note that options are
-	 * supported in MongoDB version 2.6+.
-	 * 
-	 * @param options must not be {@literal null}.
-	 * @return
-	 * @since 1.6
-	 */
-	public Aggregation withOptions(AggregationOptions options) {
-
-		Assert.notNull(options, "AggregationOptions must not be null.");
-		return new Aggregation(this.operations, options);
-	}
-
 	/**
 	 * Creates a new {@link TypedAggregation} for the given type and {@link AggregationOperation}s.
 	 * 
@@ -120,43 +92,11 @@ public class Aggregation {
 	 * @param aggregationOperations must not be {@literal null} or empty.
 	 */
 	protected Aggregation(AggregationOperation... aggregationOperations) {
-		this(asAggregationList(aggregationOperations));
-	}
-
-	/**
-	 * @param aggregationOperations must not be {@literal null} or empty.
-	 * @return
-	 */
-	protected static List<AggregationOperation> asAggregationList(AggregationOperation... aggregationOperations) {
-
-		Assert.notEmpty(aggregationOperations, "AggregationOperations must not be null or empty!");
-
-		return Arrays.asList(aggregationOperations);
-	}
-
-	/**
-	 * Creates a new {@link Aggregation} from the given {@link AggregationOperation}s.
-	 * 
-	 * @param aggregationOperations must not be {@literal null} or empty.
-	 */
-	protected Aggregation(List<AggregationOperation> aggregationOperations) {
-		this(aggregationOperations, DEFAULT_OPTIONS);
-	}
-
-	/**
-	 * Creates a new {@link Aggregation} from the given {@link AggregationOperation}s.
-	 * 
-	 * @param aggregationOperations must not be {@literal null} or empty.
-	 * @param options must not be {@literal null} or empty.
-	 */
-	protected Aggregation(List<AggregationOperation> aggregationOperations, AggregationOptions options) {
 
 		Assert.notNull(aggregationOperations, "AggregationOperations must not be null!");
-		Assert.isTrue(aggregationOperations.size() > 0, "At least one AggregationOperation has to be provided");
-		Assert.notNull(options, "AggregationOptions must not be null!");
+		Assert.isTrue(aggregationOperations.length > 0, "At least one AggregationOperation has to be provided");
 
-		this.operations = aggregationOperations;
-		this.options = options;
+		this.operations = Arrays.asList(aggregationOperations);
 	}
 
 	/**
@@ -291,16 +231,6 @@ public class Aggregation {
 		return Fields.from(field(name, target));
 	}
 
-	/**
-	 * Returns a new {@link AggregationOptions.Builder}.
-	 * 
-	 * @return
-	 * @since 1.6
-	 */
-	public static AggregationOptions.Builder newAggregationOptions() {
-		return new AggregationOptions.Builder();
-	}
-
 	/**
 	 * Converts this {@link Aggregation} specification to a {@link DBObject}.
 	 * 
@@ -318,15 +248,13 @@ public class Aggregation {
 
 			if (operation instanceof FieldsExposingAggregationOperation) {
 				FieldsExposingAggregationOperation exposedFieldsOperation = (FieldsExposingAggregationOperation) operation;
-				context = new ExposedFieldsAggregationOperationContext(exposedFieldsOperation.getFields(), rootContext);
+				context = new ExposedFieldsAggregationOperationContext(exposedFieldsOperation.getFields());
 			}
 		}
 
 		DBObject command = new BasicDBObject("aggregate", inputCollectionName);
 		command.put("pipeline", operationDocuments);
 
-		command = options.applyAndReturnPotentiallyChangedCommand(command);
-
 		return command;
 	}
 
@@ -374,51 +302,4 @@ public class Aggregation {
 			return new FieldReference(new ExposedField(new AggregationField(name), true));
 		}
 	}
-
-	/**
-	 * Describes the system variables available in MongoDB aggregation framework pipeline expressions.
-	 * 
-	 * @author Thomas Darimont
-	 * @see http://docs.mongodb.org/manual/reference/aggregation-variables
-	 */
-	enum SystemVariable {
-
-		ROOT, CURRENT;
-
-		private static final String PREFIX = "$$";
-
-		/**
-		 * Return {@literal true} if the given {@code fieldRef} denotes a well-known system variable, {@literal false}
-		 * otherwise.
-		 * 
-		 * @param fieldRef may be {@literal null}.
-		 * @return
-		 */
-		public static boolean isReferingToSystemVariable(String fieldRef) {
-
-			if (fieldRef == null || !fieldRef.startsWith(PREFIX) || fieldRef.length() <= 2) {
-				return false;
-			}
-
-			int indexOfFirstDot = fieldRef.indexOf('.');
-			String candidate = fieldRef.substring(2, indexOfFirstDot == -1 ? fieldRef.length() : indexOfFirstDot);
-
-			for (SystemVariable value : values()) {
-				if (value.name().equals(candidate)) {
-					return true;
-				}
-			}
-
-			return false;
-		}
-
-		/* 
-		 * (non-Javadoc)
-		 * @see java.lang.Enum#toString()
-		 */
-		@Override
-		public String toString() {
-			return PREFIX.concat(name());
-		}
-	}
 }

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 the original author or authors.
+ * 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.
@@ -28,7 +28,6 @@ import com.mongodb.DBObject;
  * 
  * @author Tobias Trelle
  * @author Oliver Gierke
- * @author Thomas Darimont
  * @param <T> The class in which the results are mapped onto.
  * @since 1.3
  */
@@ -91,16 +90,6 @@ public class AggregationResults<T> implements Iterable<T> {
 		return serverUsed;
 	}
 
-	/**
-	 * Returns the raw result that was returned by the server.
-	 * 
-	 * @return
-	 * @since 1.6
-	 */
-	public DBObject getRawResults() {
-		return rawResults;
-	}
-
 	private String parseServerUsed() {
 
 		Object object = rawResults.get("serverUsed");

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 the original author or authors.
+ * 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.
@@ -32,7 +32,7 @@ import org.springframework.util.CompositeIterator;
  * @author Thomas Darimont
  * @since 1.3
  */
-public final class ExposedFields implements Iterable<ExposedField> {
+public class ExposedFields implements Iterable<ExposedField> {
 
 	private static final List<ExposedField> NO_FIELDS = Collections.emptyList();
 	private static final ExposedFields EMPTY = new ExposedFields(NO_FIELDS, NO_FIELDS);
@@ -268,21 +268,14 @@ public final 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 name
+		 * @param input
 		 * @return
 		 */
-		public boolean canBeReferredToBy(String name) {
-			return getName().equals(name) || getTarget().equals(name);
+		public boolean canBeReferredToBy(String input) {
+			return getTarget().equals(input);
 		}
 
 		/*
@@ -347,7 +340,6 @@ public final class ExposedFields implements Iterable<ExposedField> {
 		public FieldReference(ExposedField field) {
 
 			Assert.notNull(field, "ExposedField must not be null!");
-
 			this.field = field;
 		}
 
@@ -357,7 +349,6 @@ public final class ExposedFields implements Iterable<ExposedField> {
 		 * @return
 		 */
 		public String getRaw() {
-
 			String target = field.getTarget();
 			return field.synthetic ? target : String.format("%s.%s", Fields.UNDERSCORE_ID, target);
 		}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 the original author or authors.
+ * 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.
@@ -32,22 +32,16 @@ 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}. Uses the given
-	 * {@link AggregationOperationContext} to perform a mapping to mongo types if necessary.
+	 * Creates a new {@link ExposedFieldsAggregationOperationContext} from the given {@link ExposedFields}.
 	 * 
 	 * @param exposedFields must not be {@literal null}.
-	 * @param rootContext must not be {@literal null}.
 	 */
-	public ExposedFieldsAggregationOperationContext(ExposedFields exposedFields, AggregationOperationContext rootContext) {
+	public ExposedFieldsAggregationOperationContext(ExposedFields exposedFields) {
 
 		Assert.notNull(exposedFields, "ExposedFields must not be null!");
-		Assert.notNull(rootContext, "RootContext must not be null!");
-
 		this.exposedFields = exposedFields;
-		this.rootContext = rootContext;
 	}
 
 	/* 
@@ -56,7 +50,7 @@ class ExposedFieldsAggregationOperationContext implements AggregationOperationCo
 	 */
 	@Override
 	public DBObject getMappedObject(DBObject dbObject) {
-		return rootContext.getMappedObject(dbObject);
+		return dbObject;
 	}
 
 	/* 
@@ -65,7 +59,7 @@ class ExposedFieldsAggregationOperationContext implements AggregationOperationCo
 	 */
 	@Override
 	public FieldReference getReference(Field field) {
-		return getReference(field, field.getTarget());
+		return getReference(field.getTarget());
 	}
 
 	/* 
@@ -74,42 +68,11 @@ class ExposedFieldsAggregationOperationContext implements AggregationOperationCo
 	 */
 	@Override
 	public FieldReference getReference(String name) {
-		return getReference(null, 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) {
+		ExposedField field = exposedFields.getField(name);
 
-		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));
-			}
+		if (field != null) {
+			return new FieldReference(field);
 		}
 
 		throw new IllegalArgumentException(String.format("Invalid reference '%s'!", name));

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 the original author or authors.
+ * 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.
@@ -30,16 +30,15 @@ import org.springframework.util.StringUtils;
  * Value object to capture a list of {@link Field} instances.
  * 
  * @author Oliver Gierke
- * @author Thomas Darimont
  * @since 1.3
  */
-public final class Fields implements Iterable<Field> {
+public class Fields implements Iterable<Field> {
 
 	private static final String AMBIGUOUS_EXCEPTION = "Found two fields both using '%s' as name: %s and %s! Please "
 			+ "customize your field definitions to get to unique field names!";
 
-	public static final String UNDERSCORE_ID = "_id";
-	public static final String UNDERSCORE_ID_REF = "$_id";
+	public static String UNDERSCORE_ID = "_id";
+	public static String UNDERSCORE_ID_REF = "$_id";
 
 	private final List<Field> fields;
 
@@ -187,7 +186,7 @@ public final class Fields implements Iterable<Field> {
 		private final String target;
 
 		/**
-		 * Creates an aggregation field with the given name. As no target is set explicitly, the name will be used as target
+		 * Creates an aggregation fieldwith the given name. As no target is set explicitly, the name will be used as target
 		 * as well.
 		 * 
 		 * @param key
@@ -198,34 +197,17 @@ public final class Fields implements Iterable<Field> {
 
 		public AggregationField(String name, String target) {
 
-			String nameToSet = cleanUp(name);
-			String targetToSet = cleanUp(target);
-
-			Assert.hasText(nameToSet, "AggregationField name must not be null or empty!");
+			Assert.hasText(name, "AggregationField name must not be null or empty!");
 
 			if (target == null && name.contains(".")) {
-				this.name = nameToSet.substring(nameToSet.indexOf('.') + 1);
-				this.target = nameToSet;
+				this.name = name.substring(name.indexOf(".") + 1);
+				this.target = name;
 			} else {
-				this.name = nameToSet;
-				this.target = targetToSet;
+				this.name = name;
+				this.target = target;
 			}
 		}
 
-		private static final String cleanUp(String source) {
-
-			if (source == null) {
-				return source;
-			}
-
-			if (Aggregation.SystemVariable.isReferingToSystemVariable(source)) {
-				return source;
-			}
-
-			int dollarIndex = source.lastIndexOf('$');
-			return dollarIndex == -1 ? source : source.substring(dollarIndex + 1);
-		}
-
 		/*
 		 * (non-Javadoc)
 		 * @see org.springframework.data.mongodb.core.aggregation.Field#getKey()

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 the original author or authors.
+ * 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.
@@ -99,7 +99,7 @@ public class GroupOperation implements FieldsExposingAggregationOperation {
 	 * 
 	 * @author Thomas Darimont
 	 */
-	public static final class GroupOperationBuilder {
+	public class GroupOperationBuilder {
 
 		private final GroupOperation groupOperation;
 		private final Operation operation;
@@ -364,16 +364,7 @@ public class GroupOperation implements FieldsExposingAggregationOperation {
 		}
 
 		public Object getValue(AggregationOperationContext context) {
-
-			if (reference == null) {
-				return value;
-			}
-
-			if (Aggregation.SystemVariable.isReferingToSystemVariable(reference)) {
-				return reference;
-			}
-
-			return context.getReference(reference).toString();
+			return reference == null ? value : context.getReference(reference).toString();
 		}
 
 		@Override

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 the original author or authors.
+ * 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.
@@ -28,7 +28,7 @@ import com.mongodb.DBObject;
  * @author Oliver Gierke
  * @since 1.3
  */
-public class LimitOperation implements AggregationOperation {
+class LimitOperation implements AggregationOperation {
 
 	private final long maxElements;
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 the original author or authors.
+ * 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.
@@ -15,7 +15,7 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import org.springframework.data.mongodb.core.query.CriteriaDefinition;
+import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.util.Assert;
 
 import com.mongodb.BasicDBObject;
@@ -32,17 +32,17 @@ import com.mongodb.DBObject;
  */
 public class MatchOperation implements AggregationOperation {
 
-	private final CriteriaDefinition criteriaDefinition;
+	private final Criteria criteria;
 
 	/**
-	 * Creates a new {@link MatchOperation} for the given {@link CriteriaDefinition}.
+	 * Creates a new {@link MatchOperation} for the given {@link Criteria}.
 	 * 
-	 * @param criteriaDefinition must not be {@literal null}.
+	 * @param criteria must not be {@literal null}.
 	 */
-	public MatchOperation(CriteriaDefinition criteriaDefinition) {
+	public MatchOperation(Criteria criteria) {
 
-		Assert.notNull(criteriaDefinition, "Criteria must not be null!");
-		this.criteriaDefinition = criteriaDefinition;
+		Assert.notNull(criteria, "Criteria must not be null!");
+		this.criteria = criteria;
 	}
 
 	/* 
@@ -51,6 +51,6 @@ public class MatchOperation implements AggregationOperation {
 	 */
 	@Override
 	public DBObject toDBObject(AggregationOperationContext context) {
-		return new BasicDBObject("$match", context.getMappedObject(criteriaDefinition.getCriteriaObject()));
+		return new BasicDBObject("$match", context.getMappedObject(criteria.getCriteriaObject()));
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 the original author or authors.
+ * 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.
@@ -24,6 +24,7 @@ import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedFi
 import org.springframework.data.mongodb.core.aggregation.ProjectionOperation.ProjectionOperationBuilder.FieldProjection;
 import org.springframework.util.Assert;
 
+import com.mongodb.BasicDBList;
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
 
@@ -114,10 +115,6 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		return new ProjectionOperationBuilder(name, this, null);
 	}
 
-	public ExpressionProjectionOperationBuilder andExpression(String expression, Object... params) {
-		return new ExpressionProjectionOperationBuilder(expression, this, params);
-	}
-
 	/**
 	 * Excludes the given fields from the projection.
 	 * 
@@ -190,166 +187,16 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		return new BasicDBObject("$project", fieldObject);
 	}
 
-	/**
-	 * Base class for {@link ProjectionOperationBuilder}s.
-	 * 
-	 * @author Thomas Darimont
-	 */
-	private static abstract class AbstractProjectionOperationBuilder implements AggregationOperation {
-
-		protected final Object value;
-		protected final ProjectionOperation operation;
-
-		/**
-		 * Creates a new {@link AbstractProjectionOperationBuilder} fot the given value and {@link ProjectionOperation}.
-		 * 
-		 * @param value must not be {@literal null}.
-		 * @param operation must not be {@literal null}.
-		 */
-		public AbstractProjectionOperationBuilder(Object value, ProjectionOperation operation) {
-
-			Assert.notNull(value, "value must not be null or empty!");
-			Assert.notNull(operation, "ProjectionOperation must not be null!");
-
-			this.value = value;
-			this.operation = operation;
-		}
-
-		/* 
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
-		@Override
-		public DBObject toDBObject(AggregationOperationContext context) {
-			return this.operation.toDBObject(context);
-		}
-
-		/**
-		 * Returns the finally to be applied {@link ProjectionOperation} with the given alias.
-		 * 
-		 * @param alias will never be {@literal null} or empty.
-		 * @return
-		 */
-		public abstract ProjectionOperation as(String alias);
-	}
-
-	/**
-	 * An {@link ProjectionOperationBuilder} that is used for SpEL expression based projections.
-	 * 
-	 * @author Thomas Darimont
-	 */
-	public static class ExpressionProjectionOperationBuilder extends ProjectionOperationBuilder {
-
-		private final Object[] params;
-		private final String expression;
-
-		/**
-		 * Creates a new {@link ExpressionProjectionOperationBuilder} for the given value, {@link ProjectionOperation} and
-		 * parameters.
-		 * 
-		 * @param expression must not be {@literal null}.
-		 * @param operation must not be {@literal null}.
-		 * @param parameters
-		 */
-		public ExpressionProjectionOperationBuilder(String expression, ProjectionOperation operation, Object[] parameters) {
-
-			super(expression, operation, null);
-			this.expression = expression;
-			this.params = parameters.clone();
-		}
-
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.ProjectionOperationBuilder#project(java.lang.String, java.lang.Object[])
-		 */
-		@Override
-		public ProjectionOperationBuilder project(String operation, final Object... values) {
-
-			OperationProjection operationProjection = new OperationProjection(Fields.field(value.toString()), operation,
-					values) {
-				@Override
-				protected List<Object> getOperationArguments(AggregationOperationContext context) {
-
-					List<Object> result = new ArrayList<Object>(values.length + 1);
-					result.add(ExpressionProjection.toMongoExpression(context,
-							ExpressionProjectionOperationBuilder.this.expression, ExpressionProjectionOperationBuilder.this.params));
-					result.addAll(Arrays.asList(values));
-
-					return result;
-				}
-			};
-
-			return new ProjectionOperationBuilder(value, this.operation.and(operationProjection), operationProjection);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.AbstractProjectionOperationBuilder#as(java.lang.String)
-		 */
-		@Override
-		public ProjectionOperation as(String alias) {
-
-			Field expressionField = Fields.field(alias, alias);
-			return this.operation.and(new ExpressionProjection(expressionField, this.value.toString(), params));
-		}
-
-		/**
-		 * A {@link Projection} based on a SpEL expression.
-		 * 
-		 * @author Thomas Darimont
-		 * @author Oliver Gierke
-		 */
-		static class ExpressionProjection extends Projection {
-
-			private static final SpelExpressionTransformer TRANSFORMER = new SpelExpressionTransformer();
-
-			private final String expression;
-			private final Object[] params;
-
-			/**
-			 * Creates a new {@link ExpressionProjection} for the given field, SpEL expression and parameters.
-			 * 
-			 * @param field must not be {@literal null}.
-			 * @param expression must not be {@literal null} or empty.
-			 * @param parameters must not be {@literal null}.
-			 */
-			public ExpressionProjection(Field field, String expression, Object[] parameters) {
-
-				super(field);
-
-				Assert.hasText(expression, "Expression must not be null!");
-				Assert.notNull(parameters, "Parameters must not be null!");
-
-				this.expression = expression;
-				this.params = parameters.clone();
-			}
-
-			/* 
-			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-			 */
-			@Override
-			public DBObject toDBObject(AggregationOperationContext context) {
-				return new BasicDBObject(getExposedField().getName(), toMongoExpression(context, expression, params));
-			}
-
-			protected static Object toMongoExpression(AggregationOperationContext context, String expression, Object[] params) {
-				return TRANSFORMER.transform(expression, context, params);
-			}
-		}
-	}
-
 	/**
 	 * Builder for {@link ProjectionOperation}s on a field.
 	 * 
 	 * @author Oliver Gierke
 	 * @author Thomas Darimont
 	 */
-	public static class ProjectionOperationBuilder extends AbstractProjectionOperationBuilder {
-
-		private 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!";
+	public static class ProjectionOperationBuilder implements AggregationOperation {
 
 		private final String name;
+		private final ProjectionOperation operation;
 		private final OperationProjection previousProjection;
 
 		/**
@@ -361,26 +208,12 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		 * @param previousProjection the previous operation projection, may be {@literal null}.
 		 */
 		public ProjectionOperationBuilder(String name, ProjectionOperation operation, OperationProjection previousProjection) {
-			super(name, operation);
+
+			Assert.hasText(name, "Field name must not be null or empty!");
+			Assert.notNull(operation, "ProjectionOperation must not be null!");
 
 			this.name = name;
-			this.previousProjection = previousProjection;
-		}
-
-		/**
-		 * Creates a new {@link ProjectionOperationBuilder} for the field with the given value on top of the given
-		 * {@link ProjectionOperation}.
-		 * 
-		 * @param value
-		 * @param operation
-		 * @param previousProjection
-		 */
-		protected ProjectionOperationBuilder(Object value, ProjectionOperation operation,
-				OperationProjection previousProjection) {
-
-			super(value, operation);
-
-			this.name = null;
+			this.operation = operation;
 			this.previousProjection = previousProjection;
 		}
 
@@ -412,11 +245,10 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		 * @param string
 		 * @return
 		 */
-		@Override
 		public ProjectionOperation as(String alias) {
 
-			if (this.previousProjection != null) {
-				return this.operation.andReplaceLastOneWith(this.previousProjection.withAlias(alias));
+			if (previousProjection != null) {
+				return this.operation.andReplaceLastOneWith(previousProjection.withAlias(alias));
 			} else {
 				return this.operation.and(new FieldProjection(Fields.field(alias, name), null));
 			}
@@ -430,7 +262,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		 */
 		public ProjectionOperationBuilder plus(Number number) {
 
-			Assert.notNull(number, NUMBER_NOT_NULL);
+			Assert.notNull(number, "Number must not be null!");
 			return project("add", number);
 		}
 
@@ -467,7 +299,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		 */
 		public ProjectionOperationBuilder minus(String fieldReference) {
 
-			Assert.notNull(fieldReference, FIELD_REFERENCE_NOT_NULL);
+			Assert.notNull(fieldReference, "Field reference must not be null!");
 			return project("subtract", Fields.field(fieldReference));
 		}
 
@@ -479,7 +311,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		 */
 		public ProjectionOperationBuilder multiply(Number number) {
 
-			Assert.notNull(number, NUMBER_NOT_NULL);
+			Assert.notNull(number, "Number must not be null!");
 			return project("multiply", number);
 		}
 
@@ -492,7 +324,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		 */
 		public ProjectionOperationBuilder multiply(String fieldReference) {
 
-			Assert.notNull(fieldReference, FIELD_REFERENCE_NOT_NULL);
+			Assert.notNull(fieldReference, "Field reference must not be null!");
 			return project("multiply", Fields.field(fieldReference));
 		}
 
@@ -504,7 +336,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		 */
 		public ProjectionOperationBuilder divide(Number number) {
 
-			Assert.notNull(number, FIELD_REFERENCE_NOT_NULL);
+			Assert.notNull(number, "Number must not be null!");
 			Assert.isTrue(Math.abs(number.intValue()) != 0, "Number must not be zero!");
 			return project("divide", number);
 		}
@@ -518,7 +350,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		 */
 		public ProjectionOperationBuilder divide(String fieldReference) {
 
-			Assert.notNull(fieldReference, FIELD_REFERENCE_NOT_NULL);
+			Assert.notNull(fieldReference, "Field reference must not be null!");
 			return project("divide", Fields.field(fieldReference));
 		}
 
@@ -531,7 +363,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		 */
 		public ProjectionOperationBuilder mod(Number number) {
 
-			Assert.notNull(number, NUMBER_NOT_NULL);
+			Assert.notNull(number, "Number must not be null!");
 			Assert.isTrue(Math.abs(number.intValue()) != 0, "Number must not be zero!");
 			return project("mod", number);
 		}
@@ -545,7 +377,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		 */
 		public ProjectionOperationBuilder mod(String fieldReference) {
 
-			Assert.notNull(fieldReference, FIELD_REFERENCE_NOT_NULL);
+			Assert.notNull(fieldReference, "Field reference must not be null!");
 			return project("mod", Fields.field(fieldReference));
 		}
 
@@ -566,9 +398,8 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		 * @return
 		 */
 		public ProjectionOperationBuilder project(String operation, Object... values) {
-			OperationProjection operationProjection = new OperationProjection(Fields.field(value.toString()), operation,
-					values);
-			return new ProjectionOperationBuilder(value, this.operation.and(operationProjection), operationProjection);
+			OperationProjection projectionOperation = new OperationProjection(Fields.field(name), operation, values);
+			return new ProjectionOperationBuilder(name, this.operation.and(projectionOperation), projectionOperation);
 		}
 
 		/**
@@ -673,10 +504,6 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 				// implicit reference or explicit include?
 				if (value == null || Boolean.TRUE.equals(value)) {
 
-					if (Aggregation.SystemVariable.isReferingToSystemVariable(field.getTarget())) {
-						return field.getTarget();
-					}
-
 					// check whether referenced field exists in the context
 					return context.getReference(field).getReferenceValue();
 
@@ -699,7 +526,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 			/**
 			 * Creates a new {@link OperationProjection} for the given field.
 			 * 
-			 * @param field the name of the field to add the operation projection for, must not be {@literal null} or empty.
+			 * @param name the name of the field to add the operation projection for, must not be {@literal null} or empty.
 			 * @param operation the actual operation key, must not be {@literal null} or empty.
 			 * @param values the values to pass into the operation, must not be {@literal null}.
 			 */
@@ -722,15 +549,18 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 			@Override
 			public DBObject toDBObject(AggregationOperationContext context) {
 
-				DBObject inner = new BasicDBObject("$" + operation, getOperationArguments(context));
+				BasicDBList values = new BasicDBList();
+				values.addAll(buildReferences(context));
 
-				return new BasicDBObject(getField().getName(), inner);
+				DBObject inner = new BasicDBObject("$" + operation, values);
+
+				return new BasicDBObject(this.field.getName(), inner);
 			}
 
-			protected List<Object> getOperationArguments(AggregationOperationContext context) {
+			private List<Object> buildReferences(AggregationOperationContext context) {
 
 				List<Object> result = new ArrayList<Object>(values.size());
-				result.add(context.getReference(getField().getName()).toString());
+				result.add(context.getReference(field.getTarget()).toString());
 
 				for (Object element : values) {
 					result.add(element instanceof Field ? context.getReference((Field) element).toString() : element);
@@ -739,15 +569,6 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 				return result;
 			}
 
-			/**
-			 * Returns the field that holds the {@link OperationProjection}.
-			 * 
-			 * @return
-			 */
-			protected Field getField() {
-				return field;
-			}
-
 			/**
 			 * Creates a new instance of this {@link OperationProjection} with the given alias.
 			 * 
@@ -755,27 +576,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 			 * @return
 			 */
 			public OperationProjection withAlias(String alias) {
-
-				final Field aliasedField = Fields.field(alias, this.field.getName());
-				return new OperationProjection(aliasedField, operation, values.toArray()) {
-
-					/* (non-Javadoc)
-					 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.ProjectionOperationBuilder.OperationProjection#getField()
-					 */
-					@Override
-					protected Field getField() {
-						return aliasedField;
-					}
-
-					@Override
-					protected List<Object> getOperationArguments(AggregationOperationContext context) {
-
-						// We have to make sure that we use the arguments from the "previous" OperationProjection that we replace
-						// with this new instance.
-
-						return OperationProjection.this.getOperationArguments(context);
-					}
-				};
+				return new OperationProjection(Fields.field(alias, this.field.getName()), operation, values.toArray());
 			}
 		}
 
@@ -807,96 +608,6 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 				return new BasicDBObject(name, nestedObject);
 			}
 		}
-
-		/**
-		 * Extracts the minute from a date expression.
-		 * 
-		 * @return
-		 */
-		public ProjectionOperationBuilder extractMinute() {
-			return project("minute");
-		}
-
-		/**
-		 * Extracts the hour from a date expression.
-		 * 
-		 * @return
-		 */
-		public ProjectionOperationBuilder extractHour() {
-			return project("hour");
-		}
-
-		/**
-		 * Extracts the second from a date expression.
-		 * 
-		 * @return
-		 */
-		public ProjectionOperationBuilder extractSecond() {
-			return project("second");
-		}
-
-		/**
-		 * Extracts the millisecond from a date expression.
-		 * 
-		 * @return
-		 */
-		public ProjectionOperationBuilder extractMillisecond() {
-			return project("millisecond");
-		}
-
-		/**
-		 * Extracts the year from a date expression.
-		 * 
-		 * @return
-		 */
-		public ProjectionOperationBuilder extractYear() {
-			return project("year");
-		}
-
-		/**
-		 * Extracts the month from a date expression.
-		 * 
-		 * @return
-		 */
-		public ProjectionOperationBuilder extractMonth() {
-			return project("month");
-		}
-
-		/**
-		 * Extracts the week from a date expression.
-		 * 
-		 * @return
-		 */
-		public ProjectionOperationBuilder extractWeek() {
-			return project("week");
-		}
-
-		/**
-		 * Extracts the dayOfYear from a date expression.
-		 * 
-		 * @return
-		 */
-		public ProjectionOperationBuilder extractDayOfYear() {
-			return project("dayOfYear");
-		}
-
-		/**
-		 * Extracts the dayOfMonth from a date expression.
-		 * 
-		 * @return
-		 */
-		public ProjectionOperationBuilder extractDayOfMonth() {
-			return project("dayOfMonth");
-		}
-
-		/**
-		 * Extracts the dayOfWeek from a date expression.
-		 * 
-		 * @return
-		 */
-		public ProjectionOperationBuilder extractDayOfWeek() {
-			return project("dayOfWeek");
-		}
 	}
 
 	/**
@@ -937,4 +648,5 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		 */
 		public abstract DBObject toDBObject(AggregationOperationContext context);
 	}
+
 }

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

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

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

@@ -93,8 +93,9 @@ public class TypeBasedAggregationOperationContext implements AggregationOperatio
 
 	private FieldReference getReferenceFor(Field field) {
 
-		PersistentPropertyPath<MongoPersistentProperty> propertyPath = mappingContext.getPersistentPropertyPath(
-				field.getTarget(), type);
+		PropertyPath path = PropertyPath.from(field.getTarget(), type);
+
+		PersistentPropertyPath<MongoPersistentProperty> propertyPath = mappingContext.getPersistentPropertyPath(path);
 		Field mappedField = field(propertyPath.getLeafProperty().getName(),
 				propertyPath.toDotPath(MongoPersistentProperty.PropertyToFieldNameConverter.INSTANCE));
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 the original author or authors.
+ * 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.
@@ -15,8 +15,6 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import java.util.List;
-
 import org.springframework.util.Assert;
 
 /**
@@ -32,34 +30,11 @@ public class TypedAggregation<I> extends Aggregation {
 	/**
 	 * Creates a new {@link TypedAggregation} from the given {@link AggregationOperation}s.
 	 * 
-	 * @param inputType must not be {@literal null}.
 	 * @param operations must not be {@literal null} or empty.
 	 */
 	public TypedAggregation(Class<I> inputType, AggregationOperation... operations) {
-		this(inputType, asAggregationList(operations));
-	}
 
-	/**
-	 * Creates a new {@link TypedAggregation} from the given {@link AggregationOperation}s.
-	 * 
-	 * @param inputType must not be {@literal null}.
-	 * @param operations must not be {@literal null} or empty.
-	 */
-	public TypedAggregation(Class<I> inputType, List<AggregationOperation> operations) {
-		this(inputType, operations, DEFAULT_OPTIONS);
-	}
-
-	/**
-	 * Creates a new {@link TypedAggregation} from the given {@link AggregationOperation}s and the given
-	 * {@link AggregationOptions}.
-	 * 
-	 * @param inputType must not be {@literal null}.
-	 * @param operations must not be {@literal null} or empty.
-	 * @param options must not be {@literal null}.
-	 */
-	public TypedAggregation(Class<I> inputType, List<AggregationOperation> operations, AggregationOptions options) {
-
-		super(operations, options);
+		super(operations);
 
 		Assert.notNull(inputType, "Input type must not be null!");
 		this.inputType = inputType;
@@ -73,14 +48,4 @@ public class TypedAggregation<I> extends Aggregation {
 	public Class<I> getInputType() {
 		return inputType;
 	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.Aggregation#withOptions(org.springframework.data.mongodb.core.aggregation.AggregationOptions)
-	 */
-	public TypedAggregation<I> withOptions(AggregationOptions options) {
-
-		Assert.notNull(options, "AggregationOptions must not be null.");
-		return new TypedAggregation<I>(inputType, operations, options);
-	}
 }

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

@@ -17,7 +17,6 @@ package org.springframework.data.mongodb.core.convert;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -36,7 +35,6 @@ import org.springframework.core.convert.converter.GenericConverter;
 import org.springframework.core.convert.converter.GenericConverter.ConvertiblePair;
 import org.springframework.core.convert.support.GenericConversionService;
 import org.springframework.data.convert.JodaTimeConverters;
-import org.springframework.data.convert.Jsr310Converters;
 import org.springframework.data.convert.ReadingConverter;
 import org.springframework.data.convert.WritingConverter;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
@@ -46,7 +44,6 @@ import org.springframework.data.mongodb.core.convert.MongoConverters.DBObjectToS
 import org.springframework.data.mongodb.core.convert.MongoConverters.StringToBigDecimalConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverters.StringToBigIntegerConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverters.StringToURLConverter;
-import org.springframework.data.mongodb.core.convert.MongoConverters.TermToStringConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverters.URLToStringConverter;
 import org.springframework.data.mongodb.core.mapping.MongoSimpleTypes;
 import org.springframework.util.Assert;
@@ -60,7 +57,6 @@ import org.springframework.util.Assert;
  * 
  * @author Oliver Gierke
  * @author Thomas Darimont
- * @author Christoph Strobl
  */
 public class CustomConversions {
 
@@ -97,31 +93,22 @@ public class CustomConversions {
 		this.customSimpleTypes = new HashSet<Class<?>>();
 		this.customReadTargetTypes = new ConcurrentHashMap<GenericConverter.ConvertiblePair, CacheValue>();
 
-		List<Object> toRegister = new ArrayList<Object>();
+		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());
 
-		// Add user provided converters to make sure they can override the defaults
-		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.add(TermToStringConverter.INSTANCE);
-
-		toRegister.addAll(JodaTimeConverters.getConvertersToRegister());
-		toRegister.addAll(GeoConverters.getConvertersToRegister());
-		toRegister.addAll(Jsr310Converters.getConvertersToRegister());
-
-		for (Object c : toRegister) {
+		for (Object c : this.converters) {
 			registerConversion(c);
 		}
 
-		Collections.reverse(toRegister);
-
-		this.converters = Collections.unmodifiableList(toRegister);
 		this.simpleTypeHolder = new SimpleTypeHolder(customSimpleTypes, MongoSimpleTypes.HOLDER);
 	}
 

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

@@ -1,123 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.convert;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.util.Assert;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-
-/**
- * Wrapper value object for a {@link BasicDBObject} to be able to access raw values by {@link MongoPersistentProperty}
- * references. The accessors will transparently resolve nested document values that a {@link MongoPersistentProperty}
- * might refer to through a path expression in field names.
- * 
- * @author Oliver Gierke
- */
-class DBObjectAccessor {
-
-	private final DBObject dbObject;
-
-	/**
-	 * Creates a new {@link DBObjectAccessor} for the given {@link DBObject}.
-	 * 
-	 * @param dbObject must be a {@link BasicDBObject} effectively, must not be {@literal null}.
-	 */
-	public DBObjectAccessor(DBObject dbObject) {
-
-		Assert.notNull(dbObject, "DBObject must not be null!");
-		Assert.isInstanceOf(BasicDBObject.class, dbObject, "Given DBObject must be a BasicDBObject!");
-
-		this.dbObject = dbObject;
-	}
-
-	/**
-	 * Puts the given value into the backing {@link DBObject} based on the coordinates defined through the given
-	 * {@link MongoPersistentProperty}. By default this will be the plain field name. But field names might also consist
-	 * of path traversals so we might need to create intermediate {@link BasicDBObject}s.
-	 * 
-	 * @param prop must not be {@literal null}.
-	 * @param value
-	 */
-	public void put(MongoPersistentProperty prop, Object value) {
-
-		Assert.notNull(prop, "MongoPersistentProperty must not be null!");
-		String fieldName = prop.getFieldName();
-
-		Iterator<String> parts = Arrays.asList(fieldName.split("\\.")).iterator();
-		DBObject dbObject = this.dbObject;
-
-		while (parts.hasNext()) {
-
-			String part = parts.next();
-
-			if (parts.hasNext()) {
-				BasicDBObject nestedDbObject = new BasicDBObject();
-				dbObject.put(part, nestedDbObject);
-				dbObject = nestedDbObject;
-			} else {
-				dbObject.put(part, value);
-			}
-		}
-	}
-
-	/**
-	 * Returns the value the given {@link MongoPersistentProperty} refers to. By default this will be a direct field but
-	 * the method will also transparently resolve nested values the {@link MongoPersistentProperty} might refer to through
-	 * a path expression in the field name metadata.
-	 * 
-	 * @param property must not be {@literal null}.
-	 * @return
-	 */
-	@SuppressWarnings("unchecked")
-	public Object get(MongoPersistentProperty property) {
-
-		String fieldName = property.getFieldName();
-		Iterator<String> parts = Arrays.asList(fieldName.split("\\.")).iterator();
-		Map<Object, Object> source = this.dbObject.toMap();
-		Object result = null;
-
-		while (source != null && parts.hasNext()) {
-
-			result = source.get(parts.next());
-
-			if (parts.hasNext()) {
-				source = getAsMap(result);
-			}
-		}
-
-		return result;
-	}
-
-	@SuppressWarnings("unchecked")
-	private Map<Object, Object> getAsMap(Object source) {
-
-		if (source instanceof BasicDBObject) {
-			return ((DBObject) source).toMap();
-		}
-
-		if (source instanceof Map) {
-			return (Map<Object, Object>) source;
-		}
-
-		return null;
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,30 +31,18 @@ import com.mongodb.DBObject;
  */
 class DBObjectPropertyAccessor extends MapAccessor {
 
-	static final MapAccessor INSTANCE = new DBObjectPropertyAccessor();
+	static 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) {
@@ -64,4 +52,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/DbRefProxyHandler.java

@@ -1,28 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.convert;
-
-import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-
-import com.mongodb.DBRef;
-
-/**
- * @author Oliver Gierke
- */
-public interface DbRefProxyHandler {
-
-	Object populateId(MongoPersistentProperty property, DBRef source, Object proxy);
-}

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

@@ -1,56 +0,0 @@
-/*
- * Copyright 2013-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.convert;
-
-import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-
-import com.mongodb.DBRef;
-
-/**
- * Used to resolve associations annotated with {@link org.springframework.data.mongodb.core.mapping.DBRef}.
- * 
- * @author Thomas Darimont
- * @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, DBRef dbref, DbRefResolverCallback callback,
-			DbRefProxyHandler proxyHandler);
-
-	/**
-	 * Creates a {@link DBRef} instance for the given {@link org.springframework.data.mongodb.core.mapping.DBRef}
-	 * annotation, {@link MongoPersistentEntity} and id.
-	 * 
-	 * @param annotation will never be {@literal null}.
-	 * @param entity will never be {@literal null}.
-	 * @param id will never be {@literal null}.
-	 * @return
-	 */
-	DBRef createDbRef(org.springframework.data.mongodb.core.mapping.DBRef annotation, MongoPersistentEntity<?> entity,
-			Object id);
-}

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

@@ -1,79 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.convert;
-
-import org.springframework.data.mapping.PersistentPropertyAccessor;
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.mapping.model.DefaultSpELExpressionEvaluator;
-import org.springframework.data.mapping.model.SpELContext;
-import org.springframework.data.mapping.model.SpELExpressionEvaluator;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-import com.mongodb.DBRef;
-
-/**
- * @author Oliver Gierke
- */
-class DefaultDbRefProxyHandler implements DbRefProxyHandler {
-
-	private final SpELContext spELContext;
-	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
-	private final ValueResolver resolver;
-
-	/**
-	 * @param spELContext must not be {@literal null}.
-	 * @param conversionService must not be {@literal null}.
-	 * @param mappingContext must not be {@literal null}.
-	 */
-	public DefaultDbRefProxyHandler(SpELContext spELContext,
-			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext, ValueResolver resolver) {
-
-		this.spELContext = spELContext;
-		this.mappingContext = mappingContext;
-		this.resolver = resolver;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.DbRefProxyHandler#populateId(com.mongodb.DBRef, java.lang.Object)
-	 */
-	@Override
-	public Object populateId(MongoPersistentProperty property, DBRef source, Object proxy) {
-
-		if (source == null) {
-			return proxy;
-		}
-
-		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(property);
-		MongoPersistentProperty idProperty = entity.getIdProperty();
-
-		if (idProperty.usePropertyAccess()) {
-			return proxy;
-		}
-
-		SpELExpressionEvaluator evaluator = new DefaultSpELExpressionEvaluator(proxy, spELContext);
-		PersistentPropertyAccessor accessor = entity.getPropertyAccessor(proxy);
-
-		DBObject object = new BasicDBObject(idProperty.getFieldName(), source.getId());
-		ObjectPath objectPath = ObjectPath.ROOT.push(proxy, entity, null);
-		accessor.setProperty(idProperty, resolver.getValueInternal(idProperty, object, evaluator, objectPath));
-
-		return proxy;
-	}
-}

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

@@ -1,392 +0,0 @@
-/*
- * Copyright 2013-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.convert;
-
-import static org.springframework.util.ReflectionUtils.*;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.lang.reflect.Method;
-
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.cglib.proxy.Callback;
-import org.springframework.cglib.proxy.Enhancer;
-import org.springframework.cglib.proxy.Factory;
-import org.springframework.cglib.proxy.MethodProxy;
-import org.springframework.dao.DataAccessException;
-import org.springframework.dao.support.PersistenceExceptionTranslator;
-import org.springframework.data.mongodb.LazyLoadingException;
-import org.springframework.data.mongodb.MongoDbFactory;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.objenesis.ObjenesisStd;
-import org.springframework.util.Assert;
-import org.springframework.util.ReflectionUtils;
-import org.springframework.util.StringUtils;
-
-import com.mongodb.DB;
-import com.mongodb.DBRef;
-
-/**
- * A {@link DbRefResolver} that resolves {@link org.springframework.data.mongodb.core.mapping.DBRef}s by delegating to a
- * {@link DbRefResolverCallback} than is able to generate lazy loading proxies.
- * 
- * @author Thomas Darimont
- * @author Oliver Gierke
- * @since 1.4
- */
-public class DefaultDbRefResolver implements DbRefResolver {
-
-	private final MongoDbFactory mongoDbFactory;
-	private final PersistenceExceptionTranslator exceptionTranslator;
-	private final ObjenesisStd objenesis;
-
-	/**
-	 * Creates a new {@link DefaultDbRefResolver} with the given {@link MongoDbFactory}.
-	 * 
-	 * @param mongoDbFactory must not be {@literal null}.
-	 */
-	public DefaultDbRefResolver(MongoDbFactory mongoDbFactory) {
-
-		Assert.notNull(mongoDbFactory, "MongoDbFactory translator must not be null!");
-
-		this.mongoDbFactory = mongoDbFactory;
-		this.exceptionTranslator = mongoDbFactory.getExceptionTranslator();
-		this.objenesis = new ObjenesisStd(true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.DbRefResolver#resolveDbRef(org.springframework.data.mongodb.core.mapping.MongoPersistentProperty, org.springframework.data.mongodb.core.convert.DbRefResolverCallback)
-	 */
-	@Override
-	public Object resolveDbRef(MongoPersistentProperty property, DBRef dbref, DbRefResolverCallback callback,
-			DbRefProxyHandler handler) {
-
-		Assert.notNull(property, "Property must not be null!");
-		Assert.notNull(callback, "Callback must not be null!");
-
-		if (isLazyDbRef(property)) {
-			return createLazyLoadingProxy(property, dbref, callback, handler);
-		}
-
-		return callback.resolve(property);
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.DbRefResolver#created(org.springframework.data.mongodb.core.mapping.MongoPersistentProperty, org.springframework.data.mongodb.core.mapping.MongoPersistentEntity, java.lang.Object)
-	 */
-	@Override
-	public DBRef createDbRef(org.springframework.data.mongodb.core.mapping.DBRef annotation,
-			MongoPersistentEntity<?> entity, Object id) {
-
-		DB db = mongoDbFactory.getDb();
-		db = annotation != null && StringUtils.hasText(annotation.db()) ? mongoDbFactory.getDb(annotation.db()) : db;
-
-		return new DBRef(db, entity.getCollection(), id);
-	}
-
-	/**
-	 * Creates a proxy for the given {@link MongoPersistentProperty} using the given {@link DbRefResolverCallback} to
-	 * eventually resolve the value of the property.
-	 * 
-	 * @param property must not be {@literal null}.
-	 * @param dbref can be {@literal null}.
-	 * @param callback must not be {@literal null}.
-	 * @return
-	 */
-	private Object createLazyLoadingProxy(MongoPersistentProperty property, DBRef dbref, DbRefResolverCallback callback,
-			DbRefProxyHandler handler) {
-
-		Class<?> propertyType = property.getType();
-		LazyLoadingInterceptor interceptor = new LazyLoadingInterceptor(property, dbref, exceptionTranslator, callback);
-
-		if (!propertyType.isInterface()) {
-
-			Factory factory = (Factory) objenesis.newInstance(getEnhancedTypeFor(propertyType));
-			factory.setCallbacks(new Callback[] { interceptor });
-
-			return handler.populateId(property, dbref, factory);
-		}
-
-		ProxyFactory proxyFactory = new ProxyFactory();
-
-		for (Class<?> type : propertyType.getInterfaces()) {
-			proxyFactory.addInterface(type);
-		}
-
-		proxyFactory.addInterface(LazyLoadingProxy.class);
-		proxyFactory.addInterface(propertyType);
-		proxyFactory.addAdvice(interceptor);
-
-		return handler.populateId(property, dbref, proxyFactory.getProxy());
-	}
-
-	/**
-	 * Returns the CGLib enhanced type for the given source type.
-	 * 
-	 * @param type
-	 * @return
-	 */
-	private Class<?> getEnhancedTypeFor(Class<?> type) {
-
-		Enhancer enhancer = new Enhancer();
-		enhancer.setSuperclass(type);
-		enhancer.setCallbackType(org.springframework.cglib.proxy.MethodInterceptor.class);
-		enhancer.setInterfaces(new Class[] { LazyLoadingProxy.class });
-
-		return enhancer.createClass();
-	}
-
-	/**
-	 * Returns whether the property shall be resolved lazily.
-	 * 
-	 * @param property must not be {@literal null}.
-	 * @return
-	 */
-	private boolean isLazyDbRef(MongoPersistentProperty property) {
-		return property.getDBRef() != null && property.getDBRef().lazy();
-	}
-
-	/**
-	 * A {@link MethodInterceptor} that is used within a lazy loading proxy. The property resolving is delegated to a
-	 * {@link DbRefResolverCallback}. The resolving process is triggered by a method invocation on the proxy and is
-	 * guaranteed to be performed only once.
-	 * 
-	 * @author Thomas Darimont
-	 * @author Oliver Gierke
-	 * @author Christoph Strobl
-	 */
-	static class LazyLoadingInterceptor implements MethodInterceptor, org.springframework.cglib.proxy.MethodInterceptor,
-			Serializable {
-
-		private static final Method INITIALIZE_METHOD, TO_DBREF_METHOD, FINALIZE_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("getTarget");
-				TO_DBREF_METHOD = LazyLoadingProxy.class.getMethod("toDBRef");
-				FINALIZE_METHOD = Object.class.getDeclaredMethod("finalize");
-			} 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, 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;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation)
-		 */
-		@Override
-		public Object invoke(MethodInvocation invocation) throws Throwable {
-			return intercept(invocation.getThis(), invocation.getMethod(), invocation.getArguments(), null);
-		}
-
-		/* 
-		 * (non-Javadoc)
-		 * @see org.springframework.cglib.proxy.MethodInterceptor#intercept(java.lang.Object, java.lang.reflect.Method, java.lang.Object[], org.springframework.cglib.proxy.MethodProxy)
-		 */
-		@Override
-		public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable {
-
-			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);
-				}
-
-				// DATAMONGO-1076 - finalize methods should not trigger proxy initialization
-				if (FINALIZE_METHOD.equals(method)) {
-					return null;
-				}
-			}
-
-			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) {
-				this.result = resolve();
-				this.resolved = true;
-			}
-
-			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;
-				this.result = in.readObject();
-			} catch (ClassNotFoundException e) {
-				throw new LazyLoadingException("Could not deserialize result", e);
-			}
-		}
-
-		/**
-		 * Resolves the proxy into its backing object.
-		 * 
-		 * @return
-		 */
-		private synchronized Object resolve() {
-
-			if (!resolved) {
-
-				try {
-
-					return callback.resolve(property);
-
-				} catch (RuntimeException ex) {
-
-					DataAccessException translatedException = this.exceptionTranslator.translateExceptionIfPossible(ex);
-					throw new LazyLoadingException("Unable to lazily resolve DBRef!", translatedException);
-				}
-			}
-
-			return result;
-		}
-	}
-}

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

@@ -1,61 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.convert;
-
-import org.springframework.data.mapping.model.SpELExpressionEvaluator;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-
-import com.mongodb.DBObject;
-
-/**
- * Default implementation of {@link DbRefResolverCallback}.
- * 
- * @author Oliver Gierke
- */
-class DefaultDbRefResolverCallback implements DbRefResolverCallback {
-
-	private final DBObject surroundingObject;
-	private final ObjectPath path;
-	private final ValueResolver resolver;
-	private final SpELExpressionEvaluator evaluator;
-
-	/**
-	 * Creates a new {@link DefaultDbRefResolverCallback} using the given {@link DBObject}, {@link ObjectPath},
-	 * {@link ValueResolver} and {@link SpELExpressionEvaluator}.
-	 * 
-	 * @param surroundingObject must not be {@literal null}.
-	 * @param path must not be {@literal null}.
-	 * @param evaluator must not be {@literal null}.
-	 * @param resolver must not be {@literal null}.
-	 */
-	public DefaultDbRefResolverCallback(DBObject surroundingObject, ObjectPath path, SpELExpressionEvaluator evaluator,
-			ValueResolver resolver) {
-
-		this.surroundingObject = surroundingObject;
-		this.path = path;
-		this.resolver = resolver;
-		this.evaluator = evaluator;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.DbRefResolverCallback#resolve(org.springframework.data.mongodb.core.mapping.MongoPersistentProperty)
-	 */
-	@Override
-	public Object resolve(MongoPersistentProperty property) {
-		return resolver.getValueInternal(property, surroundingObject, evaluator, path);
-	}
-}

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

@@ -1,448 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.convert;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.data.convert.ReadingConverter;
-import org.springframework.data.convert.WritingConverter;
-import org.springframework.data.geo.Box;
-import org.springframework.data.geo.Circle;
-import org.springframework.data.geo.Distance;
-import org.springframework.data.geo.Metrics;
-import org.springframework.data.geo.Point;
-import org.springframework.data.geo.Polygon;
-import org.springframework.data.geo.Shape;
-import org.springframework.data.mongodb.core.geo.Sphere;
-import org.springframework.data.mongodb.core.query.GeoCommand;
-import org.springframework.util.Assert;
-
-import com.mongodb.BasicDBList;
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-
-/**
- * Wrapper class to contain useful geo structure converters for the usage with Mongo.
- * 
- * @author Thomas Darimont
- * @author Oliver Gierke
- * @since 1.5
- */
-abstract class GeoConverters {
-
-	/**
-	 * Private constructor to prevent instantiation.
-	 */
-	private GeoConverters() {}
-
-	/**
-	 * Returns the geo converters to be registered.
-	 * 
-	 * @return
-	 */
-	public static Collection<? extends Object> getConvertersToRegister() {
-		return Arrays.asList( //
-				BoxToDbObjectConverter.INSTANCE //
-				, PolygonToDbObjectConverter.INSTANCE //
-				, CircleToDbObjectConverter.INSTANCE //
-				, SphereToDbObjectConverter.INSTANCE //
-				, DbObjectToBoxConverter.INSTANCE //
-				, DbObjectToPolygonConverter.INSTANCE //
-				, DbObjectToCircleConverter.INSTANCE //
-				, DbObjectToSphereConverter.INSTANCE //
-				, DbObjectToPointConverter.INSTANCE //
-				, PointToDbObjectConverter.INSTANCE //
-				, GeoCommandToDbObjectConverter.INSTANCE);
-	}
-
-	/**
-	 * Converts a {@link List} of {@link Double}s into a {@link Point}.
-	 * 
-	 * @author Thomas Darimont
-	 * @since 1.5
-	 */
-	@ReadingConverter
-	public static enum DbObjectToPointConverter implements Converter<DBObject, Point> {
-
-		INSTANCE;
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
-		@Override
-		public Point convert(DBObject source) {
-
-			Assert.isTrue(source.keySet().size() == 2, "Source must contain 2 elements");
-
-			return source == null ? null : new Point((Double) source.get("x"), (Double) source.get("y"));
-		}
-	}
-
-	/**
-	 * Converts a {@link Point} into a {@link List} of {@link Double}s.
-	 * 
-	 * @author Thomas Darimont
-	 * @since 1.5
-	 */
-	public static enum PointToDbObjectConverter implements Converter<Point, DBObject> {
-
-		INSTANCE;
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
-		@Override
-		public DBObject convert(Point source) {
-			return source == null ? null : new BasicDBObject("x", source.getX()).append("y", source.getY());
-		}
-	}
-
-	/**
-	 * Converts a {@link Box} into a {@link BasicDBList}.
-	 * 
-	 * @author Thomas Darimont
-	 * @since 1.5
-	 */
-	@WritingConverter
-	public static enum BoxToDbObjectConverter implements Converter<Box, DBObject> {
-
-		INSTANCE;
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
-		@Override
-		public DBObject convert(Box source) {
-
-			if (source == null) {
-				return null;
-			}
-
-			BasicDBObject result = new BasicDBObject();
-			result.put("first", PointToDbObjectConverter.INSTANCE.convert(source.getFirst()));
-			result.put("second", PointToDbObjectConverter.INSTANCE.convert(source.getSecond()));
-			return result;
-		}
-	}
-
-	/**
-	 * Converts a {@link BasicDBList} into a {@link Box}.
-	 * 
-	 * @author Thomas Darimont
-	 * @since 1.5
-	 */
-	@ReadingConverter
-	public static enum DbObjectToBoxConverter implements Converter<DBObject, Box> {
-
-		INSTANCE;
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
-		@Override
-		public Box convert(DBObject source) {
-
-			if (source == null) {
-				return null;
-			}
-
-			Point first = DbObjectToPointConverter.INSTANCE.convert((DBObject) source.get("first"));
-			Point second = DbObjectToPointConverter.INSTANCE.convert((DBObject) source.get("second"));
-
-			return new Box(first, second);
-		}
-	}
-
-	/**
-	 * Converts a {@link Circle} into a {@link BasicDBList}.
-	 * 
-	 * @author Thomas Darimont
-	 * @since 1.5
-	 */
-	public static enum CircleToDbObjectConverter implements Converter<Circle, DBObject> {
-
-		INSTANCE;
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
-		@Override
-		public DBObject convert(Circle source) {
-
-			if (source == null) {
-				return null;
-			}
-
-			DBObject result = new BasicDBObject();
-			result.put("center", PointToDbObjectConverter.INSTANCE.convert(source.getCenter()));
-			result.put("radius", source.getRadius().getNormalizedValue());
-			result.put("metric", source.getRadius().getMetric().toString());
-			return result;
-		}
-	}
-
-	/**
-	 * Converts a {@link DBObject} into a {@link Circle}.
-	 * 
-	 * @author Thomas Darimont
-	 * @since 1.5
-	 */
-	@ReadingConverter
-	public static enum DbObjectToCircleConverter implements Converter<DBObject, Circle> {
-
-		INSTANCE;
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
-		@Override
-		public Circle convert(DBObject source) {
-
-			if (source == null) {
-				return null;
-			}
-
-			DBObject center = (DBObject) source.get("center");
-			Double radius = (Double) source.get("radius");
-
-			Distance distance = new Distance(radius);
-
-			if (source.containsField("metric")) {
-
-				String metricString = (String) source.get("metric");
-				Assert.notNull(metricString, "Metric must not be null!");
-
-				distance = distance.in(Metrics.valueOf(metricString));
-			}
-
-			Assert.notNull(center, "Center must not be null!");
-			Assert.notNull(radius, "Radius must not be null!");
-
-			return new Circle(DbObjectToPointConverter.INSTANCE.convert(center), distance);
-		}
-	}
-
-	/**
-	 * Converts a {@link Sphere} into a {@link BasicDBList}.
-	 * 
-	 * @author Thomas Darimont
-	 * @since 1.5
-	 */
-	public static enum SphereToDbObjectConverter implements Converter<Sphere, DBObject> {
-
-		INSTANCE;
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
-		@Override
-		public DBObject convert(Sphere source) {
-
-			if (source == null) {
-				return null;
-			}
-
-			DBObject result = new BasicDBObject();
-			result.put("center", PointToDbObjectConverter.INSTANCE.convert(source.getCenter()));
-			result.put("radius", source.getRadius().getNormalizedValue());
-			result.put("metric", source.getRadius().getMetric().toString());
-			return result;
-		}
-	}
-
-	/**
-	 * Converts a {@link BasicDBList} into a {@link Sphere}.
-	 * 
-	 * @author Thomas Darimont
-	 * @since 1.5
-	 */
-	@ReadingConverter
-	public static enum DbObjectToSphereConverter implements Converter<DBObject, Sphere> {
-
-		INSTANCE;
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
-		@Override
-		public Sphere convert(DBObject source) {
-
-			if (source == null) {
-				return null;
-			}
-
-			DBObject center = (DBObject) source.get("center");
-			Double radius = (Double) source.get("radius");
-
-			Distance distance = new Distance(radius);
-
-			if (source.containsField("metric")) {
-
-				String metricString = (String) source.get("metric");
-				Assert.notNull(metricString, "Metric must not be null!");
-
-				distance = distance.in(Metrics.valueOf(metricString));
-			}
-
-			Assert.notNull(center, "Center must not be null!");
-			Assert.notNull(radius, "Radius must not be null!");
-
-			return new Sphere(DbObjectToPointConverter.INSTANCE.convert(center), distance);
-		}
-	}
-
-	/**
-	 * Converts a {@link Polygon} into a {@link BasicDBList}.
-	 * 
-	 * @author Thomas Darimont
-	 * @since 1.5
-	 */
-	public static enum PolygonToDbObjectConverter implements Converter<Polygon, DBObject> {
-
-		INSTANCE;
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
-		@Override
-		public DBObject convert(Polygon source) {
-
-			if (source == null) {
-				return null;
-			}
-
-			List<Point> points = source.getPoints();
-			List<DBObject> pointTuples = new ArrayList<DBObject>(points.size());
-
-			for (Point point : points) {
-				pointTuples.add(PointToDbObjectConverter.INSTANCE.convert(point));
-			}
-
-			DBObject result = new BasicDBObject();
-			result.put("points", pointTuples);
-			return result;
-		}
-	}
-
-	/**
-	 * Converts a {@link BasicDBList} into a {@link Polygon}.
-	 * 
-	 * @author Thomas Darimont
-	 * @since 1.5
-	 */
-	@ReadingConverter
-	public static enum DbObjectToPolygonConverter implements Converter<DBObject, Polygon> {
-
-		INSTANCE;
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
-		@Override
-		@SuppressWarnings({ "unchecked" })
-		public Polygon convert(DBObject source) {
-
-			if (source == null) {
-				return null;
-			}
-
-			List<DBObject> points = (List<DBObject>) source.get("points");
-			List<Point> newPoints = new ArrayList<Point>(points.size());
-
-			for (DBObject element : points) {
-
-				Assert.notNull(element, "Point elements of polygon must not be null!");
-				newPoints.add(DbObjectToPointConverter.INSTANCE.convert(element));
-			}
-
-			return new Polygon(newPoints);
-		}
-	}
-
-	/**
-	 * Converts a {@link Sphere} into a {@link BasicDBList}.
-	 * 
-	 * @author Thomas Darimont
-	 * @since 1.5
-	 */
-	public static enum GeoCommandToDbObjectConverter implements Converter<GeoCommand, DBObject> {
-
-		INSTANCE;
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
-		@Override
-		public DBObject convert(GeoCommand source) {
-
-			if (source == null) {
-				return null;
-			}
-
-			BasicDBList argument = new BasicDBList();
-
-			Shape shape = source.getShape();
-
-			if (shape instanceof Box) {
-
-				argument.add(toList(((Box) shape).getFirst()));
-				argument.add(toList(((Box) shape).getSecond()));
-
-			} else if (shape instanceof Circle) {
-
-				argument.add(toList(((Circle) shape).getCenter()));
-				argument.add(((Circle) shape).getRadius().getNormalizedValue());
-
-			} else if (shape instanceof Circle) {
-
-				argument.add(toList(((Circle) shape).getCenter()));
-				argument.add(((Circle) shape).getRadius());
-
-			} else if (shape instanceof Polygon) {
-
-				for (Point point : ((Polygon) shape).getPoints()) {
-					argument.add(toList(point));
-				}
-
-			} else if (shape instanceof Sphere) {
-
-				argument.add(toList(((Sphere) shape).getCenter()));
-				argument.add(((Sphere) shape).getRadius().getNormalizedValue());
-			}
-
-			return new BasicDBObject(source.getCommand(), argument);
-		}
-	}
-
-	static List<Double> toList(Point point) {
-		return Arrays.asList(point.getX(), point.getY());
-	}
-}

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

@@ -1,46 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.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
- * @author Christoph Strobl
- * @since 1.5
- */
-public interface LazyLoadingProxy {
-
-	/**
-	 * Initializes the proxy and returns the wrapped value.
-	 * 
-	 * @return
-	 * @since 1.5
-	 */
-	Object getTarget();
-
-	/**
-	 * 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-2014 by the original author(s).
+ * Copyright 2011-2013 by the original author(s).
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,19 +29,18 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
+import org.springframework.core.CollectionFactory;
 import org.springframework.core.convert.ConversionException;
 import org.springframework.core.convert.ConversionService;
-import org.springframework.core.convert.support.DefaultConversionService;
-import org.springframework.data.convert.CollectionFactory;
+import org.springframework.core.convert.support.ConversionServiceFactory;
 import org.springframework.data.convert.EntityInstantiator;
 import org.springframework.data.convert.TypeMapper;
 import org.springframework.data.mapping.Association;
 import org.springframework.data.mapping.AssociationHandler;
-import org.springframework.data.mapping.PersistentPropertyAccessor;
 import org.springframework.data.mapping.PreferredConstructor.Parameter;
 import org.springframework.data.mapping.PropertyHandler;
 import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.mapping.model.ConvertingPropertyAccessor;
+import org.springframework.data.mapping.model.BeanWrapper;
 import org.springframework.data.mapping.model.DefaultSpELExpressionEvaluator;
 import org.springframework.data.mapping.model.MappingException;
 import org.springframework.data.mapping.model.ParameterValueProvider;
@@ -57,11 +56,12 @@ import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import com.mongodb.BasicDBList;
 import com.mongodb.BasicDBObject;
+import com.mongodb.DB;
 import com.mongodb.DBObject;
 import com.mongodb.DBRef;
 
@@ -73,40 +73,38 @@ import com.mongodb.DBRef;
  * @author Jon Brisbin
  * @author Patrik Wasik
  * @author Thomas Darimont
- * @author Christoph Strobl
  */
-public class MappingMongoConverter extends AbstractMongoConverter implements ApplicationContextAware, ValueResolver {
+public class MappingMongoConverter extends AbstractMongoConverter implements ApplicationContextAware {
 
-	private static final String INCOMPATIBLE_TYPES = "Cannot convert %1$s of type %2$s into an instance of %3$s! Implement a custom Converter<%2$s, %3$s> and register it with the CustomConversions. Parent object was: %4$s";
-
-	protected static final Logger LOGGER = LoggerFactory.getLogger(MappingMongoConverter.class);
+	protected static final Logger log = LoggerFactory.getLogger(MappingMongoConverter.class);
 
 	protected final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
 	protected final SpelExpressionParser spelExpressionParser = new SpelExpressionParser();
+	protected final MongoDbFactory mongoDbFactory;
 	protected final QueryMapper idMapper;
-	protected final DbRefResolver dbRefResolver;
-
 	protected ApplicationContext applicationContext;
+	protected boolean useFieldAccessOnly = true;
 	protected MongoTypeMapper typeMapper;
 	protected String mapKeyDotReplacement = null;
 
 	private SpELContext spELContext;
 
 	/**
-	 * Creates a new {@link MappingMongoConverter} given the new {@link DbRefResolver} and {@link MappingContext}.
+	 * Creates a new {@link MappingMongoConverter} given the new {@link MongoDbFactory} and {@link MappingContext}.
 	 * 
 	 * @param mongoDbFactory must not be {@literal null}.
 	 * @param mappingContext must not be {@literal null}.
 	 */
-	public MappingMongoConverter(DbRefResolver dbRefResolver,
+	@SuppressWarnings("deprecation")
+	public MappingMongoConverter(MongoDbFactory mongoDbFactory,
 			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
 
-		super(new DefaultConversionService());
+		super(ConversionServiceFactory.createDefaultConversionService());
 
-		Assert.notNull(dbRefResolver, "DbRefResolver must not be null!");
-		Assert.notNull(mappingContext, "MappingContext must not be null!");
+		Assert.notNull(mongoDbFactory);
+		Assert.notNull(mappingContext);
 
-		this.dbRefResolver = dbRefResolver;
+		this.mongoDbFactory = mongoDbFactory;
 		this.mappingContext = mappingContext;
 		this.typeMapper = new DefaultMongoTypeMapper(DefaultMongoTypeMapper.DEFAULT_TYPE_KEY, mappingContext);
 		this.idMapper = new QueryMapper(this);
@@ -114,19 +112,6 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		this.spELContext = new SpELContext(DBObjectPropertyAccessor.INSTANCE);
 	}
 
-	/**
-	 * Creates a new {@link MappingMongoConverter} given the new {@link MongoDbFactory} and {@link MappingContext}.
-	 * 
-	 * @deprecated use the constructor taking a {@link DbRefResolver} instead.
-	 * @param mongoDbFactory must not be {@literal null}.
-	 * @param mappingContext must not be {@literal null}.
-	 */
-	@Deprecated
-	public MappingMongoConverter(MongoDbFactory mongoDbFactory,
-			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
-		this(new DefaultDbRefResolver(mongoDbFactory), mappingContext);
-	}
-
 	/**
 	 * Configures the {@link MongoTypeMapper} to be used to add type information to {@link DBObject}s created by the
 	 * converter and how to lookup type information from {@link DBObject}s when reading them. Uses a
@@ -169,6 +154,17 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		return mappingContext;
 	}
 
+	/**
+	 * Configures whether to use field access only for entity mapping. Setting this to true will force the
+	 * {@link MongoConverter} to not go through getters or setters even if they are present for getting and setting
+	 * property values.
+	 * 
+	 * @param useFieldAccessOnly
+	 */
+	public void setUseFieldAccessOnly(boolean useFieldAccessOnly) {
+		this.useFieldAccessOnly = useFieldAccessOnly;
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
@@ -188,11 +184,11 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	}
 
 	protected <S extends Object> S read(TypeInformation<S> type, DBObject dbo) {
-		return read(type, dbo, ObjectPath.ROOT);
+		return read(type, dbo, null);
 	}
 
 	@SuppressWarnings("unchecked")
-	private <S extends Object> S read(TypeInformation<S> type, DBObject dbo, ObjectPath path) {
+	protected <S extends Object> S read(TypeInformation<S> type, DBObject dbo, Object parent) {
 
 		if (null == dbo) {
 			return null;
@@ -210,15 +206,11 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		}
 
 		if (typeToUse.isCollectionLike() && dbo instanceof BasicDBList) {
-			return (S) readCollectionOrArray(typeToUse, (BasicDBList) dbo, path);
+			return (S) readCollectionOrArray(typeToUse, (BasicDBList) dbo, parent);
 		}
 
 		if (typeToUse.isMap()) {
-			return (S) readMap(typeToUse, dbo, path);
-		}
-
-		if (dbo instanceof BasicDBList) {
-			throw new MappingException(String.format(INCOMPATIBLE_TYPES, dbo, BasicDBList.class, typeToUse.getType(), path));
+			return (S) readMap(typeToUse, dbo, parent);
 		}
 
 		// Retrieve persistent entity info
@@ -228,79 +220,52 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			throw new MappingException("No mapping metadata found for " + rawType.getName());
 		}
 
-		return read(persistentEntity, dbo, path);
+		return read(persistentEntity, dbo, parent);
 	}
 
 	private ParameterValueProvider<MongoPersistentProperty> getParameterProvider(MongoPersistentEntity<?> entity,
-			DBObject source, DefaultSpELExpressionEvaluator evaluator, ObjectPath path) {
+			DBObject source, DefaultSpELExpressionEvaluator evaluator, Object parent) {
 
-		MongoDbPropertyValueProvider provider = new MongoDbPropertyValueProvider(source, evaluator, path);
+		MongoDbPropertyValueProvider provider = new MongoDbPropertyValueProvider(source, evaluator, parent);
 		PersistentEntityParameterValueProvider<MongoPersistentProperty> parameterProvider = new PersistentEntityParameterValueProvider<MongoPersistentProperty>(
-				entity, provider, path.getCurrentObject());
+				entity, provider, parent);
 
-		return new ConverterAwareSpELExpressionParameterValueProvider(evaluator, conversionService, parameterProvider, path);
+		return new ConverterAwareSpELExpressionParameterValueProvider(evaluator, conversionService, parameterProvider,
+				parent);
 	}
 
-	private <S extends Object> S read(final MongoPersistentEntity<S> entity, final DBObject dbo, final ObjectPath path) {
+	private <S extends Object> S read(final MongoPersistentEntity<S> entity, final DBObject dbo, Object parent) {
 
 		final DefaultSpELExpressionEvaluator evaluator = new DefaultSpELExpressionEvaluator(dbo, spELContext);
 
-		ParameterValueProvider<MongoPersistentProperty> provider = getParameterProvider(entity, dbo, evaluator, path);
+		ParameterValueProvider<MongoPersistentProperty> provider = getParameterProvider(entity, dbo, evaluator, parent);
 		EntityInstantiator instantiator = instantiators.getInstantiatorFor(entity);
 		S instance = instantiator.createInstance(entity, provider);
 
-		final PersistentPropertyAccessor accessor = new ConvertingPropertyAccessor(entity.getPropertyAccessor(instance),
-				conversionService);
-
-		final MongoPersistentProperty idProperty = entity.getIdProperty();
-		final S result = instance;
-
-		// make sure id property is set before all other properties
-		Object idValue = null;
-
-		if (idProperty != null) {
-			idValue = getValueInternal(idProperty, dbo, evaluator, path);
-			accessor.setProperty(idProperty, idValue);
-		}
-
-		final ObjectPath currentPath = path.push(result, entity, idValue);
+		final BeanWrapper<MongoPersistentEntity<S>, S> wrapper = BeanWrapper.create(instance, conversionService);
+		final S result = wrapper.getBean();
 
 		// Set properties not already set in the constructor
 		entity.doWithProperties(new PropertyHandler<MongoPersistentProperty>() {
 			public void doWithPersistentProperty(MongoPersistentProperty prop) {
 
-				// we skip the id property since it was already set
-				if (idProperty != null && idProperty.equals(prop)) {
-					return;
-				}
-
 				if (!dbo.containsField(prop.getFieldName()) || entity.isConstructorArgument(prop)) {
 					return;
 				}
 
-				accessor.setProperty(prop, getValueInternal(prop, dbo, evaluator, currentPath));
+				Object obj = getValueInternal(prop, dbo, evaluator, result);
+				wrapper.setProperty(prop, obj, useFieldAccessOnly);
 			}
 		});
 
 		// Handle associations
 		entity.doWithAssociations(new AssociationHandler<MongoPersistentProperty>() {
 			public void doWithAssociation(Association<MongoPersistentProperty> association) {
+				MongoPersistentProperty inverseProp = association.getInverse();
+				Object obj = getValueInternal(inverseProp, dbo, evaluator, result);
 
-				final MongoPersistentProperty property = association.getInverse();
-				Object value = dbo.get(property.getFieldName());
+				wrapper.setProperty(inverseProp, obj);
 
-				if (value == null) {
-					return;
-				}
-
-				DBRef dbref = value instanceof DBRef ? (DBRef) value : null;
-
-				DbRefProxyHandler handler = new DefaultDbRefProxyHandler(spELContext, mappingContext,
-						MappingMongoConverter.this);
-				DbRefResolverCallback callback = new DefaultDbRefResolverCallback(dbo, currentPath, evaluator,
-						MappingMongoConverter.this);
-
-				accessor.setProperty(property, dbRefResolver.resolveDbRef(property, dbref, callback, handler));
 			}
 		});
 
@@ -320,12 +285,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			Assert.isTrue(annotation != null, "The referenced property has to be mapped with @DBRef!");
 		}
 
-		// @see DATAMONGO-913
-		if (object instanceof LazyLoadingProxy) {
-			return ((LazyLoadingProxy) object).toDBRef();
-		}
-
-		return createDBRef(object, referingProperty);
+		return createDBRef(object, annotation);
 	}
 
 	/**
@@ -340,17 +300,14 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			return;
 		}
 
-		Class<?> entityType = obj.getClass();
-		boolean handledByCustomConverter = conversions.getCustomWriteTarget(entityType, DBObject.class) != null;
-		TypeInformation<? extends Object> type = ClassTypeInformation.from(entityType);
+		boolean handledByCustomConverter = conversions.getCustomWriteTarget(obj.getClass(), DBObject.class) != null;
+		TypeInformation<? extends Object> type = ClassTypeInformation.from(obj.getClass());
 
 		if (!handledByCustomConverter && !(dbo instanceof BasicDBList)) {
 			typeMapper.writeType(type, dbo);
 		}
 
-		Object target = obj instanceof LazyLoadingProxy ? ((LazyLoadingProxy) obj).getTarget() : obj;
-
-		writeInternal(target, dbo, type);
+		writeInternal(obj, dbo, type);
 	}
 
 	/**
@@ -366,8 +323,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			return;
 		}
 
-		Class<?> entityType = obj.getClass();
-		Class<?> customTarget = conversions.getCustomWriteTarget(entityType, DBObject.class);
+		Class<?> customTarget = conversions.getCustomWriteTarget(obj.getClass(), DBObject.class);
 
 		if (customTarget != null) {
 			DBObject result = conversionService.convert(obj, DBObject.class);
@@ -375,17 +331,17 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			return;
 		}
 
-		if (Map.class.isAssignableFrom(entityType)) {
+		if (Map.class.isAssignableFrom(obj.getClass())) {
 			writeMapInternal((Map<Object, Object>) obj, dbo, ClassTypeInformation.MAP);
 			return;
 		}
 
-		if (Collection.class.isAssignableFrom(entityType)) {
+		if (Collection.class.isAssignableFrom(obj.getClass())) {
 			writeCollectionInternal((Collection<?>) obj, ClassTypeInformation.LIST, (BasicDBList) dbo);
 			return;
 		}
 
-		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(entityType);
+		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(obj.getClass());
 		writeInternal(obj, dbo, entity);
 		addCustomTypeKeyIfNecessary(typeHint, obj, dbo);
 	}
@@ -400,13 +356,15 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			throw new MappingException("No mapping metadata found for entity of type " + obj.getClass().getName());
 		}
 
-		final PersistentPropertyAccessor accessor = entity.getPropertyAccessor(obj);
+		final BeanWrapper<MongoPersistentEntity<Object>, Object> wrapper = BeanWrapper.create(obj, conversionService);
 		final MongoPersistentProperty idProperty = entity.getIdProperty();
 
 		if (!dbo.containsField("_id") && null != idProperty) {
 
+			boolean fieldAccessOnly = idProperty.usePropertyAccess() ? false : useFieldAccessOnly;
+
 			try {
-				Object id = accessor.getProperty(idProperty);
+				Object id = wrapper.getProperty(idProperty, Object.class, fieldAccessOnly);
 				dbo.put("_id", idMapper.convertId(id));
 			} catch (ConversionException ignored) {}
 		}
@@ -415,30 +373,29 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		entity.doWithProperties(new PropertyHandler<MongoPersistentProperty>() {
 			public void doWithPersistentProperty(MongoPersistentProperty prop) {
 
-				if (prop.equals(idProperty) || !prop.isWritable()) {
+				if (prop.equals(idProperty)) {
 					return;
 				}
 
-				Object propertyObj = accessor.getProperty(prop);
+				boolean fieldAccessOnly = prop.usePropertyAccess() ? false : useFieldAccessOnly;
+
+				Object propertyObj = wrapper.getProperty(prop, prop.getType(), fieldAccessOnly);
 
 				if (null != propertyObj) {
-
 					if (!conversions.isSimpleType(propertyObj.getClass())) {
 						writePropertyInternal(propertyObj, dbo, prop);
 					} else {
-						writeSimpleInternal(propertyObj, dbo, prop);
+						writeSimpleInternal(propertyObj, dbo, prop.getFieldName());
 					}
 				}
 			}
 		});
 
 		entity.doWithAssociations(new AssociationHandler<MongoPersistentProperty>() {
-
 			public void doWithAssociation(Association<MongoPersistentProperty> association) {
-
 				MongoPersistentProperty inverseProp = association.getInverse();
-				Object propertyObj = accessor.getProperty(inverseProp);
-
+				Class<?> type = inverseProp.getType();
+				Object propertyObj = wrapper.getProperty(inverseProp, type, useFieldAccessOnly);
 				if (null != propertyObj) {
 					writePropertyInternal(propertyObj, dbo, inverseProp);
 				}
@@ -453,68 +410,46 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			return;
 		}
 
-		DBObjectAccessor accessor = new DBObjectAccessor(dbo);
-
+		String name = prop.getFieldName();
 		TypeInformation<?> valueType = ClassTypeInformation.from(obj.getClass());
 		TypeInformation<?> type = prop.getTypeInformation();
 
 		if (valueType.isCollectionLike()) {
 			DBObject collectionInternal = createCollection(asCollection(obj), prop);
-			accessor.put(prop, collectionInternal);
+			dbo.put(name, collectionInternal);
 			return;
 		}
 
 		if (valueType.isMap()) {
 			DBObject mapDbObj = createMap((Map<Object, Object>) obj, prop);
-			accessor.put(prop, mapDbObj);
+			dbo.put(name, mapDbObj);
 			return;
 		}
 
 		if (prop.isDbReference()) {
-
-			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);
-
+			DBRef dbRefObj = createDBRef(obj, prop.getDBRef());
 			if (null != dbRefObj) {
-				accessor.put(prop, dbRefObj);
+				dbo.put(name, dbRefObj);
 				return;
 			}
 		}
 
-		/*
-		 * If we have a LazyLoadingProxy we make sure it is initialized first.
-		 */
-		if (obj instanceof LazyLoadingProxy) {
-			obj = ((LazyLoadingProxy) obj).getTarget();
-		}
-
 		// Lookup potential custom target type
 		Class<?> basicTargetType = conversions.getCustomWriteTarget(obj.getClass(), null);
 
 		if (basicTargetType != null) {
-			accessor.put(prop, conversionService.convert(obj, basicTargetType));
+			dbo.put(name, conversionService.convert(obj, basicTargetType));
 			return;
 		}
 
-		Object existingValue = accessor.get(prop);
-		BasicDBObject propDbObj = existingValue instanceof BasicDBObject ? (BasicDBObject) existingValue
-				: new BasicDBObject();
-		addCustomTypeKeyIfNecessary(ClassTypeInformation.from(prop.getRawType()), obj, propDbObj);
+		BasicDBObject propDbObj = new BasicDBObject();
+		addCustomTypeKeyIfNecessary(type, obj, propDbObj);
 
 		MongoPersistentEntity<?> entity = isSubtype(prop.getType(), obj.getClass()) ? mappingContext
 				.getPersistentEntity(obj.getClass()) : mappingContext.getPersistentEntity(type);
 
 		writeInternal(obj, propDbObj, entity);
-		accessor.put(prop, propDbObj);
+		dbo.put(name, propDbObj);
 	}
 
 	private boolean isSubtype(Class<?> left, Class<?> right) {
@@ -559,7 +494,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 				continue;
 			}
 
-			DBRef dbRef = createDBRef(element, property);
+			DBRef dbRef = createDBRef(element, property.getDBRef());
 			dbList.add(dbRef);
 		}
 
@@ -592,7 +527,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) : null);
+				dbObject.put(simpleKey, value != null ? createDBRef(value, property.getDBRef()) : null);
 
 			} else {
 				throw new MappingException("Cannot use a complex object as a key value.");
@@ -705,20 +640,19 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	/**
 	 * Adds custom type information to the given {@link DBObject} if necessary. That is if the value is not the same as
 	 * the one given. This is usually the case if you store a subtype of the actual declared type of the property.
-	 *
+	 * 
 	 * @param type
 	 * @param value must not be {@literal null}.
 	 * @param dbObject must not be {@literal null}.
 	 */
 	protected void addCustomTypeKeyIfNecessary(TypeInformation<?> type, Object value, DBObject dbObject) {
 
-		TypeInformation<?> actualType = type != null ? type.getActualType() : null;
+		TypeInformation<?> actualType = type != null ? type.getActualType() : type;
 		Class<?> reference = actualType == null ? Object.class : actualType.getType();
-		Class<?> valueType = ClassUtils.getUserClass(value.getClass());
 
-		boolean notTheSameClass = !valueType.equals(reference);
+		boolean notTheSameClass = !value.getClass().equals(reference);
 		if (notTheSameClass) {
-			typeMapper.writeType(valueType, dbObject);
+			typeMapper.writeType(value.getClass(), dbObject);
 		}
 	}
 
@@ -733,11 +667,6 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		dbObject.put(key, getPotentiallyConvertedSimpleWrite(value));
 	}
 
-	private void writeSimpleInternal(Object value, DBObject dbObject, MongoPersistentProperty property) {
-		DBObjectAccessor accessor = new DBObjectAccessor(dbObject);
-		accessor.put(property, getPotentiallyConvertedSimpleWrite(value));
-	}
-
 	/**
 	 * Checks whether we have a custom conversion registered for the given value into an arbitrary simple Mongo type.
 	 * Returns the converted value if so. If not, we perform special enum handling or simply return the value as is.
@@ -786,7 +715,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		return target.isAssignableFrom(value.getClass()) ? value : conversionService.convert(value, target);
 	}
 
-	protected DBRef createDBRef(Object target, MongoPersistentProperty property) {
+	protected DBRef createDBRef(Object target, org.springframework.data.mongodb.core.mapping.DBRef dbref) {
 
 		Assert.notNull(target);
 
@@ -795,7 +724,6 @@ 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());
@@ -807,31 +735,24 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			throw new MappingException("No id property found on class " + targetEntity.getType());
 		}
 
-		Object id = null;
-
-		if (target.getClass().equals(idProperty.getType())) {
-			id = target;
-		} else {
-			PersistentPropertyAccessor accessor = targetEntity.getPropertyAccessor(target);
-			id = accessor.getProperty(idProperty);
-		}
+		BeanWrapper<MongoPersistentEntity<Object>, Object> wrapper = BeanWrapper.create(target, conversionService);
+		Object 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(property == null ? null : property.getDBRef(), targetEntity,
-				idMapper.convertId(id));
+		DB db = mongoDbFactory.getDb();
+		db = dbref != null && StringUtils.hasText(dbref.db()) ? mongoDbFactory.getDb(dbref.db()) : db;
+
+		return new DBRef(db, targetEntity.getCollection(), idMapper.convertId(id));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.ValueResolver#getValueInternal(org.springframework.data.mongodb.core.mapping.MongoPersistentProperty, com.mongodb.DBObject, org.springframework.data.mapping.model.SpELExpressionEvaluator, java.lang.Object)
-	 */
-	@Override
-	public Object getValueInternal(MongoPersistentProperty prop, DBObject dbo, SpELExpressionEvaluator evaluator,
-			ObjectPath path) {
-		return new MongoDbPropertyValueProvider(dbo, evaluator, path).getPropertyValue(prop);
+	protected Object getValueInternal(MongoPersistentProperty prop, DBObject dbo, SpELExpressionEvaluator eval,
+			Object parent) {
+
+		MongoDbPropertyValueProvider provider = new MongoDbPropertyValueProvider(dbo, spELContext, parent);
+		return provider.getPropertyValue(prop);
 	}
 
 	/**
@@ -839,13 +760,12 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	 * 
 	 * @param targetType must not be {@literal null}.
 	 * @param sourceValue must not be {@literal null}.
-	 * @param path must not be {@literal null}.
 	 * @return the converted {@link Collection} or array, will never be {@literal null}.
 	 */
-	private Object readCollectionOrArray(TypeInformation<?> targetType, BasicDBList sourceValue, ObjectPath path) {
+	@SuppressWarnings("unchecked")
+	private Object readCollectionOrArray(TypeInformation<?> targetType, BasicDBList sourceValue, Object parent) {
 
-		Assert.notNull(targetType, "Target type must not be null!");
-		Assert.notNull(path, "Object path must not be null!");
+		Assert.notNull(targetType);
 
 		Class<?> collectionType = targetType.getType();
 
@@ -853,22 +773,22 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			return getPotentiallyConvertedSimpleRead(new HashSet<Object>(), collectionType);
 		}
 
+		collectionType = Collection.class.isAssignableFrom(collectionType) ? collectionType : List.class;
+
+		Collection<Object> items = targetType.getType().isArray() ? new ArrayList<Object>() : CollectionFactory
+				.createCollection(collectionType, sourceValue.size());
 		TypeInformation<?> componentType = targetType.getComponentType();
 		Class<?> rawComponentType = componentType == null ? null : componentType.getType();
 
-		collectionType = Collection.class.isAssignableFrom(collectionType) ? collectionType : List.class;
-		Collection<Object> items = targetType.getType().isArray() ? new ArrayList<Object>() : CollectionFactory
-				.createCollection(collectionType, rawComponentType, sourceValue.size());
-
 		for (int i = 0; i < sourceValue.size(); i++) {
 
 			Object dbObjItem = sourceValue.get(i);
 
 			if (dbObjItem instanceof DBRef) {
-				items.add(DBRef.class.equals(rawComponentType) ? dbObjItem : read(componentType, readRef((DBRef) dbObjItem),
-						path));
+				items.add(DBRef.class.equals(rawComponentType) ? dbObjItem : read(componentType, ((DBRef) dbObjItem).fetch(),
+						parent));
 			} else if (dbObjItem instanceof DBObject) {
-				items.add(read(componentType, (DBObject) dbObjItem, path));
+				items.add(read(componentType, (DBObject) dbObjItem, parent));
 			} else {
 				items.add(getPotentiallyConvertedSimpleRead(dbObjItem, rawComponentType));
 			}
@@ -881,25 +801,16 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	 * Reads the given {@link DBObject} into a {@link Map}. will recursively resolve nested {@link Map}s as well.
 	 * 
 	 * @param type the {@link Map} {@link TypeInformation} to be used to unmarshall this {@link DBObject}.
-	 * @param dbObject must not be {@literal null}
-	 * @param path must not be {@literal null}
+	 * @param dbObject
 	 * @return
 	 */
 	@SuppressWarnings("unchecked")
-	protected Map<Object, Object> readMap(TypeInformation<?> type, DBObject dbObject, ObjectPath path) {
+	protected Map<Object, Object> readMap(TypeInformation<?> type, DBObject dbObject, Object parent) {
 
-		Assert.notNull(dbObject, "DBObject must not be null!");
-		Assert.notNull(path, "Object path must not be null!");
+		Assert.notNull(dbObject);
 
 		Class<?> mapType = typeMapper.readType(dbObject, type).getType();
-
-		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 = CollectionFactory.createMap(mapType, rawKeyType, dbObject.keySet().size());
+		Map<Object, Object> map = CollectionFactory.createMap(mapType, dbObject.keySet().size());
 		Map<String, Object> sourceMap = dbObject.toMap();
 
 		for (Entry<String, Object> entry : sourceMap.entrySet()) {
@@ -909,16 +820,20 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 
 			Object key = potentiallyUnescapeMapKey(entry.getKey());
 
-			if (rawKeyType != null) {
-				key = conversionService.convert(key, rawKeyType);
+			TypeInformation<?> keyTypeInformation = type.getComponentType();
+			if (keyTypeInformation != null) {
+				Class<?> keyType = keyTypeInformation.getType();
+				key = conversionService.convert(key, keyType);
 			}
 
 			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, path));
+				map.put(key, read(valueType, (DBObject) value, parent));
 			} else if (value instanceof DBRef) {
-				map.put(key, DBRef.class.equals(rawValueType) ? value : read(valueType, readRef((DBRef) value)));
+				map.put(key, DBRef.class.equals(rawValueType) ? value : read(valueType, ((DBRef) value).fetch()));
 			} else {
 				Class<?> valueClass = valueType == null ? null : valueType.getType();
 				map.put(key, getPotentiallyConvertedSimpleRead(value, valueClass));
@@ -928,6 +843,21 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		return map;
 	}
 
+	protected <T> List<?> unwrapList(BasicDBList dbList, TypeInformation<T> targetType) {
+		List<Object> rootList = new ArrayList<Object>();
+		for (int i = 0; i < dbList.size(); i++) {
+			Object obj = dbList.get(i);
+			if (obj instanceof BasicDBList) {
+				rootList.add(unwrapList((BasicDBList) obj, targetType.getComponentType()));
+			} else if (obj instanceof DBObject) {
+				rootList.add(read(targetType, (DBObject) obj));
+			} else {
+				rootList.add(obj);
+			}
+		}
+		return rootList;
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.convert.MongoWriter#convertToMongoType(java.lang.Object, org.springframework.data.util.TypeInformation)
@@ -949,17 +879,15 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			return getPotentiallyConvertedSimpleWrite(obj);
 		}
 
-		TypeInformation<?> typeHint = typeInformation;
-
 		if (obj instanceof BasicDBList) {
-			return maybeConvertList((BasicDBList) obj, typeHint);
+			return maybeConvertList((BasicDBList) obj);
 		}
 
 		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, typeHint));
+				newValueDbo.put(vk, convertToMongoType(o));
 			}
 			return newValueDbo;
 		}
@@ -967,17 +895,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(), typeHint));
+				result.put(entry.getKey().toString(), convertToMongoType(entry.getValue()));
 			}
 			return result;
 		}
 
 		if (obj.getClass().isArray()) {
-			return maybeConvertList(Arrays.asList((Object[]) obj), typeHint);
+			return maybeConvertList(Arrays.asList((Object[]) obj));
 		}
 
 		if (obj instanceof Collection) {
-			return maybeConvertList((Collection<?>) obj, typeHint);
+			return maybeConvertList((Collection<?>) obj);
 		}
 
 		DBObject newDbo = new BasicDBObject();
@@ -990,13 +918,11 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		return !obj.getClass().equals(typeInformation.getType()) ? newDbo : removeTypeInfoRecursively(newDbo);
 	}
 
-	public BasicDBList maybeConvertList(Iterable<?> source, TypeInformation<?> typeInformation) {
-
+	public BasicDBList maybeConvertList(Iterable<?> source) {
 		BasicDBList newDbl = new BasicDBList();
 		for (Object element : source) {
-			newDbl.add(convertToMongoType(element, typeInformation));
+			newDbl.add(convertToMongoType(element));
 		}
-
 		return newDbl;
 	}
 
@@ -1037,34 +963,24 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		return dbObject;
 	}
 
-	/**
-	 * {@link PropertyValueProvider} to evaluate a SpEL expression if present on the property or simply accesses the field
-	 * of the configured source {@link DBObject}.
-	 *
-	 * @author Oliver Gierke
-	 */
 	private class MongoDbPropertyValueProvider implements PropertyValueProvider<MongoPersistentProperty> {
 
-		private final DBObjectAccessor source;
+		private final DBObject source;
 		private final SpELExpressionEvaluator evaluator;
-		private final ObjectPath path;
+		private final Object parent;
 
-		/**
-		 * Creates a new {@link MongoDbPropertyValueProvider} for the given source, {@link SpELExpressionEvaluator} and
-		 * {@link ObjectPath}.
-		 * 
-		 * @param source must not be {@literal null}.
-		 * @param evaluator must not be {@literal null}.
-		 * @param path can be {@literal null}.
-		 */
-		public MongoDbPropertyValueProvider(DBObject source, SpELExpressionEvaluator evaluator, ObjectPath path) {
+		public MongoDbPropertyValueProvider(DBObject source, SpELContext factory, Object parent) {
+			this(source, new DefaultSpELExpressionEvaluator(source, factory), parent);
+		}
+
+		public MongoDbPropertyValueProvider(DBObject source, DefaultSpELExpressionEvaluator evaluator, Object parent) {
 
 			Assert.notNull(source);
 			Assert.notNull(evaluator);
 
-			this.source = new DBObjectAccessor(source);
+			this.source = source;
 			this.evaluator = evaluator;
-			this.path = path;
+			this.parent = parent;
 		}
 
 		/* 
@@ -1074,13 +990,13 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		public <T> T getPropertyValue(MongoPersistentProperty property) {
 
 			String expression = property.getSpelExpression();
-			Object value = expression != null ? evaluator.evaluate(expression) : source.get(property);
+			Object value = expression != null ? evaluator.evaluate(expression) : source.get(property.getFieldName());
 
 			if (value == null) {
 				return null;
 			}
 
-			return readValue(value, property.getTypeInformation(), path);
+			return readValue(value, property.getTypeInformation(), parent);
 		}
 	}
 
@@ -1093,7 +1009,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	private class ConverterAwareSpELExpressionParameterValueProvider extends
 			SpELExpressionParameterValueProvider<MongoPersistentProperty> {
 
-		private final ObjectPath path;
+		private final Object parent;
 
 		/**
 		 * Creates a new {@link ConverterAwareSpELExpressionParameterValueProvider}.
@@ -1103,10 +1019,10 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		 * @param delegate must not be {@literal null}.
 		 */
 		public ConverterAwareSpELExpressionParameterValueProvider(SpELExpressionEvaluator evaluator,
-				ConversionService conversionService, ParameterValueProvider<MongoPersistentProperty> delegate, ObjectPath path) {
+				ConversionService conversionService, ParameterValueProvider<MongoPersistentProperty> delegate, Object parent) {
 
 			super(evaluator, conversionService, delegate);
-			this.path = path;
+			this.parent = parent;
 		}
 
 		/* 
@@ -1115,51 +1031,25 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		 */
 		@Override
 		protected <T> T potentiallyConvertSpelValue(Object object, Parameter<T, MongoPersistentProperty> parameter) {
-			return readValue(object, parameter.getType(), path);
+			return readValue(object, parameter.getType(), parent);
 		}
 	}
 
 	@SuppressWarnings("unchecked")
-	private <T> T readValue(Object value, TypeInformation<?> type, ObjectPath path) {
+	private <T> T readValue(Object value, TypeInformation<?> type, Object parent) {
 
 		Class<?> rawType = type.getType();
 
 		if (conversions.hasCustomReadTarget(value.getClass(), rawType)) {
 			return (T) conversionService.convert(value, rawType);
 		} else if (value instanceof DBRef) {
-			return potentiallyReadOrResolveDbRef((DBRef) value, type, path, rawType);
+			return (T) (rawType.equals(DBRef.class) ? value : read(type, ((DBRef) value).fetch(), parent));
 		} else if (value instanceof BasicDBList) {
-			return (T) readCollectionOrArray(type, (BasicDBList) value, path);
+			return (T) readCollectionOrArray(type, (BasicDBList) value, parent);
 		} else if (value instanceof DBObject) {
-			return (T) read(type, (DBObject) value, path);
+			return (T) read(type, (DBObject) value, parent);
 		} else {
 			return (T) getPotentiallyConvertedSimpleRead(value, rawType);
 		}
 	}
-
-	@SuppressWarnings("unchecked")
-	private <T> T potentiallyReadOrResolveDbRef(DBRef dbref, TypeInformation<?> type, ObjectPath path, Class<?> rawType) {
-
-		if (rawType.equals(DBRef.class)) {
-			return (T) dbref;
-		}
-
-		Object object = dbref == null ? null : path.getPathItem(dbref.getId(), dbref.getRef());
-
-		if (object != null) {
-			return (T) object;
-		}
-
-		return (T) (object != null ? object : read(type, readRef(dbref), path));
-	}
-
-	/**
-	 * Performs the fetch operation for the given {@link DBRef}.
-	 * 
-	 * @param ref
-	 * @return
-	 */
-	DBObject readRef(DBRef ref) {
-		return ref.fetch();
-	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,6 @@ import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.convert.ReadingConverter;
-import org.springframework.data.convert.WritingConverter;
-import org.springframework.data.mongodb.core.query.Term;
 import org.springframework.util.StringUtils;
 
 import com.mongodb.DBObject;
@@ -35,15 +33,15 @@ import com.mongodb.DBObject;
  * Wrapper class to contain useful converters for the usage with Mongo.
  * 
  * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Christoph Strobl
  */
 abstract class MongoConverters {
 
 	/**
 	 * Private constructor to prevent instantiation.
 	 */
-	private MongoConverters() {}
+	private MongoConverters() {
+
+	}
 
 	/**
 	 * Simple singleton to convert {@link ObjectId}s to their {@link String} representation.
@@ -163,19 +161,4 @@ abstract class MongoConverters {
 			return source == null ? null : source.toString();
 		}
 	}
-
-	/**
-	 * @author Christoph Strobl
-	 * @since 1.6
-	 */
-	@WritingConverter
-	public static enum TermToStringConverter implements Converter<Term, String> {
-
-		INSTANCE;
-
-		@Override
-		public String convert(Term source) {
-			return source == null ? null : source.getFormatted();
-		}
-	}
 }

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

@@ -1,182 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.convert;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
-import com.mongodb.DBObject;
-
-/**
- * A path of objects nested into each other. The type allows access to all parent objects currently in creation even
- * when resolving more nested objects. This allows to avoid re-resolving object instances that are logically equivalent
- * to already resolved ones.
- * <p>
- * An immutable ordered set of target objects for {@link DBObject} to {@link Object} conversions. Object paths can be
- * constructed by the {@link #toObjectPath(Object)} method and extended via {@link #push(Object)}.
- * 
- * @author Thomas Darimont
- * @author Oliver Gierke
- * @since 1.6
- */
-class ObjectPath {
-
-	public static final ObjectPath ROOT = new ObjectPath();
-
-	private final List<ObjectPathItem> items;
-
-	private ObjectPath() {
-		this.items = Collections.emptyList();
-	}
-
-	/**
-	 * Creates a new {@link ObjectPath} from the given parent {@link ObjectPath} by adding the provided
-	 * {@link ObjectPathItem} to it.
-	 * 
-	 * @param parent can be {@literal null}.
-	 * @param item
-	 */
-	private ObjectPath(ObjectPath parent, ObjectPath.ObjectPathItem item) {
-
-		List<ObjectPath.ObjectPathItem> items = new ArrayList<ObjectPath.ObjectPathItem>(parent.items);
-		items.add(item);
-
-		this.items = Collections.unmodifiableList(items);
-	}
-
-	/**
-	 * Returns a copy of the {@link ObjectPath} with the given {@link Object} as current object.
-	 *
-	 * @param object must not be {@literal null}.
-	 * @param entity must not be {@literal null}.
-	 * @param id must not be {@literal null}.
-	 * @return
-	 */
-	public ObjectPath push(Object object, MongoPersistentEntity<?> entity, Object id) {
-
-		Assert.notNull(object, "Object must not be null!");
-		Assert.notNull(entity, "MongoPersistentEntity must not be null!");
-
-		ObjectPathItem item = new ObjectPathItem(object, id, entity.getCollection());
-		return new ObjectPath(this, item);
-	}
-
-	/**
-	 * Returns the object with the given id and stored in the given collection if it's contained in the {@link ObjectPath}
-	 * .
-	 * 
-	 * @param id must not be {@literal null}.
-	 * @param collection must not be {@literal null} or empty.
-	 * @return
-	 */
-	public Object getPathItem(Object id, String collection) {
-
-		Assert.notNull(id, "Id must not be null!");
-		Assert.hasText(collection, "Collection name must not be null!");
-
-		for (ObjectPathItem item : items) {
-
-			Object object = item.getObject();
-
-			if (object == null) {
-				continue;
-			}
-
-			if (item.getIdValue() == null) {
-				continue;
-			}
-
-			if (collection.equals(item.getCollection()) && id.equals(item.getIdValue())) {
-				return object;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Returns the current object of the {@link ObjectPath} or {@literal null} if the path is empty.
-	 * 
-	 * @return
-	 */
-	public Object getCurrentObject() {
-		return items.isEmpty() ? null : items.get(items.size() - 1).getObject();
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-
-		if (items.isEmpty()) {
-			return "[empty]";
-		}
-
-		List<String> strings = new ArrayList<String>(items.size());
-
-		for (ObjectPathItem item : items) {
-			strings.add(item.object.toString());
-		}
-
-		return StringUtils.collectionToDelimitedString(strings, " -> ");
-	}
-
-	/**
-	 * An item in an {@link ObjectPath}.
-	 * 
-	 * @author Thomas Darimont
-	 * @author Oliver Gierke
-	 */
-	private static class ObjectPathItem {
-
-		private final Object object;
-		private final Object idValue;
-		private final String collection;
-
-		/**
-		 * Creates a new {@link ObjectPathItem}.
-		 * 
-		 * @param object
-		 * @param idValue
-		 * @param collection
-		 */
-		ObjectPathItem(Object object, Object idValue, String collection) {
-
-			this.object = object;
-			this.idValue = idValue;
-			this.collection = collection;
-		}
-
-		public Object getObject() {
-			return object;
-		}
-
-		public Object getIdValue() {
-			return idValue;
-		}
-
-		public String getCollection() {
-			return collection;
-		}
-	}
-}

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

@@ -17,23 +17,18 @@ 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;
@@ -52,16 +47,10 @@ import com.mongodb.DBRef;
  * @author Oliver Gierke
  * @author Patryk Wasik
  * @author Thomas Darimont
- * @author Christoph Strobl
  */
 public class QueryMapper {
 
 	private static final List<String> DEFAULT_ID_NAMES = Arrays.asList("id", "_id");
-	private static final DBObject META_TEXT_SCORE = new BasicDBObject("$meta", "textScore");
-
-	private enum MetaMapping {
-		FORCE, WHEN_PRESENT, IGNORE;
-	}
 
 	private final ConversionService conversionService;
 	private final MongoConverter converter;
@@ -116,91 +105,21 @@ public class QueryMapper {
 			}
 
 			Field field = createPropertyField(entity, key, mappingContext);
-			Entry<String, Object> entry = getMappedObjectForField(field, query.get(key));
 
-			result.put(entry.getKey(), entry.getValue());
+			Object rawValue = query.get(key);
+			String newKey = field.getMappedKey();
+
+			if (isNestedKeyword(rawValue) && !field.isIdField()) {
+				Keyword keyword = new Keyword((DBObject) rawValue);
+				result.put(newKey, getMappedKeyword(field, keyword));
+			} else {
+				result.put(newKey, getMappedValue(field, rawValue));
+			}
 		}
 
 		return result;
 	}
 
-	/**
-	 * Maps fields used for sorting to the {@link MongoPersistentEntity}s properties. <br />
-	 * Also converts properties to their {@code $meta} representation if present.
-	 * 
-	 * @param sortObject
-	 * @param entity
-	 * @return
-	 * @since 1.6
-	 */
-	public DBObject getMappedSort(DBObject sortObject, MongoPersistentEntity<?> entity) {
-
-		if (sortObject == null) {
-			return null;
-		}
-
-		DBObject mappedSort = getMappedObject(sortObject, entity);
-		mapMetaAttributes(mappedSort, entity, MetaMapping.WHEN_PRESENT);
-		return mappedSort;
-	}
-
-	/**
-	 * Maps fields to retrieve to the {@link MongoPersistentEntity}s properties. <br />
-	 * Also onverts and potentially adds missing property {@code $meta} representation.
-	 * 
-	 * @param fieldsObject
-	 * @param entity
-	 * @return
-	 * @since 1.6
-	 */
-	public DBObject getMappedFields(DBObject fieldsObject, MongoPersistentEntity<?> entity) {
-
-		DBObject mappedFields = fieldsObject != null ? getMappedObject(fieldsObject, entity) : new BasicDBObject();
-		mapMetaAttributes(mappedFields, entity, MetaMapping.FORCE);
-		return mappedFields.keySet().isEmpty() ? null : mappedFields;
-	}
-
-	private void mapMetaAttributes(DBObject source, MongoPersistentEntity<?> entity, MetaMapping metaMapping) {
-
-		if (entity == null || source == null) {
-			return;
-		}
-
-		if (entity.hasTextScoreProperty() && !MetaMapping.IGNORE.equals(metaMapping)) {
-			MongoPersistentProperty textScoreProperty = entity.getTextScoreProperty();
-			if (MetaMapping.FORCE.equals(metaMapping)
-					|| (MetaMapping.WHEN_PRESENT.equals(metaMapping) && source.containsField(textScoreProperty.getFieldName()))) {
-				source.putAll(getMappedTextScoreField(textScoreProperty));
-			}
-		}
-	}
-
-	private DBObject getMappedTextScoreField(MongoPersistentProperty property) {
-		return new BasicDBObject(property.getFieldName(), META_TEXT_SCORE);
-	}
-
-	/**
-	 * 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
@@ -219,7 +138,7 @@ public class QueryMapper {
 	 * @param entity
 	 * @return
 	 */
-	protected DBObject getMappedKeyword(Keyword keyword, MongoPersistentEntity<?> entity) {
+	private DBObject getMappedKeyword(Keyword keyword, MongoPersistentEntity<?> entity) {
 
 		// $or/$nor
 		if (keyword.isOrOrNor() || keyword.hasIterableValue()) {
@@ -228,7 +147,7 @@ public class QueryMapper {
 			BasicDBList newConditions = new BasicDBList();
 
 			for (Object condition : conditions) {
-				newConditions.add(isDBObject(condition) ? getMappedObject((DBObject) condition, entity)
+				newConditions.add(condition instanceof DBObject ? getMappedObject((DBObject) condition, entity)
 						: convertSimpleOrDBObject(condition, entity));
 			}
 
@@ -245,13 +164,13 @@ public class QueryMapper {
 	 * @param keyword
 	 * @return
 	 */
-	protected DBObject getMappedKeyword(Field property, Keyword keyword) {
+	private DBObject getMappedKeyword(Field property, Keyword keyword) {
 
 		boolean needsAssociationConversion = property.isAssociation() && !keyword.isExists();
 		Object value = keyword.getValue();
 
-		Object convertedValue = needsAssociationConversion ? convertAssociation(value, property) : getMappedValue(
-				property.with(keyword.getKey()), value);
+		Object convertedValue = needsAssociationConversion ? convertAssociation(value, property.getProperty())
+				: getMappedValue(property.with(keyword.getKey()), value);
 
 		return new BasicDBObject(keyword.key, convertedValue);
 	}
@@ -265,11 +184,11 @@ public class QueryMapper {
 	 * @param newKey the key the value will be bound to eventually
 	 * @return
 	 */
-	protected Object getMappedValue(Field documentField, Object value) {
+	private Object getMappedValue(Field documentField, Object value) {
 
 		if (documentField.isIdField()) {
 
-			if (isDBObject(value)) {
+			if (value instanceof DBObject) {
 				DBObject valueDbo = (DBObject) value;
 				DBObject resultDbo = new BasicDBObject(valueDbo.toMap());
 
@@ -298,7 +217,7 @@ public class QueryMapper {
 		}
 
 		if (isAssociationConversionNecessary(documentField, value)) {
-			return convertAssociation(value, documentField);
+			return convertAssociation(value, documentField.getProperty());
 		}
 
 		return convertSimpleOrDBObject(value, documentField.getPropertyEntity());
@@ -310,32 +229,13 @@ public class QueryMapper {
 	 * 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 documentField
 	 * @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()
-				&& (type.equals(DBRef.class) || entity.getIdProperty().getActualType().isAssignableFrom(type));
+	private boolean isAssociationConversionNecessary(Field documentField, Object value) {
+		return documentField.isAssociation() && value != null
+				&& documentField.getProperty().getActualType().isAssignableFrom(value.getClass());
 	}
 
 	/**
@@ -345,13 +245,13 @@ public class QueryMapper {
 	 * @param entity
 	 * @return
 	 */
-	protected Object convertSimpleOrDBObject(Object source, MongoPersistentEntity<?> entity) {
+	private Object convertSimpleOrDBObject(Object source, MongoPersistentEntity<?> entity) {
 
 		if (source instanceof BasicDBList) {
 			return delegateConvertToMongoType(source, entity);
 		}
 
-		if (isDBObject(source)) {
+		if (source instanceof DBObject) {
 			return getMappedObject((DBObject) source, entity);
 		}
 
@@ -367,11 +267,7 @@ 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, entity == null ? null : entity.getTypeInformation());
-	}
-
-	protected Object convertAssociation(Object source, Field field) {
-		return convertAssociation(source, field.getProperty());
+		return converter.convertToMongoType(source);
 	}
 
 	/**
@@ -381,22 +277,17 @@ public class QueryMapper {
 	 * @param property
 	 * @return
 	 */
-	protected Object convertAssociation(Object source, MongoPersistentProperty property) {
+	private Object convertAssociation(Object source, MongoPersistentProperty property) {
 
-		if (property == null || source == null || source instanceof DBObject) {
+		if (property == null || !property.isAssociation() || source == null || source instanceof DBRef
+				|| !property.isEntity()) {
 			return source;
 		}
 
-		if (source instanceof DBRef) {
-
-			DBRef ref = (DBRef) source;
-			return new DBRef(ref.getDB(), ref.getRef(), convertId(ref.getId()));
-		}
-
 		if (source instanceof Iterable) {
 			BasicDBList result = new BasicDBList();
 			for (Object element : (Iterable<?>) source) {
-				result.add(createDbRefFor(element, property));
+				result.add(element instanceof DBRef ? element : converter.toDBRef(element, property));
 			}
 			return result;
 		}
@@ -405,54 +296,12 @@ public class QueryMapper {
 			BasicDBObject result = new BasicDBObject();
 			DBObject dbObject = (DBObject) source;
 			for (String key : dbObject.keySet()) {
-				result.put(key, createDbRefFor(dbObject.get(key), property));
+				Object o = dbObject.get(key);
+				result.put(key, o instanceof DBRef ? o : converter.toDBRef(o, property));
 			}
 			return result;
 		}
 
-		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);
 	}
 
@@ -511,7 +360,7 @@ public class QueryMapper {
 	 * 
 	 * @author Oliver Gierke
 	 */
-	static class Keyword {
+	private static class Keyword {
 
 		private static final String N_OR_PATTERN = "\\$.*or";
 
@@ -601,9 +450,7 @@ public class QueryMapper {
 		}
 
 		/**
-		 * 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.
+		 * Returns the underlying {@link MongoPersistentProperty} backing the field.
 		 * 
 		 * @return
 		 */
@@ -637,19 +484,6 @@ 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;
-		}
 	}
 
 	/**
@@ -660,13 +494,10 @@ public class QueryMapper {
 	 */
 	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
@@ -678,21 +509,6 @@ 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);
 
@@ -702,8 +518,7 @@ public class QueryMapper {
 			this.mappingContext = context;
 
 			this.path = getPath(name);
-			this.property = path == null ? property : path.getLeafProperty();
-			this.association = findAssociation();
+			this.property = path == null ? null : path.getLeafProperty();
 		}
 
 		/*
@@ -712,7 +527,7 @@ public class QueryMapper {
 		 */
 		@Override
 		public MetadataBackedField with(String name) {
-			return new MetadataBackedField(name, entity, mappingContext, property);
+			return new MetadataBackedField(name, entity, mappingContext);
 		}
 
 		/*
@@ -737,7 +552,7 @@ public class QueryMapper {
 		 */
 		@Override
 		public MongoPersistentProperty getProperty() {
-			return association == null ? property : association.getInverse();
+			return property;
 		}
 
 		/* 
@@ -756,34 +571,9 @@ public class QueryMapper {
 		 */
 		@Override
 		public boolean isAssociation() {
-			return association != null;
-		}
 
-		/* 
-		 * (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;
+			MongoPersistentProperty property = getProperty();
+			return property == null ? false : property.isAssociation();
 		}
 
 		/*
@@ -792,11 +582,7 @@ public class QueryMapper {
 		 */
 		@Override
 		public String getMappedKey() {
-			return path == null ? name : path.toDotPath(isAssociation() ? getAssociationConverter() : getPropertyConverter());
-		}
-
-		protected PersistentPropertyPath<MongoPersistentProperty> getPath() {
-			return path;
+			return path == null ? name : path.toDotPath(getPropertyConverter());
 		}
 
 		/**
@@ -808,28 +594,8 @@ public class QueryMapper {
 		private PersistentPropertyPath<MongoPersistentProperty> getPath(String pathExpression) {
 
 			try {
-
 				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;
+				return mappingContext.getPersistentPropertyPath(path);
 			} catch (PropertyReferenceException e) {
 				return null;
 			}
@@ -844,56 +610,5 @@ public class QueryMapper {
 		protected Converter<MongoPersistentProperty, String> getPropertyConverter() {
 			return PropertyToFieldNameConverter.INSTANCE;
 		}
-
-		/**
-		 * Return the {@link Converter} to use for creating the mapped key of an association. Default implementation is
-		 * {@link AssociationConverter}.
-		 * 
-		 * @return
-		 * @since 1.7
-		 */
-		protected Converter<MongoPersistentProperty, String> getAssociationConverter() {
-			return new AssociationConverter(getAssociation());
-		}
-	}
-
-	/**
-	 * Converter to skip all properties after an association property was rendered.
-	 * 
-	 * @author Oliver Gierke
-	 */
-	protected 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();
-		}
 	}
 }

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

@@ -17,33 +17,23 @@ 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 MongoConverter converter;
+	private final MongoWriter<?> converter;
 
 	/**
 	 * Creates a new {@link UpdateMapper} using the given {@link MongoConverter}.
@@ -69,75 +59,6 @@ public class UpdateMapper extends QueryMapper {
 				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)
@@ -179,15 +100,6 @@ public class UpdateMapper extends QueryMapper {
 			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()
@@ -197,57 +109,15 @@ public class UpdateMapper extends QueryMapper {
 			return new UpdatePropertyConverter(key);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.convert.QueryMapper.MetadataBackedField#getAssociationConverter()
-		 */
-		@Override
-		protected Converter<MongoPersistentProperty, String> getAssociationConverter() {
-			return new UpdateAssociationConverter(getAssociation(), key);
-		}
-
-		/**
-		 * Special mapper handling positional parameter {@literal $} within property names.
-		 * 
-		 * @author Christoph Strobl
-		 * @since 1.7
-		 */
-		private static class UpdateKeyMapper {
-
-			private final Iterator<String> iterator;
-
-			protected UpdateKeyMapper(String rawKey) {
-
-				Assert.hasText(rawKey, "Key must not be null or empty!");
-
-				this.iterator = Arrays.asList(rawKey.split("\\.")).iterator();
-				this.iterator.next();
-			}
-
-			/**
-			 * Maps the property name while retaining potential positional operator {@literal $}.
-			 * 
-			 * @param property
-			 * @return
-			 */
-			protected String mapPropertyName(MongoPersistentProperty property) {
-
-				String mappedName = PropertyToFieldNameConverter.INSTANCE.convert(property);
-				return iterator.hasNext() && iterator.next().equals("$") ? String.format("%s.$", mappedName) : mappedName;
-			}
-
-		}
-
 		/**
 		 * Special {@link Converter} for {@link MongoPersistentProperty} instances that will concatenate the {@literal $}
 		 * contained in the source update key.
 		 * 
 		 * @author Oliver Gierke
-		 * @author Christoph Strobl
 		 */
 		private static class UpdatePropertyConverter implements Converter<MongoPersistentProperty, String> {
 
-			private final UpdateKeyMapper mapper;
+			private final Iterator<String> iterator;
 
 			/**
 			 * Creates a new {@link UpdatePropertyConverter} with the given update key.
@@ -258,7 +128,8 @@ public class UpdateMapper extends QueryMapper {
 
 				Assert.hasText(updateKey, "Update key must not be null or empty!");
 
-				this.mapper = new UpdateKeyMapper(updateKey);
+				this.iterator = Arrays.asList(updateKey.split("\\.")).iterator();
+				this.iterator.next();
 			}
 
 			/* 
@@ -267,37 +138,9 @@ public class UpdateMapper extends QueryMapper {
 			 */
 			@Override
 			public String convert(MongoPersistentProperty property) {
-				return mapper.mapPropertyName(property);
-			}
-		}
 
-		/**
-		 * {@link Converter} retaining positional parameter {@literal $} for {@link Association}s.
-		 * 
-		 * @author Christoph Strobl
-		 */
-		protected static class UpdateAssociationConverter extends AssociationConverter {
-
-			private final UpdateKeyMapper mapper;
-
-			/**
-			 * Creates a new {@link AssociationConverter} for the given {@link Association}.
-			 * 
-			 * @param association must not be {@literal null}.
-			 */
-			public UpdateAssociationConverter(Association<MongoPersistentProperty> association, String key) {
-
-				super(association);
-				this.mapper = new UpdateKeyMapper(key);
-			}
-
-			/* 
-			 * (non-Javadoc)
-			 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-			 */
-			@Override
-			public String convert(MongoPersistentProperty source) {
-				return super.convert(source) == null ? null : mapper.mapPropertyName(source);
+				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/convert/ValueResolver.java

@@ -1,42 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.convert;
-
-import org.springframework.data.mapping.model.SpELExpressionEvaluator;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-
-import com.mongodb.DBObject;
-
-/**
- * Internal API to trigger the resolution of properties.
- * 
- * @author Oliver Gierke
- */
-interface ValueResolver {
-
-	/**
-	 * Resolves the value for the given {@link MongoPersistentProperty} within the given {@link DBObject} using the given
-	 * {@link SpELExpressionEvaluator} and {@link ObjectPath}.
-	 * 
-	 * @param prop
-	 * @param dbo
-	 * @param evaluator
-	 * @param parent
-	 * @return
-	 */
-	Object getValueInternal(MongoPersistentProperty prop, DBObject dbo, SpELExpressionEvaluator evaluator,
-			ObjectPath parent);
-}

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

@@ -0,0 +1,106 @@
+/*
+ * Copyright 2010-2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.geo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.util.Assert;
+
+/**
+ * Represents a geospatial box value
+ * 
+ * @author Mark Pollack
+ * @author Oliver Gierke
+ */
+public class Box implements Shape {
+
+	@Field(order = 10)
+	private final Point first;
+	@Field(order = 20)
+	private final Point second;
+
+	public Box(Point lowerLeft, Point upperRight) {
+		Assert.notNull(lowerLeft);
+		Assert.notNull(upperRight);
+		this.first = lowerLeft;
+		this.second = upperRight;
+	}
+
+	public Box(double[] lowerLeft, double[] upperRight) {
+		Assert.isTrue(lowerLeft.length == 2, "Point array has to have 2 elements!");
+		Assert.isTrue(upperRight.length == 2, "Point array has to have 2 elements!");
+		this.first = new Point(lowerLeft[0], lowerLeft[1]);
+		this.second = new Point(upperRight[0], upperRight[1]);
+	}
+
+	public Point getLowerLeft() {
+		return first;
+	}
+
+	public Point getUpperRight() {
+		return second;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.geo.Shape#asList()
+	 */
+	public List<? extends Object> asList() {
+		List<List<Double>> list = new ArrayList<List<Double>>();
+		list.add(getLowerLeft().asList());
+		list.add(getUpperRight().asList());
+		return list;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.geo.Shape#getCommand()
+	 */
+	public String getCommand() {
+		return "$box";
+	}
+
+	@Override
+	public String toString() {
+		return String.format("Box [%s, %s]", first, second);
+	}
+
+	@Override
+	public int hashCode() {
+
+		int result = 31;
+		result += 17 * first.hashCode();
+		result += 17 * second.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;
+		}
+		Box that = (Box) obj;
+		return this.first.equals(that.first) && this.second.equals(that.second);
+	}
+}

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

@@ -0,0 +1,138 @@
+/*
+ * Copyright 2010-2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.geo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.util.Assert;
+
+/**
+ * Represents a geospatial circle value
+ * 
+ * @author Mark Pollack
+ * @author Oliver Gierke
+ */
+public class Circle implements Shape {
+
+	private final Point center;
+	private final double radius;
+
+	/**
+	 * Creates a new {@link Circle} from the given {@link Point} and radius.
+	 * 
+	 * @param center must not be {@literal null}.
+	 * @param radius must be greater or equal to zero.
+	 */
+	@PersistenceConstructor
+	public Circle(Point center, double radius) {
+
+		Assert.notNull(center);
+		Assert.isTrue(radius >= 0, "Radius must not be negative!");
+
+		this.center = center;
+		this.radius = radius;
+	}
+
+	/**
+	 * Creates a new {@link Circle} from the given coordinates and radius.
+	 * 
+	 * @param centerX
+	 * @param centerY
+	 * @param radius must be greater or equal to zero.
+	 */
+	public Circle(double centerX, double centerY, double radius) {
+		this(new Point(centerX, centerY), radius);
+	}
+
+	/**
+	 * Returns the center of the {@link Circle}.
+	 * 
+	 * @return will never be {@literal null}.
+	 */
+	public Point getCenter() {
+		return center;
+	}
+
+	/**
+	 * Returns the radius of the {@link Circle}.
+	 * 
+	 * @return
+	 */
+	public double getRadius() {
+		return radius;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.geo.Shape#asList()
+	 */
+	public List<Object> asList() {
+		List<Object> result = new ArrayList<Object>();
+		result.add(getCenter().asList());
+		result.add(getRadius());
+		return result;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.geo.Shape#getCommand()
+	 */
+	public String getCommand() {
+		return "$center";
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return String.format("Circle [center=%s, radius=%f]", center, radius);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	@Override
+	public boolean equals(Object obj) {
+
+		if (this == obj) {
+			return true;
+		}
+
+		if (obj == null || !getClass().equals(obj.getClass())) {
+			return false;
+		}
+
+		Circle that = (Circle) obj;
+
+		return this.center.equals(that.center) && this.radius == that.radius;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Object#hashCode()
+	 */
+	@Override
+	public int hashCode() {
+		int result = 17;
+		result += 31 * center.hashCode();
+		result += 31 * radius;
+		return result;
+	}
+}

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

@@ -13,29 +13,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.mongodb.core.index;
+package org.springframework.data.mongodb.core.geo;
 
 /**
- * Geoposatial index type.
+ * Value object to create custom {@link Metric}s on the fly.
  * 
- * @author Laurent Canet
  * @author Oliver Gierke
- * @since 1.4
  */
-public enum GeoSpatialIndexType {
+public class CustomMetric implements Metric {
+
+	private final double multiplier;
 
 	/**
-	 * Simple 2-Dimensional index for legacy-format points.
+	 * Creates a custom {@link Metric} using the given multiplier.
+	 * 
+	 * @param multiplier
 	 */
-	GEO_2D,
+	public CustomMetric(double multiplier) {
+		this.multiplier = multiplier;
+	}
 
-	/**
-	 * 2D Index for GeoJSON-formatted data over a sphere. Only available in Mongo 2.4.
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.geo.Metric#getMultiplier()
 	 */
-	GEO_2DSPHERE,
-
-	/**
-	 * An haystack index for grouping results over small results.
-	 */
-	GEO_HAYSTACK
+	public double getMultiplier() {
+		return multiplier;
+	}
 }

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

@@ -0,0 +1,145 @@
+/*
+ * Copyright 2010-2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.geo;
+
+import org.springframework.util.ObjectUtils;
+
+/**
+ * Value object to represent distances in a given metric.
+ * 
+ * @author Oliver Gierke
+ */
+public class Distance {
+
+	private final double value;
+	private final Metric metric;
+
+	/**
+	 * Creates a new {@link Distance}.
+	 * 
+	 * @param value
+	 */
+	public Distance(double value) {
+		this(value, Metrics.NEUTRAL);
+	}
+
+	/**
+	 * Creates a new {@link Distance} with the given {@link Metric}.
+	 * 
+	 * @param value
+	 * @param metric
+	 */
+	public Distance(double value, Metric metric) {
+		this.value = value;
+		this.metric = metric == null ? Metrics.NEUTRAL : metric;
+	}
+
+	/**
+	 * @return the value
+	 */
+	public double getValue() {
+		return value;
+	}
+
+	/**
+	 * Returns the normalized value regarding the underlying {@link Metric}.
+	 * 
+	 * @return
+	 */
+	public double getNormalizedValue() {
+		return value / metric.getMultiplier();
+	}
+
+	/**
+	 * @return the metric
+	 */
+	public Metric getMetric() {
+		return metric;
+	}
+
+	/**
+	 * Adds the given distance to the current one. The resulting {@link Distance} will be in the same metric as the
+	 * current one.
+	 * 
+	 * @param other
+	 * @return
+	 */
+	public Distance add(Distance other) {
+		double newNormalizedValue = getNormalizedValue() + other.getNormalizedValue();
+		return new Distance(newNormalizedValue * metric.getMultiplier(), metric);
+	}
+
+	/**
+	 * Adds the given {@link Distance} to the current one and forces the result to be in a given {@link Metric}.
+	 * 
+	 * @param other
+	 * @param metric
+	 * @return
+	 */
+	public Distance add(Distance other, Metric metric) {
+		double newLeft = getNormalizedValue() * metric.getMultiplier();
+		double newRight = other.getNormalizedValue() * metric.getMultiplier();
+		return new Distance(newLeft + newRight, metric);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	@Override
+	public boolean equals(Object obj) {
+
+		if (this == obj) {
+			return true;
+		}
+
+		if (obj == null || !getClass().equals(obj.getClass())) {
+			return false;
+		}
+
+		Distance that = (Distance) obj;
+
+		return this.value == that.value && ObjectUtils.nullSafeEquals(this.metric, that.metric);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Object#hashCode()
+	 */
+	@Override
+	public int hashCode() {
+		int result = 17;
+		result += 31 * Double.doubleToLongBits(value);
+		result += 31 * ObjectUtils.nullSafeHashCode(metric);
+		return result;
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+
+		StringBuilder builder = new StringBuilder();
+		builder.append(value);
+
+		if (metric != Metrics.NEUTRAL) {
+			builder.append(" ").append(metric.toString());
+		}
+
+		return builder.toString();
+	}
+}

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

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *			http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.geo;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+
+/**
+ * Custom {@link Page} to carry the average distance retrieved from the {@link GeoResults} the {@link GeoPage} is set up
+ * from.
+ * 
+ * @author Oliver Gierke
+ */
+public class GeoPage<T> extends PageImpl<GeoResult<T>> {
+
+	private static final long serialVersionUID = 23421312312412L;
+	private final Distance averageDistance;
+
+	/**
+	 * Creates a new {@link GeoPage} from the given {@link GeoResults}.
+	 * 
+	 * @param content must not be {@literal null}.
+	 */
+	public GeoPage(GeoResults<T> results) {
+		super(results.getContent());
+		this.averageDistance = results.getAverageDistance();
+	}
+
+	/**
+	 * Creates a new {@link GeoPage} from the given {@link GeoResults}, {@link Pageable} and total.
+	 * 
+	 * @param results must not be {@literal null}.
+	 * @param pageable must not be {@literal null}.
+	 * @param total
+	 */
+	public GeoPage(GeoResults<T> results, Pageable pageable, long total) {
+		super(results.getContent(), pageable, total);
+		this.averageDistance = results.getAverageDistance();
+	}
+
+	/**
+	 * Returns the average distance of the underlying results.
+	 * 
+	 * @return the averageDistance
+	 */
+	public Distance getAverageDistance() {
+		return averageDistance;
+	}
+}

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

@@ -0,0 +1,102 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *			http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.geo;
+
+import org.springframework.util.Assert;
+
+/**
+ * Calue object capturing some arbitrary object plus a distance.
+ * 
+ * @author Oliver Gierke
+ */
+public class GeoResult<T> {
+
+	private final T content;
+	private final Distance distance;
+
+	/**
+	 * Creates a new {@link GeoResult} for the given content and distance.
+	 * 
+	 * @param content must not be {@literal null}.
+	 * @param distance must not be {@literal null}.
+	 */
+	public GeoResult(T content, Distance distance) {
+		Assert.notNull(content);
+		Assert.notNull(distance);
+		this.content = content;
+		this.distance = distance;
+	}
+
+	/**
+	 * Returns the actual content object.
+	 * 
+	 * @return the content
+	 */
+	public T getContent() {
+		return content;
+	}
+
+	/**
+	 * Returns the distance the actual content object has from the origin.
+	 * 
+	 * @return the distance
+	 */
+	public Distance getDistance() {
+		return distance;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	@Override
+	public boolean equals(Object obj) {
+
+		if (this == obj) {
+			return true;
+		}
+
+		if (obj == null || !getClass().equals(obj.getClass())) {
+			return false;
+		}
+
+		GeoResult<?> that = (GeoResult<?>) obj;
+
+		return this.content.equals(that.content) && this.distance.equals(that.distance);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Object#hashCode()
+	 */
+	@Override
+	public int hashCode() {
+
+		int result = 17;
+		result += 31 * distance.hashCode();
+		result += 31 * content.hashCode();
+		return result;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return String.format("GeoResult [content: %s, distance: %s, ]", content.toString(), distance.toString());
+	}
+}

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

@@ -0,0 +1,145 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *			http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.geo;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+/**
+ * Value object to capture {@link GeoResult}s as well as the average distance they have.
+ * 
+ * @author Oliver Gierke
+ */
+public class GeoResults<T> implements Iterable<GeoResult<T>> {
+
+	private final List<GeoResult<T>> results;
+	private final Distance averageDistance;
+
+	/**
+	 * Creates a new {@link GeoResults} instance manually calculating the average distance from the distance values of the
+	 * given {@link GeoResult}s.
+	 * 
+	 * @param results must not be {@literal null}.
+	 */
+	public GeoResults(List<GeoResult<T>> results) {
+		this(results, (Metric) null);
+	}
+
+	public GeoResults(List<GeoResult<T>> results, Metric metric) {
+		this(results, calculateAverageDistance(results, metric));
+	}
+
+	/**
+	 * Creates a new {@link GeoResults} instance from the given {@link GeoResult}s and average distance.
+	 * 
+	 * @param results must not be {@literal null}.
+	 * @param averageDistance
+	 */
+	@PersistenceConstructor
+	public GeoResults(List<GeoResult<T>> results, Distance averageDistance) {
+		Assert.notNull(results);
+		this.results = results;
+		this.averageDistance = averageDistance;
+	}
+
+	/**
+	 * Returns the average distance of all {@link GeoResult}s in this list.
+	 * 
+	 * @return the averageDistance
+	 */
+	public Distance getAverageDistance() {
+		return averageDistance;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Iterable#iterator()
+	 */
+	public Iterator<GeoResult<T>> iterator() {
+		return results.iterator();
+	}
+
+	/**
+	 * Returns the actual
+	 * 
+	 * @return
+	 */
+	public List<GeoResult<T>> getContent() {
+		return Collections.unmodifiableList(results);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	@Override
+	public boolean equals(Object obj) {
+
+		if (this == obj) {
+			return true;
+		}
+
+		if (obj == null || !getClass().equals(obj.getClass())) {
+			return false;
+		}
+
+		GeoResults<?> that = (GeoResults<?>) obj;
+
+		return this.results.equals(that.results) && this.averageDistance == that.averageDistance;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Object#hashCode()
+	 */
+	@Override
+	public int hashCode() {
+		int result = 17;
+		result += 31 * results.hashCode();
+		result += 31 * averageDistance.hashCode();
+		return result;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return String.format("GeoResults: [averageDistance: %s, results: %s]", averageDistance.toString(),
+				StringUtils.collectionToCommaDelimitedString(results));
+	}
+
+	private static Distance calculateAverageDistance(List<? extends GeoResult<?>> results, Metric metric) {
+
+		if (results.isEmpty()) {
+			return new Distance(0, metric);
+		}
+
+		double averageDistance = 0;
+
+		for (GeoResult<?> result : results) {
+			averageDistance += result.getDistance().getValue();
+		}
+
+		return new Distance(averageDistance / results.size(), metric);
+	}
+}

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

@@ -0,0 +1,16 @@
+package org.springframework.data.mongodb.core.geo;
+
+/**
+ * Interface for {@link Metric}s that can be applied to a base scale.
+ * 
+ * @author Oliver Gierke
+ */
+public interface Metric {
+
+	/**
+	 * Returns the multiplier to calculate metrics values from a base scale.
+	 * 
+	 * @return
+	 */
+	double getMultiplier();
+}

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

@@ -0,0 +1,27 @@
+package org.springframework.data.mongodb.core.geo;
+
+import org.springframework.data.mongodb.core.query.NearQuery;
+
+/**
+ * Commonly used {@link Metrics} for {@link NearQuery}s.
+ * 
+ * @author Oliver Gierke
+ */
+public enum Metrics implements Metric {
+
+	KILOMETERS(6378.137), MILES(3963.191), NEUTRAL(1);
+
+	private final double multiplier;
+
+	private Metrics(double multiplier) {
+		this.multiplier = multiplier;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.geo.Metric#getMultiplier()
+	 */
+	public double getMultiplier() {
+		return multiplier;
+	}
+}

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

@@ -0,0 +1,103 @@
+/*
+ * Copyright 2010-2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.geo;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.util.Assert;
+
+/**
+ * Represents a geospatial point value.
+ * 
+ * @author Mark Pollack
+ * @author Oliver Gierke
+ */
+public class Point {
+
+	@Field(order = 10)
+	private final double x;
+	@Field(order = 20)
+	private final double y;
+
+	@PersistenceConstructor
+	public Point(double x, double y) {
+		this.x = x;
+		this.y = y;
+	}
+
+	public Point(Point point) {
+		Assert.notNull(point);
+		this.x = point.x;
+		this.y = point.y;
+	}
+
+	public double getX() {
+		return x;
+	}
+
+	public double getY() {
+		return y;
+	}
+
+	public double[] asArray() {
+		return new double[] { x, y };
+	}
+
+	public List<Double> asList() {
+		return Arrays.asList(x, y);
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		long temp;
+		temp = Double.doubleToLongBits(x);
+		result = prime * result + (int) (temp ^ (temp >>> 32));
+		temp = Double.doubleToLongBits(y);
+		result = prime * result + (int) (temp ^ (temp >>> 32));
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (obj == null) {
+			return false;
+		}
+		if (getClass() != obj.getClass()) {
+			return false;
+		}
+		Point other = (Point) obj;
+		if (Double.doubleToLongBits(x) != Double.doubleToLongBits(other.x)) {
+			return false;
+		}
+		if (Double.doubleToLongBits(y) != Double.doubleToLongBits(other.y)) {
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public String toString() {
+		return String.format("Point [latitude=%f, longitude=%f]", x, y);
+	}
+}

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

@@ -0,0 +1,113 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.geo;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+import org.springframework.util.Assert;
+
+/**
+ * Simple value object to represent a {@link Polygon}.
+ * 
+ * @author Oliver Gierke
+ */
+public class Polygon implements Shape, Iterable<Point> {
+
+	private final List<Point> points;
+
+	/**
+	 * Creates a new {@link Polygon} for the given Points.
+	 * 
+	 * @param x
+	 * @param y
+	 * @param z
+	 * @param others
+	 */
+	public Polygon(Point x, Point y, Point z, Point... others) {
+
+		Assert.notNull(x);
+		Assert.notNull(y);
+		Assert.notNull(z);
+		Assert.notNull(others);
+
+		this.points = new ArrayList<Point>(3 + others.length);
+		this.points.addAll(Arrays.asList(x, y, z));
+		this.points.addAll(Arrays.asList(others));
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.geo.Shape#asList()
+	 */
+	public List<List<Double>> asList() {
+
+		List<List<Double>> result = new ArrayList<List<Double>>();
+
+		for (Point point : points) {
+			result.add(point.asList());
+		}
+
+		return result;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.geo.Shape#getCommand()
+	 */
+	public String getCommand() {
+		return "$polygon";
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Iterable#iterator()
+	 */
+	public Iterator<Point> iterator() {
+		return this.points.iterator();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	@Override
+	public boolean equals(Object obj) {
+
+		if (this == obj) {
+			return true;
+		}
+
+		if (obj == null || !getClass().equals(obj.getClass())) {
+			return false;
+		}
+
+		Polygon that = (Polygon) obj;
+
+		return this.points.equals(that.points);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Object#hashCode()
+	 */
+	@Override
+	public int hashCode() {
+		return points.hashCode();
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,30 +13,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.mongodb.repository;
+package org.springframework.data.mongodb.core.geo;
 
 import java.util.List;
 
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-
 /**
- * @author Thomas Darimont
+ * Common interface for all shapes. Allows building MongoDB representations of them.
+ * 
+ * @author Oliver Gierke
  */
-public interface RedeclaringRepositoryMethodsRepository extends MongoRepository<Person, String> {
+public interface Shape {
 
 	/**
-	 * Should not find any users at all.
-	 */
-	@Query("{ 'firstname' : '' }")
-	List<Person> findAll();
-
-	/**
-	 * Should only find users with the firstname 'Oliver'.
+	 * Returns the {@link Shape} as a list of usually {@link Double} or {@link List}s of {@link Double}s. Wildcard bound
+	 * to allow implementations to return a more concrete element type.
 	 * 
-	 * @param page
 	 * @return
 	 */
-	@Query("{ 'firstname' : 'Oliver August' }")
-	Page<Person> findAll(Pageable page);
+	List<? extends Object> asList();
+
+	/**
+	 * Returns the command to be used to create the {@literal $within} criterion.
+	 * 
+	 * @return
+	 */
+	String getCommand();
 }

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

@@ -1,152 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.geo;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.springframework.data.annotation.PersistenceConstructor;
-import org.springframework.data.geo.Circle;
-import org.springframework.data.geo.Distance;
-import org.springframework.data.geo.Point;
-import org.springframework.data.geo.Shape;
-import org.springframework.util.Assert;
-
-/**
- * Represents a geospatial sphere value.
- * 
- * @author Thomas Darimont
- * @since 1.5
- */
-public class Sphere implements Shape {
-
-	public static final String COMMAND = "$centerSphere";
-	private final Point center;
-	private final Distance radius;
-
-	/**
-	 * Creates a Sphere around the given center {@link Point} with the given radius.
-	 * 
-	 * @param center must not be {@literal null}.
-	 * @param radius must not be {@literal null}.
-	 */
-	@PersistenceConstructor
-	public Sphere(Point center, Distance radius) {
-
-		Assert.notNull(center);
-		Assert.notNull(radius);
-		Assert.isTrue(radius.getValue() >= 0, "Radius must not be negative!");
-
-		this.center = center;
-		this.radius = radius;
-	}
-
-	/**
-	 * Creates a Sphere around the given center {@link Point} with the given radius.
-	 * 
-	 * @param center
-	 * @param radius
-	 */
-	public Sphere(Point center, double radius) {
-		this(center, new Distance(radius));
-	}
-
-	/**
-	 * Creates a Sphere from the given {@link Circle}.
-	 * 
-	 * @param circle
-	 */
-	public Sphere(Circle circle) {
-		this(circle.getCenter(), circle.getRadius());
-	}
-
-	/**
-	 * Returns the center of the {@link Circle}.
-	 * 
-	 * @return will never be {@literal null}.
-	 */
-	public Point getCenter() {
-		return new Point(this.center);
-	}
-
-	/**
-	 * Returns the radius of the {@link Circle}.
-	 * 
-	 * @return
-	 */
-	public Distance getRadius() {
-		return radius;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return String.format("Sphere [center=%s, radius=%s]", center, radius);
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object obj) {
-
-		if (this == obj) {
-			return true;
-		}
-
-		if (obj == null || !(obj instanceof Sphere)) {
-			return false;
-		}
-
-		Sphere that = (Sphere) obj;
-
-		return this.center.equals(that.center) && this.radius.equals(that.radius);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-		int result = 17;
-		result += 31 * center.hashCode();
-		result += 31 * radius.hashCode();
-		return result;
-	}
-
-	/**
-	 * Returns the {@link Shape} as a list of usually {@link Double} or {@link List}s of {@link Double}s. Wildcard bound
-	 * to allow implementations to return a more concrete element type.
-	 * 
-	 * @return
-	 */
-	public List<? extends Object> asList() {
-		return Arrays.asList(Arrays.asList(center.getX(), center.getY()), this.radius.getValue());
-	}
-
-	/**
-	 * Returns the command to be used to create the {@literal $within} criterion.
-	 * 
-	 * @return
-	 */
-	public String getCommand() {
-		return COMMAND;
-	}
-}

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

@@ -1,18 +1,3 @@
-/*
- * 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.
- */
 /**
  * Support for MongoDB geo-spatial queries.
  */

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

@@ -36,12 +36,11 @@ public @interface CompoundIndex {
 
 	/**
 	 * The actual index definition in JSON format. The keys of the JSON document are the fields to be indexed, the values
-	 * define the index direction (1 for ascending, -1 for descending). <br />
-	 * If left empty on nested document, the whole document will be indexed.
+	 * define the index direction (1 for ascending, -1 for descending).
 	 * 
 	 * @return
 	 */
-	String def() default "";
+	String def();
 
 	/**
 	 * It does not actually make sense to use that attribute as the direction has to be defined in the {@link #def()}
@@ -52,87 +51,25 @@ 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;
 
 	/**
-	 * The name of the index to be created. <br />
-	 * <br />
-	 * The name will only be applied as is when defined on root level. For usage on nested or embedded structures the
-	 * provided name will be prefixed with the path leading to the entity. <br />
-	 * <br />
-	 * The structure below
-	 * 
-	 * <pre>
-	 * <code>
-	 * &#64;Document
-	 * class Root {
-	 *   Hybrid hybrid;
-	 *   Nested nested;
-	 * }
-	 * 
-	 * &#64;Document
-	 * &#64;CompoundIndex(name = "compound_index", def = "{'h1': 1, 'h2': 1}")
-	 * class Hybrid {
-	 *   String h1, h2;
-	 * }
-	 * 
-	 * &#64;CompoundIndex(name = "compound_index", def = "{'n1': 1, 'n2': 1}")
-	 * class Nested {
-	 *   String n1, n2;
-	 * }
-	 * </code>
-	 * </pre>
-	 * 
-	 * resolves in the following index structures
-	 * 
-	 * <pre>
-	 * <code>
-	 * db.root.ensureIndex( { hybrid.h1: 1, hybrid.h2: 1 } , { name: "hybrid.compound_index" } )
-	 * db.root.ensureIndex( { nested.n1: 1, nested.n2: 1 } , { name: "nested.compound_index" } )
-	 * db.hybrid.ensureIndex( { h1: 1, h2: 1 } , { name: "compound_index" } )
-	 * </code>
-	 * </pre>
+	 * The name of the index to be created.
 	 * 
 	 * @return
 	 */
 	String name() default "";
 
-	/**
-	 * If set to {@literal true} then MongoDB will ignore the given index name and instead generate a new name. Defaults
-	 * to {@literal false}.
-	 * 
-	 * @return
-	 * @since 1.5
-	 */
-	boolean useGeneratedName() default false;
-
 	/**
 	 * The collection the index will be created in. Will default to the collection the annotated domain class will be
 	 * stored in.
 	 * 
 	 * @return
-	 * @deprecated The collection name is derived from the domain type. Fixing the collection via this attribute might
-	 *             result in broken definitions. Will be removed in 1.7.
 	 */
-	@Deprecated
 	String collection() default "";
 
 	/**
@@ -143,4 +80,11 @@ public @interface CompoundIndex {
 	 */
 	boolean background() default false;
 
+	/**
+	 * Configures the number of seconds after which the collection should expire. Defaults to -1 for no expiry.
+	 * 
+	 * @see http://docs.mongodb.org/manual/tutorial/expire-data/
+	 * @return
+	 */
+	int expireAfterSeconds() default -1;
 }

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

@@ -1,56 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.index;
-
-import org.springframework.util.Assert;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-
-/**
- * Index definition to span multiple keys.
- * 
- * @author Christoph Strobl
- * @since 1.5
- */
-public class CompoundIndexDefinition extends Index {
-
-	private DBObject keys;
-
-	/**
-	 * Creates a new {@link CompoundIndexDefinition} for the given keys.
-	 * 
-	 * @param keys must not be {@literal null}.
-	 */
-	public CompoundIndexDefinition(DBObject keys) {
-
-		Assert.notNull(keys, "Keys must not be null!");
-		this.keys = keys;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.index.Index#getIndexKeys()
-	 */
-	@Override
-	public DBObject getIndexKeys() {
-
-		BasicDBObject dbo = new BasicDBObject();
-		dbo.putAll(this.keys);
-		dbo.putAll(super.getIndexKeys());
-		return dbo;
-	}
-}

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2010-2014 the original author or authors.
+ * Copyright (c) 2011 by the original author(s).
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.data.mongodb.core.index;
 
 import java.lang.annotation.ElementType;
@@ -23,72 +24,24 @@ import java.lang.annotation.Target;
 /**
  * Mark a field to be indexed using MongoDB's geospatial indexing feature.
  * 
- * @author Jon Brisbin
- * @author Laurent Canet
- * @author Thomas Darimont
+ * @author Jon Brisbin <jbrisbin@vmware.com>
  */
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface GeoSpatialIndexed {
 
 	/**
-	 * Index name. <br />
-	 * <br />
-	 * The name will only be applied as is when defined on root level. For usage on nested or embedded structures the
-	 * provided name will be prefixed with the path leading to the entity. <br />
-	 * <br />
-	 * The structure below
-	 * 
-	 * <pre>
-	 * <code>
-	 * &#64;Document
-	 * class Root {
-	 *   Hybrid hybrid;
-	 *   Nested nested;
-	 * }
-	 * 
-	 * &#64;Document
-	 * class Hybrid {
-	 *   &#64;GeoSpatialIndexed(name="index") Point h1;
-	 * }
-	 * 
-	 * class Nested {
-	 *   &#64;GeoSpatialIndexed(name="index") Point n1;
-	 * }
-	 * </code>
-	 * </pre>
-	 * 
-	 * resolves in the following index structures
-	 * 
-	 * <pre>
-	 * <code>
-	 * db.root.ensureIndex( { hybrid.h1: "2d" } , { name: "hybrid.index" } )
-	 * db.root.ensureIndex( { nested.n1: "2d" } , { name: "nested.index" } )
-	 * db.hybrid.ensureIndex( { h1: "2d" } , { name: "index" } )
-	 * </code>
-	 * </pre>
+	 * Name of the property in the document that contains the [x, y] or radial coordinates to index.
 	 * 
 	 * @return
 	 */
 	String name() default "";
 
-	/**
-	 * If set to {@literal true} then MongoDB will ignore the given index name and instead generate a new name. Defaults
-	 * to {@literal false}.
-	 * 
-	 * @return
-	 * @since 1.5
-	 */
-	boolean useGeneratedName() default false;
-
 	/**
 	 * Name of the collection in which to create the index.
 	 * 
 	 * @return
-	 * @deprecated The collection name is derived from the domain type. Fixing the collection via this attribute might
-	 *             result in broken definitions. Will be removed in 1.7.
 	 */
-	@Deprecated
 	String collection() default "";
 
 	/**
@@ -112,27 +65,4 @@ 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-2014 the original author or authors.
+ * Copyright 2010-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 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;
@@ -26,19 +25,14 @@ import com.mongodb.DBObject;
  * 
  * @author Jon Brisbin
  * @author Oliver Gierke
- * @author Laurent Canet
- * @author Christoph Strobl
  */
 public class GeospatialIndex implements IndexDefinition {
 
 	private final String field;
 	private String name;
-	private Integer min;
-	private Integer max;
-	private Integer bits;
-	private GeoSpatialIndexType type = GeoSpatialIndexType.GEO_2D;
-	private Double bucketSize = 1.0;
-	private String additionalField;
+	private Integer min = null;
+	private Integer max = null;
+	private Integer bits = null;
 
 	/**
 	 * Creates a new {@link GeospatialIndex} for the given field.
@@ -46,146 +40,53 @@ public class GeospatialIndex implements IndexDefinition {
 	 * @param field must not be empty or {@literal null}.
 	 */
 	public GeospatialIndex(String field) {
-
-		Assert.hasText(field, "Field must have text!");
-
+		Assert.hasText(field);
 		this.field = field;
 	}
 
-	/**
-	 * @param name must not be {@literal null} or empty.
-	 * @return
-	 */
 	public GeospatialIndex named(String name) {
-
 		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();
-
-		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);
-		}
-
+		dbo.put(field, "2d");
 		return dbo;
 	}
 
 	public DBObject getIndexOptions() {
-
-		if (!StringUtils.hasText(name) && min == null && max == null && bucketSize == null) {
+		if (name == null && min == null && max == null) {
 			return null;
 		}
-
 		DBObject dbo = new BasicDBObject();
-		if (StringUtils.hasText(name)) {
+		if (name != null) {
 			dbo.put("name", name);
 		}
-
-		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;
+		if (min != null) {
+			dbo.put("min", min);
+		}
+		if (max != null) {
+			dbo.put("max", max);
+		}
+		if (bits != null) {
+			dbo.put("bits", bits);
 		}
-
 		return dbo;
 	}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 the original author or authors.
+ * Copyright 2010-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,35 +17,18 @@ package org.springframework.data.mongodb.core.index;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
 
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.mongodb.core.query.Order;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
 
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
 
-/**
- * @author Oliver Gierke
- * @author Christoph Strobl
- */
 @SuppressWarnings("deprecation")
 public class Index implements IndexDefinition {
 
 	public enum Duplicates {
-		RETAIN, //
-
-		/**
-		 * Dropping Duplicates was removed in MongoDB Server 2.8.0-rc0.
-		 * <p>
-		 * See https://jira.mongodb.org/browse/SERVER-14710
-		 * 
-		 * @deprecated since 1.7.
-		 */
-		@Deprecated//
-		DROP
+		RETAIN, DROP
 	}
 
 	private final Map<String, Direction> fieldSpec = new LinkedHashMap<String, Direction>();
@@ -58,11 +41,8 @@ public class Index implements IndexDefinition {
 
 	private boolean sparse = false;
 
-	private boolean background = false;
-
-	private long expire = -1;
-
-	public Index() {}
+	public Index() {
+	}
 
 	public Index(String key, Direction direction) {
 		fieldSpec.put(key, direction);
@@ -103,71 +83,16 @@ 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;
 	}
 
-	/**
-	 * Build the index in background (non blocking).
-	 * 
-	 * @return
-	 * @since 1.5
-	 */
-	public Index background() {
-
-		this.background = true;
-		return this;
-	}
-
-	/**
-	 * Specifies TTL in seconds.
-	 * 
-	 * @param value
-	 * @return
-	 * @since 1.5
-	 */
-	public Index expire(long value) {
-		return expire(value, TimeUnit.SECONDS);
-	}
-
-	/**
-	 * Specifies TTL with given {@link TimeUnit}.
-	 * 
-	 * @param value
-	 * @param unit
-	 * @return
-	 * @since 1.5
-	 */
-	public Index expire(long value, TimeUnit unit) {
-
-		Assert.notNull(unit, "TimeUnit for expiration must not be null.");
-		this.expire = unit.toSeconds(value);
-		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;
@@ -184,9 +109,11 @@ public class Index implements IndexDefinition {
 	}
 
 	public DBObject getIndexOptions() {
-
+		if (name == null && !unique) {
+			return null;
+		}
 		DBObject dbo = new BasicDBObject();
-		if (StringUtils.hasText(name)) {
+		if (name != null) {
 			dbo.put("name", name);
 		}
 		if (unique) {
@@ -198,13 +125,6 @@ public class Index implements IndexDefinition {
 		if (sparse) {
 			dbo.put("sparse", true);
 		}
-		if (background) {
-			dbo.put("background", true);
-		}
-		if (expire >= 0) {
-			dbo.put("expireAfterSeconds", expire);
-		}
-
 		return dbo;
 	}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2014 by the original author(s).
+ * Copyright (c) 2011 by the original author(s).
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,11 +20,11 @@ import com.mongodb.DBObject;
 
 /**
  * @author Jon Brisbin <jbrisbin@vmware.com>
- * @author Christoph Strobl
  */
 public interface IndexDefinition {
 
 	DBObject getIndexKeys();
 
 	DBObject getIndexOptions();
+
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,33 +24,22 @@ import org.springframework.util.ObjectUtils;
  * Value object for an index field.
  * 
  * @author Oliver Gierke
- * @author Christoph Strobl
  */
 @SuppressWarnings("deprecation")
 public final class IndexField {
 
-	enum Type {
-		GEO, TEXT, DEFAULT;
-	}
-
 	private final String key;
 	private final Direction direction;
-	private final Type type;
-	private final Float weight;
+	private final boolean isGeo;
 
-	private IndexField(String key, Direction direction, Type type) {
-		this(key, direction, type, Float.NaN);
-	}
-
-	private IndexField(String key, Direction direction, Type type, Float weight) {
+	private IndexField(String key, Direction direction, boolean isGeo) {
 
 		Assert.hasText(key);
-		Assert.isTrue(direction != null ^ (Type.GEO.equals(type) || Type.TEXT.equals(type)));
+		Assert.isTrue(direction != null ^ isGeo);
 
 		this.key = key;
 		this.direction = direction;
-		this.type = type == null ? Type.DEFAULT : type;
-		this.weight = weight == null ? Float.NaN : weight;
+		this.isGeo = isGeo;
 	}
 
 	/**
@@ -64,12 +53,12 @@ public final class IndexField {
 	@Deprecated
 	public static IndexField create(String key, Order order) {
 		Assert.notNull(order);
-		return new IndexField(key, order.toDirection(), Type.DEFAULT);
+		return new IndexField(key, order.toDirection(), false);
 	}
 
 	public static IndexField create(String key, Direction order) {
 		Assert.notNull(order);
-		return new IndexField(key, order, Type.DEFAULT);
+		return new IndexField(key, order, false);
 	}
 
 	/**
@@ -79,16 +68,7 @@ public final class IndexField {
 	 * @return
 	 */
 	public static IndexField geo(String key) {
-		return new IndexField(key, null, Type.GEO);
-	}
-
-	/**
-	 * Creates a text {@link IndexField} for the given key.
-	 * 
-	 * @since 1.6
-	 */
-	public static IndexField text(String key, Float weight) {
-		return new IndexField(key, null, Type.TEXT, weight);
+		return new IndexField(key, null, true);
 	}
 
 	/**
@@ -121,20 +101,10 @@ public final class IndexField {
 	/**
 	 * Returns whether the {@link IndexField} is a geo index field.
 	 * 
-	 * @return true if type is {@link Type#GEO}.
+	 * @return the isGeo
 	 */
 	public boolean isGeo() {
-		return Type.GEO.equals(type);
-	}
-
-	/**
-	 * Returns wheter the {@link IndexField} is a text index field.
-	 * 
-	 * @return true if type is {@link Type#TEXT}
-	 * @since 1.6
-	 */
-	public boolean isText() {
-		return Type.TEXT.equals(type);
+		return isGeo;
 	}
 
 	/*
@@ -155,7 +125,7 @@ public final class IndexField {
 		IndexField that = (IndexField) obj;
 
 		return this.key.equals(that.key) && ObjectUtils.nullSafeEquals(this.direction, that.direction)
-				&& this.type == that.type;
+				&& this.isGeo == that.isGeo;
 	}
 
 	/* 
@@ -168,8 +138,7 @@ public final class IndexField {
 		int result = 17;
 		result += 31 * ObjectUtils.nullSafeHashCode(key);
 		result += 31 * ObjectUtils.nullSafeHashCode(direction);
-		result += 31 * ObjectUtils.nullSafeHashCode(type);
-		result += 31 * ObjectUtils.nullSafeHashCode(weight);
+		result += 31 * ObjectUtils.nullSafeHashCode(isGeo);
 		return result;
 	}
 
@@ -179,7 +148,6 @@ public final class IndexField {
 	 */
 	@Override
 	public String toString() {
-		return String.format("IndexField [ key: %s, direction: %s, type: %s, weight: %s]", key, direction, type, weight);
+		return String.format("IndexField [ key: %s, direction: %s, isGeo: %s]", key, direction, isGeo);
 	}
-
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,11 +23,6 @@ import java.util.List;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 
-/**
- * @author Mark Pollack
- * @author Oliver Gierke
- * @author Christoph Strobl
- */
 public class IndexInfo {
 
 	private final List<IndexField> indexFields;
@@ -36,30 +31,14 @@ public class IndexInfo {
 	private final boolean unique;
 	private final boolean dropDuplicates;
 	private final boolean sparse;
-	private final String language;
 
-	/**
-	 * @deprecated Will be removed in 1.7. Please use {@link #IndexInfo(List, String, boolean, boolean, boolean, String)}
-	 * @param indexFields
-	 * @param name
-	 * @param unique
-	 * @param dropDuplicates
-	 * @param sparse
-	 */
-	@Deprecated
 	public IndexInfo(List<IndexField> indexFields, String name, boolean unique, boolean dropDuplicates, boolean sparse) {
-		this(indexFields, name, unique, dropDuplicates, sparse, "");
-	}
-
-	public IndexInfo(List<IndexField> indexFields, String name, boolean unique, boolean dropDuplicates, boolean sparse,
-			String language) {
 
 		this.indexFields = Collections.unmodifiableList(indexFields);
 		this.name = name;
 		this.unique = unique;
 		this.dropDuplicates = dropDuplicates;
 		this.sparse = sparse;
-		this.language = language;
 	}
 
 	/**
@@ -105,23 +84,14 @@ public class IndexInfo {
 		return sparse;
 	}
 
-	/**
-	 * @return
-	 * @since 1.6
-	 */
-	public String getLanguage() {
-		return language;
-	}
-
 	@Override
 	public String toString() {
 		return "IndexInfo [indexFields=" + indexFields + ", name=" + name + ", unique=" + unique + ", dropDuplicates="
-				+ dropDuplicates + ", sparse=" + sparse + ", language=" + language + "]";
+				+ dropDuplicates + ", sparse=" + sparse + "]";
 	}
 
 	@Override
 	public int hashCode() {
-
 		final int prime = 31;
 		int result = 1;
 		result = prime * result + (dropDuplicates ? 1231 : 1237);
@@ -129,7 +99,6 @@ public class IndexInfo {
 		result = prime * result + ((name == null) ? 0 : name.hashCode());
 		result = prime * result + (sparse ? 1231 : 1237);
 		result = prime * result + (unique ? 1231 : 1237);
-		result = prime * result + ObjectUtils.nullSafeHashCode(language);
 		return result;
 	}
 
@@ -168,9 +137,6 @@ public class IndexInfo {
 		if (unique != other.unique) {
 			return false;
 		}
-		if (!ObjectUtils.nullSafeEquals(language, other.language)) {
-			return false;
-		}
 		return true;
 	}
 }

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

@@ -1,37 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.index;
-
-import org.springframework.data.mongodb.core.index.MongoPersistentEntityIndexResolver.IndexDefinitionHolder;
-
-/**
- * {@link IndexResolver} finds those {@link IndexDefinition}s to be created for a given class.
- * 
- * @author Christoph Strobl
- * @since 1.5
- */
-interface IndexResolver {
-
-	/**
-	 * Find and create {@link IndexDefinition}s for properties of given {@code type}. {@link IndexDefinition}s are created
-	 * for properties and types with {@link Indexed}, {@link CompoundIndexes} or {@link GeoSpatialIndexed}.
-	 * 
-	 * @param type
-	 * @return Empty {@link Iterable} in case no {@link IndexDefinition} could be resolved for type.
-	 */
-	Iterable<? extends IndexDefinitionHolder> resolveIndexForClass(Class<?> type);
-
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,94 +27,21 @@ import java.lang.annotation.Target;
  * @author Oliver Gierke
  * @author Philipp Schneider
  * @author Johno Crawford
- * @author Thomas Darimont
  */
 @Target(ElementType.FIELD)
 @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. <br />
-	 * <br />
-	 * The name will only be applied as is when defined on root level. For usage on nested or embedded structures the
-	 * provided name will be prefixed with the path leading to the entity. <br />
-	 * <br />
-	 * The structure below
-	 * 
-	 * <pre>
-	 * <code>
-	 * &#64;Document
-	 * class Root {
-	 *   Hybrid hybrid;
-	 *   Nested nested;
-	 * }
-	 * 
-	 * &#64;Document
-	 * class Hybrid {
-	 *   &#64;Indexed(name="index") String h1;
-	 * }
-	 * 
-	 * class Nested {
-	 *   &#64;Indexed(name="index") String n1;
-	 * }
-	 * </code>
-	 * </pre>
-	 * 
-	 * resolves in the following index structures
-	 * 
-	 * <pre>
-	 * <code>
-	 * db.root.ensureIndex( { hybrid.h1: 1 } , { name: "hybrid.index" } )
-	 * db.root.ensureIndex( { nested.n1: 1 } , { name: "nested.index" } )
-	 * db.hybrid.ensureIndex( { h1: 1} , { name: "index" } )
-	 * </code>
-	 * </pre>
-	 * 
-	 * @return
-	 */
 	String name() default "";
 
-	/**
-	 * If set to {@literal true} then MongoDB will ignore the given index name and instead generate a new name. Defaults
-	 * to {@literal false}.
-	 * 
-	 * @return
-	 * @since 1.5
-	 */
-	boolean useGeneratedName() default false;
-
-	/**
-	 * Collection name for index to be created on.
-	 * 
-	 * @return
-	 * @deprecated The collection name is derived from the domain type. Fixing the collection via this attribute might
-	 *             result in broken definitions. Will be removed in 1.7.
-	 */
-	@Deprecated
 	String collection() default "";
 
 	/**

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package org.springframework.data.mongodb.core.index;
 
+import java.lang.reflect.Field;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -22,15 +23,19 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationListener;
 import org.springframework.data.mapping.PersistentEntity;
+import org.springframework.data.mapping.PropertyHandler;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.context.MappingContextEvent;
 import org.springframework.data.mongodb.MongoDbFactory;
-import org.springframework.data.mongodb.core.index.MongoPersistentEntityIndexResolver.IndexDefinitionHolder;
-import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+import com.mongodb.util.JSON;
 
 /**
  * Component that inspects {@link MongoPersistentEntity} instances contained in the given {@link MongoMappingContext}
@@ -40,48 +45,30 @@ import org.springframework.util.Assert;
  * @author Oliver Gierke
  * @author Philipp Schneider
  * @author Johno Crawford
- * @author Laurent Canet
- * @author Christoph Strobl
  */
 public class MongoPersistentEntityIndexCreator implements
 		ApplicationListener<MappingContextEvent<MongoPersistentEntity<?>, MongoPersistentProperty>> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(MongoPersistentEntityIndexCreator.class);
+	private static final Logger log = LoggerFactory.getLogger(MongoPersistentEntityIndexCreator.class);
 
 	private final Map<Class<?>, Boolean> classesSeen = new ConcurrentHashMap<Class<?>, Boolean>();
 	private final MongoDbFactory mongoDbFactory;
 	private final MongoMappingContext mappingContext;
-	private final IndexResolver indexResolver;
 
 	/**
 	 * Creats a new {@link MongoPersistentEntityIndexCreator} for the given {@link MongoMappingContext} and
 	 * {@link MongoDbFactory}.
 	 * 
-	 * @param mappingContext must not be {@literal null}.
-	 * @param mongoDbFactory must not be {@literal null}.
+	 * @param mappingContext must not be {@literal null}
+	 * @param mongoDbFactory must not be {@literal null}
 	 */
 	public MongoPersistentEntityIndexCreator(MongoMappingContext mappingContext, MongoDbFactory mongoDbFactory) {
-		this(mappingContext, mongoDbFactory, new MongoPersistentEntityIndexResolver(mappingContext));
-	}
-
-	/**
-	 * Creats a new {@link MongoPersistentEntityIndexCreator} for the given {@link MongoMappingContext} and
-	 * {@link MongoDbFactory}.
-	 * 
-	 * @param mappingContext must not be {@literal null}.
-	 * @param mongoDbFactory must not be {@literal null}.
-	 * @param indexResolver must not be {@literal null}.
-	 */
-	public MongoPersistentEntityIndexCreator(MongoMappingContext mappingContext, MongoDbFactory mongoDbFactory,
-			IndexResolver indexResolver) {
 
 		Assert.notNull(mongoDbFactory);
 		Assert.notNull(mappingContext);
-		Assert.notNull(indexResolver);
 
 		this.mongoDbFactory = mongoDbFactory;
 		this.mappingContext = mappingContext;
-		this.indexResolver = indexResolver;
 
 		for (MongoPersistentEntity<?> entity : mappingContext.getPersistentEntities()) {
 			checkForIndexes(entity);
@@ -106,34 +93,85 @@ public class MongoPersistentEntityIndexCreator implements
 		}
 	}
 
-	private void checkForIndexes(final MongoPersistentEntity<?> entity) {
-
-		Class<?> type = entity.getType();
-
+	protected void checkForIndexes(final MongoPersistentEntity<?> entity) {
+		final Class<?> type = entity.getType();
 		if (!classesSeen.containsKey(type)) {
-
-			this.classesSeen.put(type, Boolean.TRUE);
-
-			if (LOGGER.isDebugEnabled()) {
-				LOGGER.debug("Analyzing class " + type + " for index information.");
+			if (log.isDebugEnabled()) {
+				log.debug("Analyzing class " + type + " for index information.");
 			}
 
-			checkForAndCreateIndexes(entity);
-		}
-	}
+			// Make sure indexes get created
+			if (type.isAnnotationPresent(CompoundIndexes.class)) {
+				CompoundIndexes indexes = type.getAnnotation(CompoundIndexes.class);
+				for (CompoundIndex index : indexes.value()) {
 
-	private void checkForAndCreateIndexes(MongoPersistentEntity<?> entity) {
+					String indexColl = StringUtils.hasText(index.collection()) ? index.collection() : entity.getCollection();
+					DBObject definition = (DBObject) JSON.parse(index.def());
 
-		if (entity.findAnnotation(Document.class) != null) {
-			for (IndexDefinitionHolder indexToCreate : indexResolver.resolveIndexForClass(entity.getType())) {
-				createIndex(indexToCreate);
+					ensureIndex(indexColl, index.name(), definition, index.unique(), index.dropDups(), index.sparse(),
+							index.background(), index.expireAfterSeconds());
+
+					if (log.isDebugEnabled()) {
+						log.debug("Created compound index " + index);
+					}
+				}
 			}
-		}
-	}
 
-	private void createIndex(IndexDefinitionHolder indexDefinition) {
-		mongoDbFactory.getDb().getCollection(indexDefinition.getCollection())
-				.createIndex(indexDefinition.getIndexKeys(), indexDefinition.getIndexOptions());
+			entity.doWithProperties(new PropertyHandler<MongoPersistentProperty>() {
+				public void doWithPersistentProperty(MongoPersistentProperty persistentProperty) {
+
+					Field field = persistentProperty.getField();
+
+					if (field.isAnnotationPresent(Indexed.class)) {
+
+						Indexed index = field.getAnnotation(Indexed.class);
+						String name = index.name();
+
+						if (!StringUtils.hasText(name)) {
+							name = persistentProperty.getFieldName();
+						} else {
+							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()
+											+ ". Setting sparse=true on this index will prevent errors when inserting documents.");
+								}
+							}
+						}
+
+						String collection = StringUtils.hasText(index.collection()) ? index.collection() : entity.getCollection();
+						int direction = index.direction() == IndexDirection.ASCENDING ? 1 : -1;
+						DBObject definition = new BasicDBObject(persistentProperty.getFieldName(), direction);
+
+						ensureIndex(collection, name, definition, index.unique(), index.dropDups(), index.sparse(),
+								index.background(), index.expireAfterSeconds());
+
+						if (log.isDebugEnabled()) {
+							log.debug("Created property index " + index);
+						}
+
+					} else if (field.isAnnotationPresent(GeoSpatialIndexed.class)) {
+
+						GeoSpatialIndexed index = field.getAnnotation(GeoSpatialIndexed.class);
+
+						GeospatialIndex indexObject = new GeospatialIndex(persistentProperty.getFieldName());
+						indexObject.withMin(index.min()).withMax(index.max());
+						indexObject.named(StringUtils.hasText(index.name()) ? index.name() : field.getName());
+
+						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(),
+									collection));
+						}
+					}
+				}
+			});
+
+			classesSeen.put(type, true);
+		}
 	}
 
 	/**
@@ -145,4 +183,33 @@ public class MongoPersistentEntityIndexCreator implements
 	public boolean isIndexCreatorFor(MappingContext<?, ?> context) {
 		return this.mappingContext.equals(context);
 	}
+
+	/**
+	 * Triggers the actual index creation.
+	 * 
+	 * @param collection the collection to create the index in
+	 * @param name the name of the index about to be created
+	 * @param indexDefinition the index definition
+	 * @param unique whether it shall be a unique index
+	 * @param dropDups whether to drop duplicates
+	 * @param sparse sparse or not
+	 * @param background whether the index will be created in the background
+	 * @param expireAfterSeconds the time to live for documents in the collection
+	 */
+	protected void ensureIndex(String collection, String name, DBObject indexDefinition, boolean unique,
+			boolean dropDups, boolean sparse, boolean background, int expireAfterSeconds) {
+
+		DBObject opts = new BasicDBObject();
+		opts.put("name", name);
+		opts.put("dropDups", dropDups);
+		opts.put("sparse", sparse);
+		opts.put("unique", unique);
+		opts.put("background", background);
+
+		if (expireAfterSeconds != -1) {
+			opts.put("expireAfterSeconds", expireAfterSeconds);
+		}
+
+		mongoDbFactory.getDb().getCollection(collection).ensureIndex(indexDefinition, opts);
+	}
 }

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

@@ -1,680 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.index;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.mapping.PropertyHandler;
-import org.springframework.data.mongodb.core.index.Index.Duplicates;
-import org.springframework.data.mongodb.core.index.MongoPersistentEntityIndexResolver.TextIndexIncludeOptions.IncludeStrategy;
-import org.springframework.data.mongodb.core.index.TextIndexDefinition.TextIndexDefinitionBuilder;
-import org.springframework.data.mongodb.core.index.TextIndexDefinition.TextIndexedFieldSpec;
-import org.springframework.data.mongodb.core.mapping.Document;
-import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.BasicDBObjectBuilder;
-import com.mongodb.DBObject;
-import com.mongodb.util.JSON;
-
-/**
- * {@link IndexResolver} implementation inspecting {@link MongoPersistentEntity} for {@link MongoPersistentEntity} to be
- * indexed. <br />
- * All {@link MongoPersistentProperty} of the {@link MongoPersistentEntity} are inspected for potential indexes by
- * scanning related annotations.
- * 
- * @author Christoph Strobl
- * @since 1.5
- */
-public class MongoPersistentEntityIndexResolver implements IndexResolver {
-
-	private static final Logger LOGGER = LoggerFactory.getLogger(MongoPersistentEntityIndexResolver.class);
-
-	private final MongoMappingContext mappingContext;
-
-	/**
-	 * Create new {@link MongoPersistentEntityIndexResolver}.
-	 * 
-	 * @param mappingContext must not be {@literal null}.
-	 */
-	public MongoPersistentEntityIndexResolver(MongoMappingContext mappingContext) {
-
-		Assert.notNull(mappingContext, "Mapping context must not be null in order to resolve index definitions");
-		this.mappingContext = mappingContext;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.index.IndexResolver#resolveIndexForClass(java.lang.Class)
-	 */
-	@Override
-	public List<IndexDefinitionHolder> resolveIndexForClass(Class<?> type) {
-		return resolveIndexForEntity(mappingContext.getPersistentEntity(type));
-	}
-
-	/**
-	 * Resolve the {@link IndexDefinition}s for given {@literal root} entity by traversing {@link MongoPersistentProperty}
-	 * scanning for index annotations {@link Indexed}, {@link CompoundIndex} and {@link GeospatialIndex}. The given
-	 * {@literal root} has therefore to be annotated with {@link Document}.
-	 * 
-	 * @param root must not be null.
-	 * @return List of {@link IndexDefinitionHolder}. Will never be {@code null}.
-	 * @throws IllegalArgumentException in case of missing {@link Document} annotation marking root entities.
-	 */
-	public List<IndexDefinitionHolder> resolveIndexForEntity(final MongoPersistentEntity<?> root) {
-
-		Assert.notNull(root, "Index cannot be resolved for given 'null' entity.");
-		Document document = root.findAnnotation(Document.class);
-		Assert.notNull(document, "Given entity is not collection root.");
-
-		final List<IndexDefinitionHolder> indexInformation = new ArrayList<MongoPersistentEntityIndexResolver.IndexDefinitionHolder>();
-		indexInformation.addAll(potentiallyCreateCompoundIndexDefinitions("", root.getCollection(), root));
-		indexInformation.addAll(potentiallyCreateTextIndexDefinition(root));
-
-		final CycleGuard guard = new CycleGuard();
-
-		root.doWithProperties(new PropertyHandler<MongoPersistentProperty>() {
-
-			@Override
-			public void doWithPersistentProperty(MongoPersistentProperty persistentProperty) {
-
-				try {
-					if (persistentProperty.isEntity()) {
-						indexInformation.addAll(resolveIndexForClass(persistentProperty.getActualType(),
-								persistentProperty.getFieldName(), root.getCollection(), guard));
-					}
-
-					IndexDefinitionHolder indexDefinitionHolder = createIndexDefinitionHolderForProperty(
-							persistentProperty.getFieldName(), root.getCollection(), persistentProperty);
-					if (indexDefinitionHolder != null) {
-						indexInformation.add(indexDefinitionHolder);
-					}
-				} catch (CyclicPropertyReferenceException e) {
-					LOGGER.warn(e.getMessage());
-				}
-			}
-		});
-
-		return indexInformation;
-	}
-
-	/**
-	 * Recursively resolve and inspect properties of given {@literal type} for indexes to be created.
-	 * 
-	 * @param type
-	 * @param path The {@literal "dot} path.
-	 * @param collection
-	 * @return List of {@link IndexDefinitionHolder} representing indexes for given type and its referenced property
-	 *         types. Will never be {@code null}.
-	 */
-	private List<IndexDefinitionHolder> resolveIndexForClass(final Class<?> type, final String path,
-			final String collection, final CycleGuard guard) {
-
-		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(type);
-
-		final List<IndexDefinitionHolder> indexInformation = new ArrayList<MongoPersistentEntityIndexResolver.IndexDefinitionHolder>();
-		indexInformation.addAll(potentiallyCreateCompoundIndexDefinitions(path, collection, entity));
-
-		entity.doWithProperties(new PropertyHandler<MongoPersistentProperty>() {
-
-			@Override
-			public void doWithPersistentProperty(MongoPersistentProperty persistentProperty) {
-
-				String propertyDotPath = (StringUtils.hasText(path) ? path + "." : "") + persistentProperty.getFieldName();
-				guard.protect(persistentProperty, path);
-
-				if (persistentProperty.isEntity()) {
-					try {
-						indexInformation.addAll(resolveIndexForClass(persistentProperty.getActualType(), propertyDotPath,
-								collection, guard));
-					} catch (CyclicPropertyReferenceException e) {
-						LOGGER.warn(e.getMessage());
-					}
-				}
-
-				IndexDefinitionHolder indexDefinitionHolder = createIndexDefinitionHolderForProperty(propertyDotPath,
-						collection, persistentProperty);
-				if (indexDefinitionHolder != null) {
-					indexInformation.add(indexDefinitionHolder);
-				}
-			}
-		});
-
-		return indexInformation;
-	}
-
-	private IndexDefinitionHolder createIndexDefinitionHolderForProperty(String dotPath, String collection,
-			MongoPersistentProperty persistentProperty) {
-
-		if (persistentProperty.isAnnotationPresent(Indexed.class)) {
-			return createIndexDefinition(dotPath, collection, persistentProperty);
-		} else if (persistentProperty.isAnnotationPresent(GeoSpatialIndexed.class)) {
-			return createGeoSpatialIndexDefinition(dotPath, collection, persistentProperty);
-		}
-
-		return null;
-	}
-
-	private List<IndexDefinitionHolder> potentiallyCreateCompoundIndexDefinitions(String dotPath, String collection,
-			MongoPersistentEntity<?> entity) {
-
-		if (entity.findAnnotation(CompoundIndexes.class) == null && entity.findAnnotation(CompoundIndex.class) == null) {
-			return Collections.emptyList();
-		}
-
-		return createCompoundIndexDefinitions(dotPath, collection, entity);
-	}
-
-	private Collection<? extends IndexDefinitionHolder> potentiallyCreateTextIndexDefinition(MongoPersistentEntity<?> root) {
-
-		TextIndexDefinitionBuilder indexDefinitionBuilder = new TextIndexDefinitionBuilder().named(root.getType()
-				.getSimpleName() + "_TextIndex");
-
-		if (StringUtils.hasText(root.getLanguage())) {
-			indexDefinitionBuilder.withDefaultLanguage(root.getLanguage());
-		}
-
-		try {
-			appendTextIndexInformation("", indexDefinitionBuilder, root,
-					new TextIndexIncludeOptions(IncludeStrategy.DEFAULT), new CycleGuard());
-		} catch (CyclicPropertyReferenceException e) {
-			LOGGER.warn(e.getMessage());
-		}
-
-		TextIndexDefinition indexDefinition = indexDefinitionBuilder.build();
-
-		if (!indexDefinition.hasFieldSpec()) {
-			return Collections.emptyList();
-		}
-
-		IndexDefinitionHolder holder = new IndexDefinitionHolder("", indexDefinition, root.getCollection());
-		return Collections.singletonList(holder);
-
-	}
-
-	private void appendTextIndexInformation(final String dotPath,
-			final TextIndexDefinitionBuilder indexDefinitionBuilder, final MongoPersistentEntity<?> entity,
-			final TextIndexIncludeOptions includeOptions, final CycleGuard guard) {
-
-		entity.doWithProperties(new PropertyHandler<MongoPersistentProperty>() {
-
-			@Override
-			public void doWithPersistentProperty(MongoPersistentProperty persistentProperty) {
-
-				guard.protect(persistentProperty, dotPath);
-
-				if (persistentProperty.isExplicitLanguageProperty() && !StringUtils.hasText(dotPath)) {
-					indexDefinitionBuilder.withLanguageOverride(persistentProperty.getFieldName());
-				}
-
-				TextIndexed indexed = persistentProperty.findAnnotation(TextIndexed.class);
-
-				if (includeOptions.isForce() || indexed != null || persistentProperty.isEntity()) {
-
-					String propertyDotPath = (StringUtils.hasText(dotPath) ? dotPath + "." : "")
-							+ persistentProperty.getFieldName();
-
-					Float weight = indexed != null ? indexed.weight()
-							: (includeOptions.getParentFieldSpec() != null ? includeOptions.getParentFieldSpec().getWeight() : 1.0F);
-
-					if (persistentProperty.isEntity()) {
-
-						TextIndexIncludeOptions optionsForNestedType = includeOptions;
-						if (!IncludeStrategy.FORCE.equals(includeOptions.getStrategy()) && indexed != null) {
-							optionsForNestedType = new TextIndexIncludeOptions(IncludeStrategy.FORCE, new TextIndexedFieldSpec(
-									propertyDotPath, weight));
-						}
-
-						try {
-							appendTextIndexInformation(propertyDotPath, indexDefinitionBuilder,
-									mappingContext.getPersistentEntity(persistentProperty.getActualType()), optionsForNestedType, guard);
-						} catch (CyclicPropertyReferenceException e) {
-							LOGGER.warn(e.getMessage(), e);
-						} catch (InvalidDataAccessApiUsageException e) {
-							LOGGER.warn(
-									String.format("Potentially invald index structure discovered. Breaking operation for %s.",
-											entity.getName()), e);
-						}
-					} else if (includeOptions.isForce() || indexed != null) {
-						indexDefinitionBuilder.onField(propertyDotPath, weight);
-					}
-				}
-
-			}
-		});
-
-	}
-
-	/**
-	 * Create {@link IndexDefinition} wrapped in {@link IndexDefinitionHolder} for {@link CompoundIndexes} of given type.
-	 * 
-	 * @param dotPath The properties {@literal "dot"} path representation from its document root.
-	 * @param fallbackCollection
-	 * @param type
-	 * @return
-	 */
-	protected List<IndexDefinitionHolder> createCompoundIndexDefinitions(String dotPath, String fallbackCollection,
-			MongoPersistentEntity<?> entity) {
-
-		List<IndexDefinitionHolder> indexDefinitions = new ArrayList<MongoPersistentEntityIndexResolver.IndexDefinitionHolder>();
-		CompoundIndexes indexes = entity.findAnnotation(CompoundIndexes.class);
-
-		if (indexes != null) {
-			for (CompoundIndex index : indexes.value()) {
-				indexDefinitions.add(createCompoundIndexDefinition(dotPath, fallbackCollection, index, entity));
-			}
-		}
-
-		CompoundIndex index = entity.findAnnotation(CompoundIndex.class);
-
-		if (index != null) {
-			indexDefinitions.add(createCompoundIndexDefinition(dotPath, fallbackCollection, index, entity));
-		}
-
-		return indexDefinitions;
-	}
-
-	@SuppressWarnings("deprecation")
-	protected IndexDefinitionHolder createCompoundIndexDefinition(String dotPath, String fallbackCollection,
-			CompoundIndex index, MongoPersistentEntity<?> entity) {
-
-		CompoundIndexDefinition indexDefinition = new CompoundIndexDefinition(resolveCompoundIndexKeyFromStringDefinition(
-				dotPath, index.def()));
-
-		if (!index.useGeneratedName()) {
-			indexDefinition.named(pathAwareIndexName(index.name(), dotPath, null));
-		}
-
-		if (index.unique()) {
-			indexDefinition.unique(index.dropDups() ? Duplicates.DROP : Duplicates.RETAIN);
-		}
-
-		if (index.sparse()) {
-			indexDefinition.sparse();
-		}
-
-		if (index.background()) {
-			indexDefinition.background();
-		}
-
-		String collection = StringUtils.hasText(index.collection()) ? index.collection() : fallbackCollection;
-		return new IndexDefinitionHolder(dotPath, indexDefinition, collection);
-	}
-
-	private DBObject resolveCompoundIndexKeyFromStringDefinition(String dotPath, String keyDefinitionString) {
-
-		if (!StringUtils.hasText(dotPath) && !StringUtils.hasText(keyDefinitionString)) {
-			throw new InvalidDataAccessApiUsageException("Cannot create index on root level for empty keys.");
-		}
-
-		if (!StringUtils.hasText(keyDefinitionString)) {
-			return new BasicDBObject(dotPath, 1);
-		}
-
-		DBObject dbo = (DBObject) JSON.parse(keyDefinitionString);
-		if (!StringUtils.hasText(dotPath)) {
-			return dbo;
-		}
-
-		BasicDBObjectBuilder dboBuilder = new BasicDBObjectBuilder();
-
-		for (String key : dbo.keySet()) {
-			dboBuilder.add(dotPath + "." + key, dbo.get(key));
-		}
-		return dboBuilder.get();
-	}
-
-	/**
-	 * Creates {@link IndexDefinition} wrapped in {@link IndexDefinitionHolder} out of {@link Indexed} for given
-	 * {@link MongoPersistentProperty}.
-	 * 
-	 * @param dotPath The properties {@literal "dot"} path representation from its document root.
-	 * @param collection
-	 * @param persitentProperty
-	 * @return
-	 */
-	protected IndexDefinitionHolder createIndexDefinition(String dotPath, String fallbackCollection,
-			MongoPersistentProperty persitentProperty) {
-
-		Indexed index = persitentProperty.findAnnotation(Indexed.class);
-		String collection = StringUtils.hasText(index.collection()) ? index.collection() : fallbackCollection;
-
-		Index indexDefinition = new Index().on(dotPath,
-				IndexDirection.ASCENDING.equals(index.direction()) ? Sort.Direction.ASC : Sort.Direction.DESC);
-
-		if (!index.useGeneratedName()) {
-			indexDefinition.named(pathAwareIndexName(index.name(), dotPath, persitentProperty));
-		}
-
-		if (index.unique()) {
-			indexDefinition.unique(index.dropDups() ? Duplicates.DROP : Duplicates.RETAIN);
-		}
-
-		if (index.sparse()) {
-			indexDefinition.sparse();
-		}
-
-		if (index.background()) {
-			indexDefinition.background();
-		}
-
-		if (index.expireAfterSeconds() >= 0) {
-			indexDefinition.expire(index.expireAfterSeconds(), TimeUnit.SECONDS);
-		}
-
-		return new IndexDefinitionHolder(dotPath, indexDefinition, collection);
-	}
-
-	/**
-	 * Creates {@link IndexDefinition} wrapped in {@link IndexDefinitionHolder} out of {@link GeoSpatialIndexed} for
-	 * {@link MongoPersistentProperty}.
-	 * 
-	 * @param dotPath The properties {@literal "dot"} path representation from its document root.
-	 * @param collection
-	 * @param persistentProperty
-	 * @return
-	 */
-	protected IndexDefinitionHolder createGeoSpatialIndexDefinition(String dotPath, String fallbackCollection,
-			MongoPersistentProperty persistentProperty) {
-
-		GeoSpatialIndexed index = persistentProperty.findAnnotation(GeoSpatialIndexed.class);
-		String collection = StringUtils.hasText(index.collection()) ? index.collection() : fallbackCollection;
-
-		GeospatialIndex indexDefinition = new GeospatialIndex(dotPath);
-		indexDefinition.withBits(index.bits());
-		indexDefinition.withMin(index.min()).withMax(index.max());
-
-		if (!index.useGeneratedName()) {
-			indexDefinition.named(pathAwareIndexName(index.name(), dotPath, persistentProperty));
-		}
-
-		indexDefinition.typed(index.type()).withBucketSize(index.bucketSize()).withAdditionalField(index.additionalField());
-
-		return new IndexDefinitionHolder(dotPath, indexDefinition, collection);
-	}
-
-	private String pathAwareIndexName(String indexName, String dotPath, MongoPersistentProperty property) {
-
-		String nameToUse = StringUtils.hasText(indexName) ? indexName : "";
-
-		if (!StringUtils.hasText(dotPath) || (property != null && dotPath.equals(property.getFieldName()))) {
-			return StringUtils.hasText(nameToUse) ? nameToUse : dotPath;
-		}
-
-		if (StringUtils.hasText(dotPath)) {
-
-			nameToUse = StringUtils.hasText(nameToUse) ? (property != null ? dotPath.replace("." + property.getFieldName(),
-					"") : dotPath) + "." + nameToUse : dotPath;
-		}
-		return nameToUse;
-
-	}
-
-	/**
-	 * {@link CycleGuard} holds information about properties and the paths for accessing those. This information is used
-	 * to detect potential cycles within the references.
-	 * 
-	 * @author Christoph Strobl
-	 */
-	static class CycleGuard {
-
-		private final Map<String, List<Path>> propertyTypeMap;
-
-		CycleGuard() {
-			this.propertyTypeMap = new LinkedHashMap<String, List<Path>>();
-		}
-
-		/**
-		 * @param property The property to inspect
-		 * @param path The path under which the property can be reached.
-		 * @throws CyclicPropertyReferenceException in case a potential cycle is detected.
-		 * @see Path#cycles(MongoPersistentProperty, String)
-		 */
-		void protect(MongoPersistentProperty property, String path) throws CyclicPropertyReferenceException {
-
-			String propertyTypeKey = createMapKey(property);
-			if (propertyTypeMap.containsKey(propertyTypeKey)) {
-
-				List<Path> paths = propertyTypeMap.get(propertyTypeKey);
-
-				for (Path existingPath : paths) {
-
-					if (existingPath.cycles(property, path)) {
-						paths.add(new Path(property, path));
-						throw new CyclicPropertyReferenceException(property.getFieldName(), property.getOwner().getType(),
-								existingPath.getPath());
-					}
-				}
-
-				paths.add(new Path(property, path));
-			} else {
-
-				ArrayList<Path> paths = new ArrayList<Path>();
-				paths.add(new Path(property, path));
-				propertyTypeMap.put(propertyTypeKey, paths);
-			}
-		}
-
-		private String createMapKey(MongoPersistentProperty property) {
-			return property.getOwner().getType().getSimpleName() + ":" + property.getFieldName();
-		}
-
-		/**
-		 * Path defines the property and its full path from the document root. <br />
-		 * A {@link Path} with {@literal spring.data.mongodb} would be created for the property {@code Three.mongodb}.
-		 * 
-		 * <pre>
-		 * <code>
-		 * &#64;Document
-		 * class One {
-		 *   Two spring;
-		 * }
-		 * 
-		 * class Two {
-		 *   Three data;
-		 * }
-		 * 
-		 * class Three {
-		 *   String mongodb;
-		 * }
-		 * </code>
-		 * </pre>
-		 * 
-		 * @author Christoph Strobl
-		 */
-		static class Path {
-
-			private final MongoPersistentProperty property;
-			private final String path;
-
-			Path(MongoPersistentProperty property, String path) {
-
-				this.property = property;
-				this.path = path;
-			}
-
-			public String getPath() {
-				return path;
-			}
-
-			/**
-			 * Checks whether the given property is owned by the same entity and if it has been already visited by a subset of
-			 * the current path. Given {@literal foo.bar.bar} cycles if {@literal foo.bar} has already been visited and
-			 * {@code class Bar} contains a property of type {@code Bar}. The previously mentioned path would not cycle if
-			 * {@code class Bar} contained a property of type {@code SomeEntity} named {@literal bar}.
-			 * 
-			 * @param property
-			 * @param path
-			 * @return
-			 */
-			boolean cycles(MongoPersistentProperty property, String path) {
-
-				if (!property.getOwner().equals(this.property.getOwner())) {
-					return false;
-				}
-
-				return path.equals(this.path) || path.contains(this.path + ".") || path.contains("." + this.path);
-			}
-		}
-	}
-
-	/**
-	 * @author Christoph Strobl
-	 * @since 1.5
-	 */
-	public static class CyclicPropertyReferenceException extends RuntimeException {
-
-		private static final long serialVersionUID = -3762979307658772277L;
-
-		private final String propertyName;
-		private final Class<?> type;
-		private final String dotPath;
-
-		public CyclicPropertyReferenceException(String propertyName, Class<?> type, String dotPath) {
-
-			this.propertyName = propertyName;
-			this.type = type;
-			this.dotPath = dotPath;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Throwable#getMessage()
-		 */
-		@Override
-		public String getMessage() {
-			return String.format("Found cycle for field '%s' in type '%s' for path '%s'", propertyName,
-					type != null ? type.getSimpleName() : "unknown", dotPath);
-		}
-	}
-
-	/**
-	 * Implementation of {@link IndexDefinition} holding additional (property)path information used for creating the
-	 * index. The path itself is the properties {@literal "dot"} path representation from its root document.
-	 * 
-	 * @author Christoph Strobl
-	 * @since 1.5
-	 */
-	public static class IndexDefinitionHolder implements IndexDefinition {
-
-		private final String path;
-		private final IndexDefinition indexDefinition;
-		private final String collection;
-
-		/**
-		 * Create
-		 * 
-		 * @param path
-		 */
-		public IndexDefinitionHolder(String path, IndexDefinition definition, String collection) {
-
-			this.path = path;
-			this.indexDefinition = definition;
-			this.collection = collection;
-		}
-
-		public String getCollection() {
-			return collection;
-		}
-
-		/**
-		 * Get the {@literal "dot"} path used to create the index.
-		 * 
-		 * @return
-		 */
-		public String getPath() {
-			return path;
-		}
-
-		/**
-		 * Get the {@literal raw} {@link IndexDefinition}.
-		 * 
-		 * @return
-		 */
-		public IndexDefinition getIndexDefinition() {
-			return indexDefinition;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.index.IndexDefinition#getIndexKeys()
-		 */
-		@Override
-		public DBObject getIndexKeys() {
-			return indexDefinition.getIndexKeys();
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.index.IndexDefinition#getIndexOptions()
-		 */
-		@Override
-		public DBObject getIndexOptions() {
-			return indexDefinition.getIndexOptions();
-		}
-	}
-
-	/**
-	 * @author Christoph Strobl
-	 * @since 1.6
-	 */
-	static class TextIndexIncludeOptions {
-
-		enum IncludeStrategy {
-			FORCE, DEFAULT;
-		}
-
-		private final IncludeStrategy strategy;
-
-		private final TextIndexedFieldSpec parentFieldSpec;
-
-		public TextIndexIncludeOptions(IncludeStrategy strategy, TextIndexedFieldSpec parentFieldSpec) {
-			this.strategy = strategy;
-			this.parentFieldSpec = parentFieldSpec;
-		}
-
-		public TextIndexIncludeOptions(IncludeStrategy strategy) {
-			this(strategy, null);
-		}
-
-		public IncludeStrategy getStrategy() {
-			return strategy;
-		}
-
-		public TextIndexedFieldSpec getParentFieldSpec() {
-			return parentFieldSpec;
-		}
-
-		public boolean isForce() {
-			return IncludeStrategy.FORCE.equals(strategy);
-		}
-
-	}
-}

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

@@ -1,336 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.index;
-
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.util.Assert;
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-
-/**
- * {@link IndexDefinition} to span multiple keys for text search.
- * 
- * @author Christoph Strobl
- * @since 1.6
- */
-public class TextIndexDefinition implements IndexDefinition {
-
-	private String name;
-	private Set<TextIndexedFieldSpec> fieldSpecs;
-	private String defaultLanguage;
-	private String languageOverride;
-
-	TextIndexDefinition() {
-		fieldSpecs = new LinkedHashSet<TextIndexedFieldSpec>();
-	}
-
-	/**
-	 * Creates a {@link TextIndexDefinition} for all fields in the document.
-	 * 
-	 * @return
-	 */
-	public static TextIndexDefinition forAllFields() {
-		return new TextIndexDefinitionBuilder().onAllFields().build();
-	}
-
-	/**
-	 * Get {@link TextIndexDefinitionBuilder} to create {@link TextIndexDefinition}.
-	 * 
-	 * @return
-	 */
-	public static TextIndexDefinitionBuilder builder() {
-		return new TextIndexDefinitionBuilder();
-	}
-
-	/**
-	 * @param fieldSpec
-	 */
-	public void addFieldSpec(TextIndexedFieldSpec fieldSpec) {
-		this.fieldSpecs.add(fieldSpec);
-	}
-
-	/**
-	 * @param fieldSpecs
-	 */
-	public void addFieldSpecs(Collection<TextIndexedFieldSpec> fieldSpecs) {
-		this.fieldSpecs.addAll(fieldSpecs);
-	}
-
-	/**
-	 * Returns if the {@link TextIndexDefinition} has fields assigned.
-	 * 
-	 * @return
-	 */
-	public boolean hasFieldSpec() {
-		return !fieldSpecs.isEmpty();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.index.IndexDefinition#getIndexKeys()
-	 */
-	@Override
-	public DBObject getIndexKeys() {
-
-		DBObject keys = new BasicDBObject();
-		for (TextIndexedFieldSpec fieldSpec : fieldSpecs) {
-			keys.put(fieldSpec.fieldname, "text");
-		}
-
-		return keys;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.index.IndexDefinition#getIndexOptions()
-	 */
-	@Override
-	public DBObject getIndexOptions() {
-
-		DBObject options = new BasicDBObject();
-		if (StringUtils.hasText(name)) {
-			options.put("name", name);
-		}
-		if (StringUtils.hasText(defaultLanguage)) {
-			options.put("default_language", defaultLanguage);
-		}
-
-		BasicDBObject weightsDbo = new BasicDBObject();
-		for (TextIndexedFieldSpec fieldSpec : fieldSpecs) {
-			if (fieldSpec.isWeighted()) {
-				weightsDbo.put(fieldSpec.getFieldname(), fieldSpec.getWeight());
-			}
-		}
-
-		if (!weightsDbo.isEmpty()) {
-			options.put("weights", weightsDbo);
-		}
-		if (StringUtils.hasText(languageOverride)) {
-			options.put("language_override", languageOverride);
-		}
-
-		return options;
-	}
-
-	/**
-	 * @author Christoph Strobl
-	 * @since 1.6
-	 */
-	public static class TextIndexedFieldSpec {
-
-		private final String fieldname;
-		private final Float weight;
-
-		/**
-		 * Create new {@link TextIndexedFieldSpec} for given fieldname without any weight.
-		 * 
-		 * @param fieldname
-		 */
-		public TextIndexedFieldSpec(String fieldname) {
-			this(fieldname, 1.0F);
-		}
-
-		/**
-		 * Create new {@link TextIndexedFieldSpec} for given fieldname and weight.
-		 * 
-		 * @param fieldname
-		 * @param weight
-		 */
-		public TextIndexedFieldSpec(String fieldname, Float weight) {
-
-			Assert.hasText(fieldname, "Text index field cannot be blank.");
-			this.fieldname = fieldname;
-			this.weight = weight != null ? weight : 1.0F;
-		}
-
-		/**
-		 * Get the fieldname associated with the {@link TextIndexedFieldSpec}.
-		 * 
-		 * @return
-		 */
-		public String getFieldname() {
-			return fieldname;
-		}
-
-		/**
-		 * Get the weight associated with the {@link TextIndexedFieldSpec}.
-		 * 
-		 * @return
-		 */
-		public Float getWeight() {
-			return weight;
-		}
-
-		/**
-		 * @return true if {@link #weight} has a value that is a valid number.
-		 */
-		public boolean isWeighted() {
-			return this.weight != null && this.weight.compareTo(1.0F) != 0;
-		}
-
-		@Override
-		public int hashCode() {
-			return ObjectUtils.nullSafeHashCode(fieldname);
-		}
-
-		@Override
-		public boolean equals(Object obj) {
-
-			if (this == obj) {
-				return true;
-			}
-			if (obj == null) {
-				return false;
-			}
-			if (!(obj instanceof TextIndexedFieldSpec)) {
-				return false;
-			}
-
-			TextIndexedFieldSpec other = (TextIndexedFieldSpec) obj;
-
-			return ObjectUtils.nullSafeEquals(this.fieldname, other.fieldname);
-		}
-
-	}
-
-	/**
-	 * {@link TextIndexDefinitionBuilder} helps defining options for creating {@link TextIndexDefinition}.
-	 * 
-	 * @author Christoph Strobl
-	 * @since 1.6
-	 */
-	public static class TextIndexDefinitionBuilder {
-
-		private TextIndexDefinition instance;
-		private static final TextIndexedFieldSpec ALL_FIELDS = new TextIndexedFieldSpec("$**");
-
-		public TextIndexDefinitionBuilder() {
-			this.instance = new TextIndexDefinition();
-		}
-
-		/**
-		 * Define the name to be used when creating the index in the store.
-		 * 
-		 * @param name
-		 * @return
-		 */
-		public TextIndexDefinitionBuilder named(String name) {
-			this.instance.name = name;
-			return this;
-		}
-
-		/**
-		 * Define the index to span all fields using wilcard. <br/>
-		 * <strong>NOTE</strong> {@link TextIndexDefinition} cannot contain any other fields when defined with wildcard.
-		 * 
-		 * @return
-		 */
-		public TextIndexDefinitionBuilder onAllFields() {
-
-			if (!instance.fieldSpecs.isEmpty()) {
-				throw new InvalidDataAccessApiUsageException("Cannot add wildcard fieldspect to non empty.");
-			}
-
-			this.instance.fieldSpecs.add(ALL_FIELDS);
-			return this;
-		}
-
-		/**
-		 * Include given fields with default weight.
-		 * 
-		 * @param fieldnames
-		 * @return
-		 */
-		public TextIndexDefinitionBuilder onFields(String... fieldnames) {
-
-			for (String fieldname : fieldnames) {
-				onField(fieldname);
-			}
-			return this;
-		}
-
-		/**
-		 * Include given field with default weight.
-		 * 
-		 * @param fieldname
-		 * @return
-		 */
-		public TextIndexDefinitionBuilder onField(String fieldname) {
-			return onField(fieldname, 1F);
-		}
-
-		/**
-		 * Include given field with weight.
-		 * 
-		 * @param fieldname
-		 * @return
-		 */
-		public TextIndexDefinitionBuilder onField(String fieldname, Float weight) {
-
-			if (this.instance.fieldSpecs.contains(ALL_FIELDS)) {
-				throw new InvalidDataAccessApiUsageException(String.format("Cannot add %s to field spec for all fields.",
-						fieldname));
-			}
-
-			this.instance.fieldSpecs.add(new TextIndexedFieldSpec(fieldname, weight));
-			return this;
-		}
-
-		/**
-		 * Define the default language to be used when indexing documents.
-		 * 
-		 * @param language
-		 * @see http://docs.mongodb.org/manual/tutorial/specify-language-for-text-index/#specify-default-language-text-index
-		 * @return
-		 */
-		public TextIndexDefinitionBuilder withDefaultLanguage(String language) {
-
-			this.instance.defaultLanguage = language;
-			return this;
-		}
-
-		/**
-		 * Define field for language override.
-		 * 
-		 * @param fieldname
-		 * @return
-		 */
-		public TextIndexDefinitionBuilder withLanguageOverride(String fieldname) {
-
-			if (StringUtils.hasText(this.instance.languageOverride)) {
-				throw new InvalidDataAccessApiUsageException(String.format(
-						"Cannot set language override on %s as it is already defined on %s.", fieldname,
-						this.instance.languageOverride));
-			}
-
-			this.instance.languageOverride = fieldname;
-			return this;
-		}
-
-		public TextIndexDefinition build() {
-			return this.instance;
-		}
-
-	}
-
-}

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

@@ -1,44 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.index;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * {@link TextIndexed} marks a field to be part of the text index. As there can be only one text index per collection
- * all fields marked with {@link TextIndexed} are combined into one single index. <br />
- * 
- * @author Christoph Strobl
- * @since 1.6
- */
-@Documented
-@Target({ ElementType.FIELD })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface TextIndexed {
-
-	/**
-	 * Defines the significance of the filed relative to other indexed fields. The value directly influences the documents
-	 * score. <br/>
-	 * Defaulted to {@literal 1.0}.
-	 * 
-	 * @return
-	 */
-	float weight() default 1.0F;
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 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.
@@ -35,11 +35,9 @@ import org.springframework.data.mongodb.MongoCollectionUtils;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.expression.Expression;
 import org.springframework.expression.ParserContext;
-import org.springframework.expression.common.LiteralExpression;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -49,45 +47,36 @@ import org.springframework.util.StringUtils;
  * @author Jon Brisbin
  * @author Oliver Gierke
  * @author Thomas Darimont
- * @author Christoph Strobl
  */
 public class BasicMongoPersistentEntity<T> extends BasicPersistentEntity<T, MongoPersistentProperty> implements
 		MongoPersistentEntity<T>, ApplicationContextAware {
 
-	private static final String AMBIGUOUS_FIELD_MAPPING = "Ambiguous field mapping detected! Both %s and %s map to the same field name %s! Disambiguate using @Field annotation!";
-	private static final SpelExpressionParser PARSER = new SpelExpressionParser();
-
+	private static final String AMBIGUOUS_FIELD_MAPPING = "Ambiguous field mapping detected! Both %s and %s map to the same field name %s! Disambiguate using @DocumentField annotation!";
 	private final String collection;
-	private final String language;
-
+	private final SpelExpressionParser parser;
 	private final StandardEvaluationContext context;
-	private final Expression expression;
 
 	/**
 	 * Creates a new {@link BasicMongoPersistentEntity} with the given {@link TypeInformation}. Will default the
 	 * collection name to the entities simple type name.
 	 * 
-	 * @param typeInformation must not be {@literal null}.
+	 * @param typeInformation
 	 */
 	public BasicMongoPersistentEntity(TypeInformation<T> typeInformation) {
 
 		super(typeInformation, MongoPersistentPropertyComparator.INSTANCE);
 
+		this.parser = new SpelExpressionParser();
+		this.context = new StandardEvaluationContext();
+
 		Class<?> rawType = typeInformation.getType();
 		String fallback = MongoCollectionUtils.getPreferredCollectionName(rawType);
 
-		Document document = rawType.getAnnotation(Document.class);
-
-		this.expression = detectExpression(document);
-		this.context = new StandardEvaluationContext();
-
-		if (document != null) {
-
-			this.collection = StringUtils.hasText(document.collection()) ? document.collection() : fallback;
-			this.language = StringUtils.hasText(document.language()) ? document.language() : "";
+		if (rawType.isAnnotationPresent(Document.class)) {
+			Document d = rawType.getAnnotation(Document.class);
+			this.collection = StringUtils.hasText(d.collection()) ? d.collection() : fallback;
 		} else {
 			this.collection = fallback;
-			this.language = "";
 		}
 	}
 
@@ -107,34 +96,8 @@ public class BasicMongoPersistentEntity<T> extends BasicPersistentEntity<T, Mong
 	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentEntity#getCollection()
 	 */
 	public String getCollection() {
-		return expression == null ? collection : expression.getValue(context, String.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentEntity#getLanguage()
-	 */
-	@Override
-	public String getLanguage() {
-		return this.language;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentEntity#getTextScoreProperty()
-	 */
-	@Override
-	public MongoPersistentProperty getTextScoreProperty() {
-		return getPersistentProperty(TextScore.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentEntity#hasTextScoreProperty()
-	 */
-	@Override
-	public boolean hasTextScoreProperty() {
-		return getTextScoreProperty() != null;
+		Expression expression = parser.parseExpression(collection, ParserContext.TEMPLATE_EXPRESSION);
+		return expression.getValue(context, String.class);
 	}
 
 	/* 
@@ -144,22 +107,12 @@ public class BasicMongoPersistentEntity<T> extends BasicPersistentEntity<T, Mong
 	@Override
 	public void verify() {
 
-		verifyFieldUniqueness();
-		verifyFieldTypes();
-	}
-
-	private void verifyFieldUniqueness() {
-
 		AssertFieldNameUniquenessHandler handler = new AssertFieldNameUniquenessHandler();
 
 		doWithProperties(handler);
 		doWithAssociations(handler);
 	}
 
-	private void verifyFieldTypes() {
-		doWithProperties(new PropertyTypeAssertionHandler());
-	}
-
 	/**
 	 * {@link Comparator} implementation inspecting the {@link MongoPersistentProperty}'s order.
 	 * 
@@ -241,31 +194,6 @@ public class BasicMongoPersistentEntity<T> extends BasicPersistentEntity<T, Mong
 		return null;
 	}
 
-	/**
-	 * Returns a SpEL {@link Expression} frór the collection String expressed in the given {@link Document} annotation if
-	 * present or {@literal null} otherwise. Will also return {@literal null} it the collection {@link String} evaluates
-	 * to a {@link LiteralExpression} (indicating that no subsequent evaluation is necessary).
-	 * 
-	 * @param document can be {@literal null}
-	 * @return
-	 */
-	private static Expression detectExpression(Document document) {
-
-		if (document == null) {
-			return null;
-		}
-
-		String collection = document.collection();
-
-		if (!StringUtils.hasText(collection)) {
-			return null;
-		}
-
-		Expression expression = PARSER.parseExpression(document.collection(), ParserContext.TEMPLATE_EXPRESSION);
-
-		return expression instanceof LiteralExpression ? null : expression;
-	}
-
 	/**
 	 * Handler to collect {@link MongoPersistentProperty} instances and check that each of them is mapped to a distinct
 	 * field name.
@@ -298,46 +226,4 @@ public class BasicMongoPersistentEntity<T> extends BasicPersistentEntity<T, Mong
 			properties.put(fieldName, property);
 		}
 	}
-
-	/**
-	 * @author Christoph Strobl
-	 * @since 1.6
-	 */
-	private static class PropertyTypeAssertionHandler implements PropertyHandler<MongoPersistentProperty> {
-
-		@Override
-		public void doWithPersistentProperty(MongoPersistentProperty persistentProperty) {
-
-			potentiallyAssertTextScoreType(persistentProperty);
-			potentiallyAssertLanguageType(persistentProperty);
-		}
-
-		private void potentiallyAssertLanguageType(MongoPersistentProperty persistentProperty) {
-
-			if (persistentProperty.isExplicitLanguageProperty()) {
-				assertPropertyType(persistentProperty, String.class);
-			}
-		}
-
-		private void potentiallyAssertTextScoreType(MongoPersistentProperty persistentProperty) {
-
-			if (persistentProperty.isTextScoreProperty()) {
-				assertPropertyType(persistentProperty, Float.class, Double.class);
-			}
-		}
-
-		private void assertPropertyType(MongoPersistentProperty persistentProperty, Class<?>... validMatches) {
-
-			for (Class<?> potentialMatch : validMatches) {
-				if (ClassUtils.isAssignable(potentialMatch, persistentProperty.getActualType())) {
-					return;
-				}
-			}
-
-			throw new MappingException(String.format("Missmatching types for %s. Found %s expected one of %s.",
-					persistentProperty.getField(), persistentProperty.getActualType(),
-					StringUtils.arrayToCommaDelimitedString(validMatches)));
-		}
-	}
-
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,10 +27,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mapping.Association;
 import org.springframework.data.mapping.model.AnnotationBasedPersistentProperty;
-import org.springframework.data.mapping.model.FieldNamingStrategy;
 import org.springframework.data.mapping.model.MappingException;
-import org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
+import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 
 import com.mongodb.DBObject;
@@ -41,7 +40,6 @@ import com.mongodb.DBObject;
  * @author Oliver Gierke
  * @author Patryk Wasik
  * @author Thomas Darimont
- * @author Christoph Strobl
  */
 public class BasicMongoPersistentProperty extends AnnotationBasedPersistentProperty<MongoPersistentProperty> implements
 		MongoPersistentProperty {
@@ -49,18 +47,20 @@ public class BasicMongoPersistentProperty extends AnnotationBasedPersistentPrope
 	private static final Logger LOG = LoggerFactory.getLogger(BasicMongoPersistentProperty.class);
 
 	private static final String ID_FIELD_NAME = "_id";
-	private static final String LANGUAGE_FIELD_NAME = "language";
 	private static final Set<Class<?>> SUPPORTED_ID_TYPES = new HashSet<Class<?>>();
 	private static final Set<String> SUPPORTED_ID_PROPERTY_NAMES = new HashSet<String>();
 
-	static {
+	private static final Field CAUSE_FIELD;
 
+	static {
 		SUPPORTED_ID_TYPES.add(ObjectId.class);
 		SUPPORTED_ID_TYPES.add(String.class);
 		SUPPORTED_ID_TYPES.add(BigInteger.class);
 
 		SUPPORTED_ID_PROPERTY_NAMES.add("id");
 		SUPPORTED_ID_PROPERTY_NAMES.add("_id");
+
+		CAUSE_FIELD = ReflectionUtils.findField(Throwable.class, "cause");
 	}
 
 	private final FieldNamingStrategy fieldNamingStrategy;
@@ -86,6 +86,14 @@ public class BasicMongoPersistentProperty extends AnnotationBasedPersistentPrope
 		}
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mapping.FooBasicPersistentProperty#isAssociation()
+	 */
+	@Override
+	public boolean isAssociation() {
+		return field.isAnnotationPresent(DBRef.class) || super.isAssociation();
+	}
+
 	/**
 	 * Also considers fields as id that are of supported id type and name.
 	 * 
@@ -100,8 +108,7 @@ public class BasicMongoPersistentProperty extends AnnotationBasedPersistentPrope
 		}
 
 		// We need to support a wider range of ID types than just the ones that can be converted to an ObjectId
-		// but still we need to check if there happens to be an explicit name set
-		return SUPPORTED_ID_PROPERTY_NAMES.contains(getName()) && !hasExplicitFieldName();
+		return SUPPORTED_ID_PROPERTY_NAMES.contains(field.getName());
 	}
 
 	/*
@@ -135,8 +142,10 @@ public class BasicMongoPersistentProperty extends AnnotationBasedPersistentPrope
 			}
 		}
 
-		if (hasExplicitFieldName()) {
-			return getAnnotatedFieldName();
+		org.springframework.data.mongodb.core.mapping.Field annotation = findAnnotation(org.springframework.data.mongodb.core.mapping.Field.class);
+
+		if (annotation != null && StringUtils.hasText(annotation.value())) {
+			return annotation.value();
 		}
 
 		String fieldName = fieldNamingStrategy.getFieldName(this);
@@ -149,32 +158,13 @@ public class BasicMongoPersistentProperty extends AnnotationBasedPersistentPrope
 		return fieldName;
 	}
 
-	/**
-	 * @return true if {@link org.springframework.data.mongodb.core.mapping.Field} having non blank
-	 *         {@link org.springframework.data.mongodb.core.mapping.Field#value()} present.
-	 * @since 1.7
-	 */
-	protected boolean hasExplicitFieldName() {
-		return StringUtils.hasText(getAnnotatedFieldName());
-	}
-
-	private String getAnnotatedFieldName() {
-
-		org.springframework.data.mongodb.core.mapping.Field annotation = findAnnotation(org.springframework.data.mongodb.core.mapping.Field.class);
-
-		if (annotation != null && StringUtils.hasText(annotation.value())) {
-			return annotation.value();
-		}
-
-		return null;
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#getFieldOrder()
 	 */
 	public int getFieldOrder() {
-		org.springframework.data.mongodb.core.mapping.Field annotation = findAnnotation(org.springframework.data.mongodb.core.mapping.Field.class);
+		org.springframework.data.mongodb.core.mapping.Field annotation = getField().getAnnotation(
+				org.springframework.data.mongodb.core.mapping.Field.class);
 		return annotation != null ? annotation.order() : Integer.MAX_VALUE;
 	}
 
@@ -192,7 +182,7 @@ public class BasicMongoPersistentProperty extends AnnotationBasedPersistentPrope
 	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#isDbReference()
 	 */
 	public boolean isDbReference() {
-		return isAnnotationPresent(DBRef.class);
+		return getField().isAnnotationPresent(DBRef.class);
 	}
 
 	/*
@@ -200,33 +190,14 @@ public class BasicMongoPersistentProperty extends AnnotationBasedPersistentPrope
 	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#getDBRef()
 	 */
 	public DBRef getDBRef() {
-		return findAnnotation(DBRef.class);
+		return getField().getAnnotation(DBRef.class);
 	}
 
-	/*
+	/* 
 	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#isLanguageProperty()
+	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#usePropertyAccess()
 	 */
-	@Override
-	public boolean isLanguageProperty() {
-		return getFieldName().equals(LANGUAGE_FIELD_NAME) || isExplicitLanguageProperty();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#isExplicitLanguageProperty()
-	 */
-	@Override
-	public boolean isExplicitLanguageProperty() {
-		return isAnnotationPresent(Language.class);
-	};
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#isTextScoreProperty()
-	 */
-	@Override
-	public boolean isTextScoreProperty() {
-		return isAnnotationPresent(TextScore.class);
+	public boolean usePropertyAccess() {
+		return CAUSE_FIELD.equals(getField());
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@ package org.springframework.data.mongodb.core.mapping;
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Field;
 
-import org.springframework.data.mapping.model.FieldNamingStrategy;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
 
 /**

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

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.mapping;
+
+import java.util.Locale;
+
+/**
+ * {@link FieldNamingStrategy} that abbreviates field names by using the very first letter of the camel case parts of
+ * the {@link MongoPersistentProperty}'s name.
+ * 
+ * @since 1.3
+ * @author Oliver Gierke
+ */
+public class CamelCaseAbbreviatingFieldNamingStrategy implements FieldNamingStrategy {
+
+	private static final String CAMEL_CASE_PATTERN = "(?<!(^|[A-Z]))(?=[A-Z])|(?<!^)(?=[A-Z][a-z])";
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.mapping.FieldNamingStrategy#getFieldName(org.springframework.data.mongodb.core.mapping.MongoPersistentProperty)
+	 */
+	public String getFieldName(MongoPersistentProperty property) {
+
+		String[] parts = property.getName().split(CAMEL_CASE_PATTERN);
+		StringBuilder builder = new StringBuilder();
+
+		for (String part : parts) {
+			builder.append(part.substring(0, 1).toLowerCase(Locale.US));
+		}
+
+		return builder.toString();
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2013 by the original author(s).
+ * Copyright 2011-2012 by the original author(s).
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,8 +27,7 @@ import org.springframework.data.annotation.Reference;
  * An annotation that indicates the annotated field is to be stored using a {@link com.mongodb.DBRef}.
  * 
  * @author Jon Brisbin
- * @author Oliver Gierke
- * @author Thomas Darimont
+ * @authot Oliver Gierke
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
@@ -42,11 +41,4 @@ public @interface DBRef {
 	 * @return
 	 */
 	String db() default "";
-
-	/**
-	 * Controls whether the referenced entity should be loaded lazily. This defaults to {@literal false}.
-	 * 
-	 * @return
-	 */
-	boolean lazy() default false;
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2014 by the original author(s).
+ * Copyright (c) 2011 by the original author(s).
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,6 @@ import org.springframework.data.annotation.Persistent;
  * 
  * @author Jon Brisbin <jbrisbin@vmware.com>
  * @author Oliver Gierke ogierke@vmware.com
- * @author Christoph Strobl
  */
 @Persistent
 @Inherited
@@ -38,13 +37,4 @@ import org.springframework.data.annotation.Persistent;
 public @interface Document {
 
 	String collection() default "";
-
-	/**
-	 * Defines the default language to be used with this document.
-	 * 
-	 * @since 1.6
-	 * @return
-	 */
-	String language() default "";
-
 }