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 the [forum](http://forum.spring.io/forum/spring-projects/data/nosql).
+* 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.4.1.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.5.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 the Spring Community Forums.  Please help out on the [forum](http://forum.spring.io/forum/spring-projects/data/nosql) by responding to questions and joining the debate.
+* 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

@@ -5,7 +5,7 @@
 	
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-mongodb-parent</artifactId>
-	<version>1.5.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.4.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,9 +29,8 @@
 	<properties>
 		<project.type>multi</project.type>
 		<dist.id>spring-data-mongodb</dist.id>
-		<springdata.commons>1.8.0.M1</springdata.commons>
-		<mongo>2.11.4</mongo>
-		<mongo-osgi>${mongo}</mongo-osgi>
+		<springdata.commons>1.6.5.RELEASE</springdata.commons>
+		<mongo>2.10.1</mongo>
 	</properties>
 	
 	<developers>
@@ -39,18 +38,18 @@
 			<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,16 +102,6 @@
 		</developer>
 	</developers>
 
-	<profiles>
-		<profile>
-			<id>mongo-next</id>
-			<properties>
-				<mongo>2.12.0-rc0</mongo>
-				<mongo-osgi>2.12.0</mongo-osgi>
-			</properties>
-		</profile>
-	</profiles>
-
 	<dependencies>
 		<!-- MongoDB -->
 		<dependency>
@@ -124,16 +113,16 @@
 	
 	<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/pom.xml

@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.5.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>
@@ -24,6 +24,7 @@
 		<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.5.0.M1</version>
+			<version>1.3.6.BUILD-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>

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: 
  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)}",
+ 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

@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.5.0.M1</version>
+		<version>1.3.6.BUILD-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	

spring-data-mongodb-log4j/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.5.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,182 +1,153 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<context version="7.1.9.205">
-    <scope type="Project" name="spring-data-mongodb">
-        <element type="TypeFilterReferenceOverridden" name="Filter">
-            <element type="IncludeTypePattern" name="org.springframework.data.mongodb.**"/>
+<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|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

@@ -11,13 +11,12 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.5.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>
 	</properties>
 
 	<dependencies>
@@ -26,18 +25,22 @@
 		<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>
@@ -48,10 +51,11 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-expression</artifactId>
+			<version>${spring}</version>
 		</dependency>
 
 		<!--  Spring Data -->
-		<dependency>
+			<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>spring-data-commons</artifactId>
 			<version>${springdata.commons}</version>
@@ -115,13 +119,6 @@
 			<version>${validation}</version>
 			<optional>true</optional>
 		</dependency>
-		
-		<dependency>
-			<groupId>org.objenesis</groupId>
-			<artifactId>objenesis</artifactId>
-			<version>${objenesis}</version>
-			<optional>true</optional>
-		</dependency>
 
 		<dependency>
 			<groupId>org.hibernate</groupId>
@@ -152,7 +149,7 @@
 			<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>

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

@@ -28,12 +28,9 @@ import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.data.annotation.Persistent;
 import org.springframework.data.authentication.UserCredentials;
 import org.springframework.data.mapping.context.MappingContextIsNewStrategyFactory;
-import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
 import org.springframework.data.mongodb.core.convert.CustomConversions;
-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;
@@ -50,7 +47,6 @@ import com.mongodb.Mongo;
  * 
  * @author Mark Pollack
  * @author Oliver Gierke
- * @author Thomas Darimont
  */
 @Configuration
 public abstract class AbstractMongoConfiguration {
@@ -62,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}.
@@ -102,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);
+		}
 	}
 
 	/**
@@ -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;
 	}
 

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.
@@ -75,7 +75,7 @@ import org.w3c.dom.Element;
 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)
@@ -86,7 +86,7 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 		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));
 
@@ -98,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
@@ -116,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);
@@ -128,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));
@@ -166,7 +166,7 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 
 	private RuntimeBeanReference getValidator(Object source, ParserContext parserContext) {
 
-		if (!JSR_303_PRESENT) {
+		if (!jsr303Present) {
 			return null;
 		}
 
@@ -180,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");
@@ -195,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);
 		}
@@ -215,8 +214,7 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 					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;
@@ -264,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);
 
@@ -311,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/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

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

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

@@ -1,6 +1,6 @@
 /*
- * Copyright 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
@@ -23,6 +23,7 @@ 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;
@@ -49,10 +50,7 @@ import com.mongodb.WriteResult;
  * @author Oliver Gierke
  * @author Tobias Trelle
  * @author Chuong Ngo
- * @author Christoph Strobl
- * @author Thomas Darimont
  */
-@SuppressWarnings("deprecation")
 public interface MongoOperations {
 
 	/**
@@ -415,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}.
@@ -425,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}.
@@ -470,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);
 
 	/**
@@ -553,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);
 
@@ -668,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.
@@ -725,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
 	 */
@@ -742,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
@@ -865,7 +795,7 @@ public interface MongoOperations {
 	 * 
 	 * @param object
 	 */
-	WriteResult remove(Object object);
+	void remove(Object object);
 
 	/**
 	 * Removes the given object from the given collection.
@@ -873,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
@@ -882,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
@@ -901,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,13 +46,9 @@ 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.Metric;
+import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.model.BeanWrapper;
 import org.springframework.data.mapping.model.MappingException;
@@ -64,14 +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;
@@ -96,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;
 
@@ -115,6 +110,7 @@ import com.mongodb.WriteConcern;
 import com.mongodb.WriteResult;
 import com.mongodb.util.JSON;
 import com.mongodb.util.JSONParseException;
+
 /**
  * Primary implementation of {@link MongoOperations}.
  * 
@@ -130,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);
@@ -151,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;
 
@@ -205,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);
@@ -377,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));
 		}
 
@@ -743,7 +737,8 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		MongoPersistentEntity<?> mongoPersistentEntity = getPersistentEntity(entity.getClass());
 
 		if (mongoPersistentEntity != null && mongoPersistentEntity.hasVersionProperty()) {
-			BeanWrapper<Object> wrapper = BeanWrapper.create(entity, this.mongoConverter.getConversionService());
+			BeanWrapper<PersistentEntity<Object, ?>, Object> wrapper = BeanWrapper.create(entity,
+					this.mongoConverter.getConversionService());
 			wrapper.setProperty(mongoPersistentEntity.getVersionProperty(), 0);
 		}
 	}
@@ -837,11 +832,12 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 
 	private <T> void doSaveVersioned(T objectToSave, MongoPersistentEntity<?> entity, String collectionName) {
 
-		BeanWrapper<T> beanWrapper = BeanWrapper.create(objectToSave, this.mongoConverter.getConversionService());
+		BeanWrapper<PersistentEntity<T, ?>, T> beanWrapper = BeanWrapper.create(objectToSave,
+				this.mongoConverter.getConversionService());
 		MongoPersistentProperty idProperty = entity.getIdProperty();
 		MongoPersistentProperty versionProperty = entity.getVersionProperty();
 
-		Number version = beanWrapper.getProperty(versionProperty, Number.class);
+		Number version = beanWrapper.getProperty(versionProperty, Number.class, !versionProperty.usePropertyAccess());
 
 		// Fresh instance -> initialize version property
 		if (version == null) {
@@ -855,7 +851,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 			Query query = new Query(Criteria.where(idProperty.getName()).is(id).and(versionProperty.getName()).is(version));
 
 			// Bump version number
-			Number number = beanWrapper.getProperty(versionProperty, Number.class);
+			Number number = beanWrapper.getProperty(versionProperty, Number.class, false);
 			beanWrapper.setProperty(versionProperty, number.longValue() + 1);
 
 			BasicDBObject dbObject = new BasicDBObject();
@@ -1031,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);
 			}
 		}
 	}
@@ -1047,48 +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 {@link MongoPersistentProperty} defining the {@literal id} as
-	 * {@link Entry#getKey()} and the {@link Id}s property value as its {@link Entry#getValue()}.
-	 * 
-	 * @param object
-	 * @return
-	 */
-	private Map.Entry<MongoPersistentProperty, Object> extractIdPropertyAndValue(Object object) {
-
-		Assert.notNull(object, "Id cannot be extracted from 'null'.");
-
-		Class<?> objectType = object.getClass();
-		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(objectType);
-		MongoPersistentProperty idProp = entity == null ? null : entity.getIdProperty();
-
-		if (idProp == null) {
-			throw new MappingException("No id property found for object of type " + objectType);
-		}
-
-		Object idValue = BeanWrapper.create(object, mongoConverter.getConversionService())
-				.getProperty(idProp, Object.class);
-		return Collections.singletonMap(idProp, idValue).entrySet().iterator().next();
+		doRemove(collection, getIdQueryFor(object), object.getClass());
 	}
 
 	/**
@@ -1099,31 +1070,21 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 */
 	private Query getIdQueryFor(Object object) {
 
-		Map.Entry<MongoPersistentProperty, Object> id = extractIdPropertyAndValue(object);
-		return new Query(where(id.getKey().getFieldName()).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();
-		Map.Entry<MongoPersistentProperty, 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().getFieldName()).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) {
@@ -1136,7 +1097,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		}
 
 		ConversionService service = mongoConverter.getConversionService();
-		Object idValue = BeanWrapper.create(entity, service).getProperty(idProperty, Object.class);
+		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(
@@ -1145,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!");
@@ -1168,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));
 
@@ -1185,12 +1146,11 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 
 				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;
 			}
 		});
 	}
@@ -1224,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);
@@ -1249,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) {
@@ -1308,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
@@ -1346,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) {
 
@@ -1656,8 +1568,6 @@ 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);
 
@@ -1695,9 +1605,9 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		}
 
 		ConversionService conversionService = mongoConverter.getConversionService();
-		BeanWrapper<Object> wrapper = BeanWrapper.create(savedObject, conversionService);
+		BeanWrapper<PersistentEntity<Object, ?>, Object> wrapper = BeanWrapper.create(savedObject, conversionService);
 
-		Object idValue = wrapper.getProperty(idProp, idProp.getType());
+		Object idValue = wrapper.getProperty(idProp, idProp.getType(), true);
 
 		if (idValue != null) {
 			return;
@@ -1934,9 +1844,7 @@ 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;
 	}

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/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/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);
@@ -349,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/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.
@@ -32,13 +32,13 @@ import org.springframework.util.StringUtils;
  * @author Oliver Gierke
  * @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;
 
@@ -197,30 +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;
-			}
-
-			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;

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.
@@ -115,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.
 	 * 
@@ -191,133 +187,13 @@ 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);
-	}
-
-	/**
-	 * @author Thomas Darimont
-	 */
-	public static class ExpressionProjectionOperationBuilder extends AbstractProjectionOperationBuilder {
-
-		private final Object[] params;
-
-		/**
-		 * Creates a new {@link ExpressionProjectionOperationBuilder} for the given value, {@link ProjectionOperation} and
-		 * parameters.
-		 * 
-		 * @param value must not be {@literal null}.
-		 * @param operation must not be {@literal null}.
-		 * @param parameters
-		 */
-		public ExpressionProjectionOperationBuilder(Object value, ProjectionOperation operation, Object[] parameters) {
-
-			super(value, operation);
-			this.params = parameters.clone();
-		}
-
-		/*
-		 * (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(), 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;
@@ -332,7 +208,9 @@ 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.operation = operation;
@@ -367,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));
 			}
@@ -385,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);
 		}
 
@@ -422,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));
 		}
 
@@ -434,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);
 		}
 
@@ -447,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));
 		}
 
@@ -459,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);
 		}
@@ -473,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));
 		}
 
@@ -486,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);
 		}
@@ -500,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));
 		}
 

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/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;
@@ -94,29 +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.addAll(JodaTimeConverters.getConvertersToRegister());
-		toRegister.addAll(GeoConverters.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/DbRefResolver.java

@@ -1,55 +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);
-
-	/**
-	 * Creates a {@link DBRef} instance for the given {@link org.springframework.data.mongodb.core.mapping.DBRef}
-	 * annotation, {@link MongoPersistentEntity} and id.
-	 * 
-	 * @param annotation will never be {@literal null}.
-	 * @param entity will never be {@literal null}.
-	 * @param id will never be {@literal null}.
-	 * @return
-	 */
-	DBRef createDbRef(org.springframework.data.mongodb.core.mapping.DBRef annotation, MongoPersistentEntity<?> entity,
-			Object id);
-}

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

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

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

@@ -1,398 +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.objenesis.Objenesis;
-import org.objenesis.ObjenesisStd;
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.cglib.proxy.Callback;
-import org.springframework.cglib.proxy.Enhancer;
-import org.springframework.cglib.proxy.Factory;
-import org.springframework.cglib.proxy.MethodProxy;
-import org.springframework.core.SpringVersion;
-import org.springframework.dao.DataAccessException;
-import org.springframework.dao.support.PersistenceExceptionTranslator;
-import org.springframework.data.mongodb.LazyLoadingException;
-import org.springframework.data.mongodb.MongoDbFactory;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.ReflectionUtils;
-import org.springframework.util.StringUtils;
-
-import com.mongodb.DB;
-import com.mongodb.DBRef;
-
-/**
- * A {@link DbRefResolver} that resolves {@link org.springframework.data.mongodb.core.mapping.DBRef}s by delegating to a
- * {@link DbRefResolverCallback} than is able to generate lazy loading proxies.
- * 
- * @author Thomas Darimont
- * @author Oliver Gierke
- * @since 1.4
- */
-public class DefaultDbRefResolver implements DbRefResolver {
-
-	private static final boolean IS_SPRING_4_OR_BETTER = SpringVersion.getVersion().startsWith("4");
-	private static final boolean OBJENESIS_PRESENT = ClassUtils.isPresent("org.objenesis.Objenesis", null);
-
-	private final MongoDbFactory mongoDbFactory;
-	private final PersistenceExceptionTranslator exceptionTranslator;
-
-	/**
-	 * Creates a new {@link DefaultDbRefResolver} with the given {@link MongoDbFactory}.
-	 * 
-	 * @param mongoDbFactory must not be {@literal null}.
-	 */
-	public DefaultDbRefResolver(MongoDbFactory mongoDbFactory) {
-
-		Assert.notNull(mongoDbFactory, "MongoDbFactory translator must not be null!");
-
-		this.mongoDbFactory = mongoDbFactory;
-		this.exceptionTranslator = mongoDbFactory.getExceptionTranslator();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.DbRefResolver#resolveDbRef(org.springframework.data.mongodb.core.mapping.MongoPersistentProperty, org.springframework.data.mongodb.core.convert.DbRefResolverCallback)
-	 */
-	@Override
-	public Object resolveDbRef(MongoPersistentProperty property, DBRef dbref, DbRefResolverCallback callback) {
-
-		Assert.notNull(property, "Property must not be null!");
-		Assert.notNull(callback, "Callback must not be null!");
-
-		if (isLazyDbRef(property)) {
-			return createLazyLoadingProxy(property, dbref, callback);
-		}
-
-		return callback.resolve(property);
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.DbRefResolver#created(org.springframework.data.mongodb.core.mapping.MongoPersistentProperty, org.springframework.data.mongodb.core.mapping.MongoPersistentEntity, java.lang.Object)
-	 */
-	@Override
-	public DBRef createDbRef(org.springframework.data.mongodb.core.mapping.DBRef annotation,
-			MongoPersistentEntity<?> entity, Object id) {
-
-		DB db = mongoDbFactory.getDb();
-		db = annotation != null && StringUtils.hasText(annotation.db()) ? mongoDbFactory.getDb(annotation.db()) : db;
-
-		return new DBRef(db, entity.getCollection(), id);
-	}
-
-	/**
-	 * Creates a proxy for the given {@link MongoPersistentProperty} using the given {@link DbRefResolverCallback} to
-	 * eventually resolve the value of the property.
-	 * 
-	 * @param property must not be {@literal null}.
-	 * @param dbref can be {@literal null}.
-	 * @param callback must not be {@literal null}.
-	 * @return
-	 */
-	private Object createLazyLoadingProxy(MongoPersistentProperty property, DBRef dbref, DbRefResolverCallback callback) {
-
-		ProxyFactory proxyFactory = new ProxyFactory();
-		Class<?> propertyType = property.getType();
-
-		for (Class<?> type : propertyType.getInterfaces()) {
-			proxyFactory.addInterface(type);
-		}
-
-		LazyLoadingInterceptor interceptor = new LazyLoadingInterceptor(property, dbref, exceptionTranslator, callback);
-
-		proxyFactory.addInterface(LazyLoadingProxy.class);
-
-		if (propertyType.isInterface()) {
-			proxyFactory.addInterface(propertyType);
-			proxyFactory.addAdvice(interceptor);
-			return proxyFactory.getProxy();
-		}
-
-		proxyFactory.setProxyTargetClass(true);
-		proxyFactory.setTargetClass(propertyType);
-
-		if (IS_SPRING_4_OR_BETTER || !OBJENESIS_PRESENT) {
-			proxyFactory.addAdvice(interceptor);
-			return proxyFactory.getProxy();
-		}
-
-		return ObjenesisProxyEnhancer.enhanceAndGet(proxyFactory, propertyType, interceptor);
-	}
-
-	/**
-	 * 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
-	 */
-	static class LazyLoadingInterceptor implements MethodInterceptor, org.springframework.cglib.proxy.MethodInterceptor,
-			Serializable {
-
-		private static final Method INITIALIZE_METHOD, TO_DBREF_METHOD;
-
-		private final DbRefResolverCallback callback;
-		private final MongoPersistentProperty property;
-		private final PersistenceExceptionTranslator exceptionTranslator;
-
-		private volatile boolean resolved;
-		private Object result;
-		private DBRef dbref;
-
-		static {
-			try {
-				INITIALIZE_METHOD = LazyLoadingProxy.class.getMethod("initialize");
-				TO_DBREF_METHOD = LazyLoadingProxy.class.getMethod("toDBRef");
-			} catch (Exception e) {
-				throw new RuntimeException(e);
-			}
-		}
-
-		/**
-		 * Creates a new {@link LazyLoadingInterceptor} for the given {@link MongoPersistentProperty},
-		 * {@link PersistenceExceptionTranslator} and {@link DbRefResolverCallback}.
-		 * 
-		 * @param property must not be {@literal null}.
-		 * @param dbref can be {@literal null}.
-		 * @param callback must not be {@literal null}.
-		 */
-		public LazyLoadingInterceptor(MongoPersistentProperty property, 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);
-				}
-			}
-
-			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;
-		}
-	}
-
-	/**
-	 * Static class to accomodate optional dependency on Objenesis.
-	 * 
-	 * @author Oliver Gierke
-	 */
-	private static class ObjenesisProxyEnhancer {
-
-		private static final Objenesis OBJENESIS = new ObjenesisStd(true);
-
-		public static Object enhanceAndGet(ProxyFactory proxyFactory, Class<?> type,
-				org.springframework.cglib.proxy.MethodInterceptor interceptor) {
-
-			Enhancer enhancer = new Enhancer();
-			enhancer.setSuperclass(type);
-			enhancer.setCallbackType(org.springframework.cglib.proxy.MethodInterceptor.class);
-			enhancer.setInterfaces(new Class[] { LazyLoadingProxy.class });
-
-			Factory factory = (Factory) OBJENESIS.newInstance(enhancer.createClass());
-			factory.setCallbacks(new Callback[] { interceptor });
-			return factory;
-		}
-	}
-}

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

@@ -1,520 +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
-	 */
-	@SuppressWarnings("unchecked")
-	public static Collection<? extends Object> getConvertersToRegister() {
-		return Arrays.asList( //
-				BoxToDbObjectConverter.INSTANCE //
-				, PolygonToDbObjectConverter.INSTANCE //
-				, CircleToDbObjectConverter.INSTANCE //
-				, LegacyCircleToDbObjectConverter.INSTANCE //
-				, SphereToDbObjectConverter.INSTANCE //
-				, DbObjectToBoxConverter.INSTANCE //
-				, DbObjectToPolygonConverter.INSTANCE //
-				, DbObjectToCircleConverter.INSTANCE //
-				, DbObjectToLegacyCircleConverter.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
-		@SuppressWarnings("deprecation")
-		public Point convert(DBObject source) {
-
-			Assert.isTrue(source.keySet().size() == 2, "Source must contain 2 elements");
-
-			return source == null ? null : new org.springframework.data.mongodb.core.geo.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 org.springframework.data.mongodb.core.geo.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
-		@SuppressWarnings("deprecation")
-		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 org.springframework.data.mongodb.core.geo.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 org.springframework.data.mongodb.core.geo.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 Circle} into a {@link BasicDBList}.
-	 * 
-	 * @author Thomas Darimont
-	 * @since 1.5
-	 */
-	@SuppressWarnings("deprecation")
-	public static enum LegacyCircleToDbObjectConverter implements
-			Converter<org.springframework.data.mongodb.core.geo.Circle, DBObject> {
-
-		INSTANCE;
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
-		@Override
-		public DBObject convert(org.springframework.data.mongodb.core.geo.Circle source) {
-
-			if (source == null) {
-				return null;
-			}
-
-			DBObject result = new BasicDBObject();
-			result.put("center", PointToDbObjectConverter.INSTANCE.convert(source.getCenter()));
-			result.put("radius", source.getRadius());
-			return result;
-		}
-	}
-
-	/**
-	 * Converts a {@link BasicDBList} into a {@link org.springframework.data.mongodb.core.geo.Circle}.
-	 * 
-	 * @author Thomas Darimont
-	 * @since 1.5
-	 */
-	@ReadingConverter
-	@SuppressWarnings("deprecation")
-	public static enum DbObjectToLegacyCircleConverter implements
-			Converter<DBObject, org.springframework.data.mongodb.core.geo.Circle> {
-
-		INSTANCE;
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
-		@Override
-		public org.springframework.data.mongodb.core.geo.Circle convert(DBObject source) {
-
-			if (source == null) {
-				return null;
-			}
-
-			DBObject centerSource = (DBObject) source.get("center");
-			Double radius = (Double) source.get("radius");
-
-			Assert.notNull(centerSource, "Center must not be null!");
-			Assert.notNull(radius, "Radius must not be null!");
-
-			Point center = DbObjectToPointConverter.INSTANCE.convert(centerSource);
-			return new org.springframework.data.mongodb.core.geo.Circle(center, radius);
-		}
-	}
-
-	/**
-	 * 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 org.springframework.data.mongodb.core.geo.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({ "deprecation", "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 org.springframework.data.mongodb.core.geo.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
-		@SuppressWarnings("deprecation")
-		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 org.springframework.data.mongodb.core.geo.Circle) {
-
-				argument.add(toList(((org.springframework.data.mongodb.core.geo.Circle) shape).getCenter()));
-				argument.add(((org.springframework.data.mongodb.core.geo.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,45 +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
- * @since 1.5
- */
-public interface LazyLoadingProxy {
-
-	/**
-	 * Initializes the proxy and returns the wrapped value.
-	 * 
-	 * @return
-	 * @since 1.5
-	 */
-	Object initialize();
-
-	/**
-	 * Returns the {@link DBRef} represented by this {@link LazyLoadingProxy}, may be null.
-	 * 
-	 * @return
-	 * @since 1.5
-	 */
-	DBRef toDBRef();
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-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,10 +29,10 @@ 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.ConversionServiceFactory;
-import org.springframework.data.convert.CollectionFactory;
 import org.springframework.data.convert.EntityInstantiator;
 import org.springframework.data.convert.TypeMapper;
 import org.springframework.data.mapping.Association;
@@ -57,9 +57,11 @@ import org.springframework.data.util.TypeInformation;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import com.mongodb.BasicDBList;
 import com.mongodb.BasicDBObject;
+import com.mongodb.DB;
 import com.mongodb.DBObject;
 import com.mongodb.DBRef;
 
@@ -71,38 +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 {
 
-	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}.
 	 */
 	@SuppressWarnings("deprecation")
-	public MappingMongoConverter(DbRefResolver dbRefResolver,
+	public MappingMongoConverter(MongoDbFactory mongoDbFactory,
 			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
 
 		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);
@@ -110,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
@@ -165,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)
@@ -234,7 +234,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 				parent);
 	}
 
-	private <S extends Object> S read(final MongoPersistentEntity<S> entity, final DBObject dbo, final Object parent) {
+	private <S extends Object> S read(final MongoPersistentEntity<S> entity, final DBObject dbo, Object parent) {
 
 		final DefaultSpELExpressionEvaluator evaluator = new DefaultSpELExpressionEvaluator(dbo, spELContext);
 
@@ -242,7 +242,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		EntityInstantiator instantiator = instantiators.getInstantiatorFor(entity);
 		S instance = instantiator.createInstance(entity, provider);
 
-		final BeanWrapper<S> wrapper = BeanWrapper.create(instance, conversionService);
+		final BeanWrapper<MongoPersistentEntity<S>, S> wrapper = BeanWrapper.create(instance, conversionService);
 		final S result = wrapper.getBean();
 
 		// Set properties not already set in the constructor
@@ -254,27 +254,18 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 				}
 
 				Object obj = getValueInternal(prop, dbo, evaluator, result);
-				wrapper.setProperty(prop, obj);
+				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);
 
-				MongoPersistentProperty property = association.getInverse();
+				wrapper.setProperty(inverseProp, obj);
 
-				Object value = dbo.get(property.getName());
-				DBRef dbref = value instanceof DBRef ? (DBRef) value : null;
-				Object obj = dbRefResolver.resolveDbRef(property, dbref, new DbRefResolverCallback() {
-
-					@Override
-					public Object resolve(MongoPersistentProperty property) {
-						return getValueInternal(property, dbo, evaluator, parent);
-					}
-				});
-
-				wrapper.setProperty(property, obj);
 			}
 		});
 
@@ -294,7 +285,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			Assert.isTrue(annotation != null, "The referenced property has to be mapped with @DBRef!");
 		}
 
-		return createDBRef(object, referingProperty);
+		return createDBRef(object, annotation);
 	}
 
 	/**
@@ -365,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 BeanWrapper<Object> wrapper = BeanWrapper.create(obj, conversionService);
+		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 = wrapper.getProperty(idProperty, Object.class);
+				Object id = wrapper.getProperty(idProperty, Object.class, fieldAccessOnly);
 				dbo.put("_id", idMapper.convertId(id));
 			} catch (ConversionException ignored) {}
 		}
@@ -384,14 +377,15 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 					return;
 				}
 
-				Object propertyObj = wrapper.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());
 					}
 				}
 			}
@@ -401,7 +395,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			public void doWithAssociation(Association<MongoPersistentProperty> association) {
 				MongoPersistentProperty inverseProp = association.getInverse();
 				Class<?> type = inverseProp.getType();
-				Object propertyObj = wrapper.getProperty(inverseProp, type);
+				Object propertyObj = wrapper.getProperty(inverseProp, type, useFieldAccessOnly);
 				if (null != propertyObj) {
 					writePropertyInternal(propertyObj, dbo, inverseProp);
 				}
@@ -416,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).initialize();
-		}
-
 		// 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();
+		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) {
@@ -522,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);
 		}
 
@@ -555,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.");
@@ -675,7 +647,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	 */
 	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();
 
 		boolean notTheSameClass = !value.getClass().equals(reference);
@@ -695,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.
@@ -748,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);
 
@@ -757,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());
@@ -769,21 +735,17 @@ 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 {
-			BeanWrapper<Object> wrapper = BeanWrapper.create(target, conversionService);
-			id = wrapper.getProperty(idProperty, Object.class);
-		}
+		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));
 	}
 
 	protected Object getValueInternal(MongoPersistentProperty prop, DBObject dbo, SpELExpressionEvaluator eval,
@@ -800,6 +762,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	 * @param sourceValue must not be {@literal null}.
 	 * @return the converted {@link Collection} or array, will never be {@literal null}.
 	 */
+	@SuppressWarnings("unchecked")
 	private Object readCollectionOrArray(TypeInformation<?> targetType, BasicDBList sourceValue, Object parent) {
 
 		Assert.notNull(targetType);
@@ -810,19 +773,19 @@ 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),
+				items.add(DBRef.class.equals(rawComponentType) ? dbObjItem : read(componentType, ((DBRef) dbObjItem).fetch(),
 						parent));
 			} else if (dbObjItem instanceof DBObject) {
 				items.add(read(componentType, (DBObject) dbObjItem, parent));
@@ -847,14 +810,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		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()) {
@@ -864,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, 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));
@@ -919,17 +879,15 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			return getPotentiallyConvertedSimpleWrite(obj);
 		}
 
-		TypeInformation<?> typeHint = typeInformation == null ? null : ClassTypeInformation.OBJECT;
-
 		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;
 		}
@@ -937,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();
@@ -960,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;
 	}
 
@@ -1009,7 +965,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 
 	private class MongoDbPropertyValueProvider implements PropertyValueProvider<MongoPersistentProperty> {
 
-		private final DBObjectAccessor source;
+		private final DBObject source;
 		private final SpELExpressionEvaluator evaluator;
 		private final Object parent;
 
@@ -1022,7 +978,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			Assert.notNull(source);
 			Assert.notNull(evaluator);
 
-			this.source = new DBObjectAccessor(source);
+			this.source = source;
 			this.evaluator = evaluator;
 			this.parent = parent;
 		}
@@ -1034,7 +990,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		public <T> T getPropertyValue(MongoPersistentProperty property) {
 
 			String expression = property.getSpelExpression();
-			Object value = expression != null ? evaluator.evaluate(expression) : source.get(property);
+			Object value = expression != null ? evaluator.evaluate(expression) : source.get(property.getFieldName());
 
 			if (value == null) {
 				return null;
@@ -1087,7 +1043,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		if (conversions.hasCustomReadTarget(value.getClass(), rawType)) {
 			return (T) conversionService.convert(value, rawType);
 		} else if (value instanceof DBRef) {
-			return (T) (rawType.equals(DBRef.class) ? value : read(type, readRef((DBRef) value), parent));
+			return (T) (rawType.equals(DBRef.class) ? value : read(type, ((DBRef) value).fetch(), parent));
 		} else if (value instanceof BasicDBList) {
 			return (T) readCollectionOrArray(type, (BasicDBList) value, parent);
 		} else if (value instanceof DBObject) {
@@ -1096,14 +1052,4 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			return (T) getPotentiallyConvertedSimpleRead(value, rawType);
 		}
 	}
-
-	/**
-	 * Performs the fetch operation for the given {@link DBRef}.
-	 * 
-	 * @param ref
-	 * @return
-	 */
-	DBObject readRef(DBRef ref) {
-		return ref.fetch();
-	}
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/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.
@@ -33,14 +33,15 @@ import com.mongodb.DBObject;
  * Wrapper class to contain useful converters for the usage with Mongo.
  * 
  * @author Oliver Gierke
- * @author Thomas Darimont
  */
 abstract class MongoConverters {
 
 	/**
 	 * Private constructor to prevent instantiation.
 	 */
-	private MongoConverters() {}
+	private MongoConverters() {
+
+	}
 
 	/**
 	 * Simple singleton to convert {@link ObjectId}s to their {@link String} representation.

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,7 +47,6 @@ import com.mongodb.DBRef;
  * @author Oliver Gierke
  * @author Patryk Wasik
  * @author Thomas Darimont
- * @author Christoph Strobl
  */
 public class QueryMapper {
 
@@ -111,36 +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;
 	}
 
-	/**
-	 * 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
@@ -159,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()) {
@@ -168,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));
 			}
 
@@ -185,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);
 	}
@@ -205,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());
 
@@ -238,7 +217,7 @@ public class QueryMapper {
 		}
 
 		if (isAssociationConversionNecessary(documentField, value)) {
-			return convertAssociation(value, documentField);
+			return convertAssociation(value, documentField.getProperty());
 		}
 
 		return convertSimpleOrDBObject(value, documentField.getPropertyEntity());
@@ -254,10 +233,9 @@ public class QueryMapper {
 	 * @param value
 	 * @return
 	 */
-	protected boolean isAssociationConversionNecessary(Field documentField, Object value) {
+	private boolean isAssociationConversionNecessary(Field documentField, Object value) {
 		return documentField.isAssociation() && value != null
-				&& (documentField.getProperty().getActualType().isAssignableFrom(value.getClass()) //
-				|| documentField.getPropertyEntity().getIdProperty().getActualType().isAssignableFrom(value.getClass()));
+				&& documentField.getProperty().getActualType().isAssignableFrom(value.getClass());
 	}
 
 	/**
@@ -267,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);
 		}
 
@@ -292,10 +270,6 @@ public class QueryMapper {
 		return converter.convertToMongoType(source);
 	}
 
-	protected Object convertAssociation(Object source, Field field) {
-		return convertAssociation(source, field.getProperty());
-	}
-
 	/**
 	 * Converts the given source assuming it's actually an association to another object.
 	 * 
@@ -303,16 +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 DBRef || source instanceof DBObject) {
+		if (property == null || !property.isAssociation() || source == null || source instanceof DBRef
+				|| !property.isEntity()) {
 			return source;
 		}
 
 		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;
 		}
@@ -321,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);
 	}
 
@@ -427,7 +360,7 @@ public class QueryMapper {
 	 * 
 	 * @author Oliver Gierke
 	 */
-	static class Keyword {
+	private static class Keyword {
 
 		private static final String N_OR_PATTERN = "\\$.*or";
 
@@ -517,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
 		 */
@@ -553,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;
-		}
 	}
 
 	/**
@@ -576,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
@@ -604,7 +519,6 @@ public class QueryMapper {
 
 			this.path = getPath(name);
 			this.property = path == null ? null : path.getLeafProperty();
-			this.association = findAssociation();
 		}
 
 		/*
@@ -638,7 +552,7 @@ public class QueryMapper {
 		 */
 		@Override
 		public MongoPersistentProperty getProperty() {
-			return association == null ? property : association.getInverse();
+			return property;
 		}
 
 		/* 
@@ -657,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();
 		}
 
 		/*
@@ -696,10 +585,6 @@ public class QueryMapper {
 			return path == null ? name : path.toDotPath(getPropertyConverter());
 		}
 
-		protected PersistentPropertyPath<MongoPersistentProperty> getPath() {
-			return path;
-		}
-
 		/**
 		 * Returns the {@link PersistentPropertyPath} for the given <code>pathExpression</code>.
 		 * 
@@ -709,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;
 			}

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

@@ -17,32 +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.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}.
@@ -68,63 +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 (!isUpdateModifier(rawValue)) {
-			return super.getMappedObjectForField(field, getMappedValue(field, 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 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)
@@ -166,62 +100,13 @@ 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()
 		 */
 		@Override
 		protected Converter<MongoPersistentProperty, String> getPropertyConverter() {
-			return isAssociation() ? new AssociationConverter(getAssociation()) : new UpdatePropertyConverter(key);
-		}
-
-		/**
-		 * Converter to skip all properties after an association property was rendered.
-		 * 
-		 * @author Oliver Gierke
-		 */
-		private static class AssociationConverter implements Converter<MongoPersistentProperty, String> {
-
-			private final MongoPersistentProperty property;
-			private boolean associationFound;
-
-			/**
-			 * Creates a new {@link AssociationConverter} for the given {@link Association}.
-			 * 
-			 * @param association must not be {@literal null}.
-			 */
-			public AssociationConverter(Association<MongoPersistentProperty> association) {
-
-				Assert.notNull(association, "Association must not be null!");
-				this.property = association.getInverse();
-			}
-
-			/* 
-			 * (non-Javadoc)
-			 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-			 */
-			@Override
-			public String convert(MongoPersistentProperty source) {
-
-				if (associationFound) {
-					return null;
-				}
-
-				if (property.equals(source)) {
-					associationFound = true;
-				}
-
-				return source.getFieldName();
-			}
+			return new UpdatePropertyConverter(key);
 		}
 
 		/**

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/Box.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,31 +16,44 @@
 package org.springframework.data.mongodb.core.geo;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
-import org.springframework.data.geo.Point;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.util.Assert;
 
 /**
- * Represents a geospatial box value.
+ * Represents a geospatial box value
  * 
- * @deprecated As of release 1.5, replaced by {@link org.springframework.data.geo.Box}. This class is scheduled to be
- *             removed in the next major release.
  * @author Mark Pollack
  * @author Oliver Gierke
- * @author Thomas Darimont
  */
-@Deprecated
-public class Box extends org.springframework.data.geo.Box implements Shape {
+public class Box implements Shape {
 
-	public static final String COMMAND = "$box";
+	@Field(order = 10)
+	private final Point first;
+	@Field(order = 20)
+	private final Point second;
 
 	public Box(Point lowerLeft, Point upperRight) {
-		super(lowerLeft, upperRight);
+		Assert.notNull(lowerLeft);
+		Assert.notNull(upperRight);
+		this.first = lowerLeft;
+		this.second = upperRight;
 	}
 
 	public Box(double[] lowerLeft, double[] upperRight) {
-		super(lowerLeft, 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;
 	}
 
 	/*
@@ -48,28 +61,46 @@ public class Box extends org.springframework.data.geo.Box implements Shape {
 	 * @see org.springframework.data.mongodb.core.geo.Shape#asList()
 	 */
 	public List<? extends Object> asList() {
-
 		List<List<Double>> list = new ArrayList<List<Double>>();
-
-		list.add(Arrays.asList(getFirst().getX(), getFirst().getY()));
-		list.add(Arrays.asList(getSecond().getX(), getSecond().getY()));
-
+		list.add(getLowerLeft().asList());
+		list.add(getUpperRight().asList());
 		return list;
 	}
 
-	public org.springframework.data.mongodb.core.geo.Point getLowerLeft() {
-		return new org.springframework.data.mongodb.core.geo.Point(getFirst());
-	}
-
-	public org.springframework.data.mongodb.core.geo.Point getUpperRight() {
-		return new org.springframework.data.mongodb.core.geo.Point(getSecond());
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.geo.Shape#getCommand()
 	 */
 	public String getCommand() {
-		return COMMAND;
+		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

@@ -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,32 +16,19 @@
 package org.springframework.data.mongodb.core.geo;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import org.springframework.data.annotation.PersistenceConstructor;
-import org.springframework.data.geo.Distance;
-import org.springframework.data.geo.Metrics;
-import org.springframework.data.geo.Point;
 import org.springframework.util.Assert;
 
 /**
- * Represents a geospatial circle value.
- * <p>
- * Note: We deliberately do not extend org.springframework.data.geo.Circle because introducing it's distance concept
- * would break the clients that use the old Circle API.
+ * Represents a geospatial circle value
  * 
  * @author Mark Pollack
  * @author Oliver Gierke
- * @author Thomas Darimont
- * @deprecated As of release 1.5, replaced by {@link org.springframework.data.geo.Circle}. This class is scheduled to be
- *             removed in the next major release.
  */
-@Deprecated
 public class Circle implements Shape {
 
-	public static final String COMMAND = "$center";
-
 	private final Point center;
 	private final double radius;
 
@@ -62,8 +49,7 @@ public class Circle implements Shape {
 	}
 
 	/**
-	 * Creates a new {@link Circle} from the given coordinates and radius as {@link Distance} with a
-	 * {@link Metrics#NEUTRAL}.
+	 * Creates a new {@link Circle} from the given coordinates and radius.
 	 * 
 	 * @param centerX
 	 * @param centerY
@@ -96,11 +82,9 @@ public class Circle implements Shape {
 	 * @see org.springframework.data.mongodb.core.geo.Shape#asList()
 	 */
 	public List<Object> asList() {
-
 		List<Object> result = new ArrayList<Object>();
-		result.add(Arrays.asList(getCenter().getX(), getCenter().getY()));
+		result.add(getCenter().asList());
 		result.add(getRadius());
-
 		return result;
 	}
 
@@ -109,7 +93,7 @@ public class Circle implements Shape {
 	 * @see org.springframework.data.mongodb.core.geo.Shape#getCommand()
 	 */
 	public String getCommand() {
-		return COMMAND;
+		return "$center";
 	}
 
 	/*

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/CustomMetric.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.
@@ -18,13 +18,11 @@ package org.springframework.data.mongodb.core.geo;
 /**
  * Value object to create custom {@link Metric}s on the fly.
  * 
- * @deprecated As of release 1.5, replaced by {@link org.springframework.data.geo.Metric}. This class is scheduled to be
- *             removed in the next major release.
  * @author Oliver Gierke
- * @author Thomas Darimont
  */
-@Deprecated
-public class CustomMetric extends org.springframework.data.geo.CustomMetric implements Metric {
+public class CustomMetric implements Metric {
+
+	private final double multiplier;
 
 	/**
 	 * Creates a custom {@link Metric} using the given multiplier.
@@ -32,6 +30,14 @@ public class CustomMetric extends org.springframework.data.geo.CustomMetric impl
 	 * @param multiplier
 	 */
 	public CustomMetric(double multiplier) {
-		super(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/Distance.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,19 +15,17 @@
  */
 package org.springframework.data.mongodb.core.geo;
 
-import org.springframework.data.geo.Metric;
-import org.springframework.data.geo.Metrics;
+import org.springframework.util.ObjectUtils;
 
 /**
  * Value object to represent distances in a given metric.
  * 
- * @deprecated As of release 1.5, replaced by {@link org.springframework.data.geo.Distance}. This class is scheduled to
- *             be removed in the next major release.
  * @author Oliver Gierke
- * @author Thomas Darimont
  */
-@Deprecated
-public class Distance extends org.springframework.data.geo.Distance {
+public class Distance {
+
+	private final double value;
+	private final Metric metric;
 
 	/**
 	 * Creates a new {@link Distance}.
@@ -38,7 +36,110 @@ public class Distance extends org.springframework.data.geo.Distance {
 		this(value, Metrics.NEUTRAL);
 	}
 
+	/**
+	 * Creates a new {@link Distance} with the given {@link Metric}.
+	 * 
+	 * @param value
+	 * @param metric
+	 */
 	public Distance(double value, Metric metric) {
-		super(value, 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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 the original author or authors.
+ * Copyright 2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,21 +16,19 @@
 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.
  * 
- * @deprecated As of release 1.5, replaced by {@link org.springframework.data.geo.GeoPage}. This class is scheduled to
- *             be removed in the next major release.
  * @author Oliver Gierke
- * @author Thomas Darimont
  */
-@Deprecated
-public class GeoPage<T> extends org.springframework.data.geo.GeoPage<T> {
+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}.
@@ -38,7 +36,8 @@ public class GeoPage<T> extends org.springframework.data.geo.GeoPage<T> {
 	 * @param content must not be {@literal null}.
 	 */
 	public GeoPage(GeoResults<T> results) {
-		super(results);
+		super(results.getContent());
+		this.averageDistance = results.getAverageDistance();
 	}
 
 	/**
@@ -49,6 +48,16 @@ public class GeoPage<T> extends org.springframework.data.geo.GeoPage<T> {
 	 * @param total
 	 */
 	public GeoPage(GeoResults<T> results, Pageable pageable, long total) {
-		super(results, pageable, 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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 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.
@@ -15,16 +15,17 @@
  */
 package org.springframework.data.mongodb.core.geo;
 
+import org.springframework.util.Assert;
+
 /**
  * Calue object capturing some arbitrary object plus a distance.
  * 
- * @deprecated As of release 1.5, replaced by {@link org.springframework.data.geo.GeoResult}. This class is scheduled to
- *             be removed in the next major release.
  * @author Oliver Gierke
- * @author Thomas Darimont
  */
-@Deprecated
-public class GeoResult<T> extends org.springframework.data.geo.GeoResult<T> {
+public class GeoResult<T> {
+
+	private final T content;
+	private final Distance distance;
 
 	/**
 	 * Creates a new {@link GeoResult} for the given content and distance.
@@ -33,6 +34,69 @@ public class GeoResult<T> extends org.springframework.data.geo.GeoResult<T> {
 	 * @param distance must not be {@literal null}.
 	 */
 	public GeoResult(T content, Distance distance) {
-		super(content, 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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 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.
@@ -15,23 +15,23 @@
  */
 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.data.geo.Distance;
-import org.springframework.data.geo.GeoResult;
-import org.springframework.data.geo.Metric;
+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.
  * 
- * @deprecated As of release 1.5, replaced by {@link org.springframework.data.geo.GeoResults}. This class is scheduled
- *             to be removed in the next major release.
  * @author Oliver Gierke
- * @author Thomas Darimont
  */
-@Deprecated
-public class GeoResults<T> extends org.springframework.data.geo.GeoResults<T> {
+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
@@ -39,12 +39,12 @@ public class GeoResults<T> extends org.springframework.data.geo.GeoResults<T> {
 	 * 
 	 * @param results must not be {@literal null}.
 	 */
-	public GeoResults(List<? extends GeoResult<T>> results) {
-		super(results);
+	public GeoResults(List<GeoResult<T>> results) {
+		this(results, (Metric) null);
 	}
 
-	public GeoResults(List<? extends GeoResult<T>> results, Metric metric) {
-		super(results, metric);
+	public GeoResults(List<GeoResult<T>> results, Metric metric) {
+		this(results, calculateAverageDistance(results, metric));
 	}
 
 	/**
@@ -54,7 +54,92 @@ public class GeoResults<T> extends org.springframework.data.geo.GeoResults<T> {
 	 * @param averageDistance
 	 */
 	@PersistenceConstructor
-	public GeoResults(List<? extends GeoResult<T>> results, Distance averageDistance) {
-		super(results, averageDistance);
+	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

@@ -1,27 +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.geo;
 
 /**
  * Interface for {@link Metric}s that can be applied to a base scale.
  * 
- * @deprecated As of release 1.5, replaced by {@link org.springframework.data.geo.Metric}. This class is scheduled to be
- *             removed in the next major release.
  * @author Oliver Gierke
- * @author Thomas Darimont
  */
-@Deprecated
-public interface Metric extends org.springframework.data.geo.Metric {}
+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

@@ -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.
- */
 package org.springframework.data.mongodb.core.geo;
 
 import org.springframework.data.mongodb.core.query.NearQuery;
@@ -20,17 +5,11 @@ import org.springframework.data.mongodb.core.query.NearQuery;
 /**
  * Commonly used {@link Metrics} for {@link NearQuery}s.
  * 
- * @deprecated As of release 1.5, replaced by {@link org.springframework.data.geo.Metrics}. This class is scheduled to
- *             be removed in the next major release.
  * @author Oliver Gierke
- * @author Thomas Darimont
  */
-@Deprecated
 public enum Metrics implements Metric {
 
-	KILOMETERS(org.springframework.data.geo.Metrics.KILOMETERS.getMultiplier()), //
-	MILES(org.springframework.data.geo.Metrics.MILES.getMultiplier()), //
-	NEUTRAL(org.springframework.data.geo.Metrics.NEUTRAL.getMultiplier()); //
+	KILOMETERS(6378.137), MILES(3963.191), NEUTRAL(1);
 
 	private final double multiplier;
 
@@ -45,4 +24,4 @@ public enum Metrics implements Metric {
 	public double getMultiplier() {
 		return multiplier;
 	}
-}
+}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/Point.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.
@@ -19,37 +19,85 @@ 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.
  * 
- * @deprecated As of release 1.5, replaced by {@link org.springframework.data.geo.Point}. This class is scheduled to be
- *             removed in the next major release.
  * @author Mark Pollack
  * @author Oliver Gierke
- * @author Thomas Darimont
  */
-@Deprecated
-public class Point extends org.springframework.data.geo.Point {
+public class Point {
+
+	@Field(order = 10)
+	private final double x;
+	@Field(order = 20)
+	private final double y;
 
 	@PersistenceConstructor
 	public Point(double x, double y) {
-		super(x, y);
+		this.x = x;
+		this.y = y;
 	}
 
-	public Point(org.springframework.data.geo.Point point) {
-		super(point);
+	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[] { getX(), getY() };
+		return new double[] { x, y };
 	}
 
 	public List<Double> asList() {
-		return asList(this);
+		return Arrays.asList(x, y);
 	}
 
-	public static List<Double> asList(org.springframework.data.geo.Point point) {
-		return Arrays.asList(point.getX(), point.getY());
+	@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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 the original author or authors.
+ * Copyright 2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,22 +17,19 @@ 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.data.geo.Point;
+import org.springframework.util.Assert;
 
 /**
  * Simple value object to represent a {@link Polygon}.
  * 
- * @deprecated As of release 1.5, replaced by {@link org.springframework.data.geo.Point}. This class is scheduled to be
- *             removed in the next major release.
  * @author Oliver Gierke
- * @author Thomas Darimont
  */
-@Deprecated
-public class Polygon extends org.springframework.data.geo.Polygon implements Shape {
+public class Polygon implements Shape, Iterable<Point> {
 
-	public static final String COMMAND = "$polygon";
+	private final List<Point> points;
 
 	/**
 	 * Creates a new {@link Polygon} for the given Points.
@@ -42,17 +39,31 @@ public class Polygon extends org.springframework.data.geo.Polygon implements Sha
 	 * @param z
 	 * @param others
 	 */
-	public <P extends Point> Polygon(P x, P y, P z, P... others) {
-		super(x, y, z, 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));
 	}
 
-	/**
-	 * Creates a new {@link Polygon} for the given Points.
-	 * 
-	 * @param points
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.geo.Shape#asList()
 	 */
-	public <P extends Point> Polygon(List<P> points) {
-		super(points);
+	public List<List<Double>> asList() {
+
+		List<List<Double>> result = new ArrayList<List<Double>>();
+
+		for (Point point : points) {
+			result.add(point.asList());
+		}
+
+		return result;
 	}
 
 	/*
@@ -60,33 +71,43 @@ public class Polygon extends org.springframework.data.geo.Polygon implements Sha
 	 * @see org.springframework.data.mongodb.core.geo.Shape#getCommand()
 	 */
 	public String getCommand() {
-		return COMMAND;
+		return "$polygon";
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.geo.Shape#asList()
+	 * @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 List<? extends Object> asList() {
-		return asList(this);
-	}
+	public boolean equals(Object obj) {
 
-	/**
-	 * Returns a {@link List} of x,y-coordinate tuples of {@link Point}s from the given {@link Polygon}.
-	 * 
-	 * @param polygon
-	 * @return
-	 */
-	public static List<? extends Object> asList(org.springframework.data.geo.Polygon polygon) {
-
-		List<Point> points = polygon.getPoints();
-		List<List<Double>> tuples = new ArrayList<List<Double>>(points.size());
-
-		for (Point point : points) {
-			tuples.add(Arrays.asList(point.getX(), point.getY()));
+		if (this == obj) {
+			return true;
 		}
 
-		return tuples;
+		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 2011-2014 the original author or authors.
+ * Copyright 2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,13 +20,9 @@ import java.util.List;
 /**
  * Common interface for all shapes. Allows building MongoDB representations of them.
  * 
- * @deprecated As of release 1.5, replaced by {@link org.springframework.data.geo.Shape}. This class is scheduled to be
- *             removed in the next major release.
  * @author Oliver Gierke
- * @author Thomas Darimont
  */
-@Deprecated
-public interface Shape extends org.springframework.data.geo.Shape {
+public interface Shape {
 
 	/**
 	 * Returns the {@link Shape} as a list of usually {@link Double} or {@link List}s of {@link Double}s. Wildcard bound

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

@@ -1,161 +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.util.Assert;
-
-/**
- * Represents a geospatial sphere value.
- * 
- * @author Thomas Darimont
- * @since 1.5
- */
-@SuppressWarnings("deprecation")
-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());
-	}
-
-	/**
-	 * Creates a Sphere from the given {@link Circle}.
-	 * 
-	 * @param circle
-	 */
-	@Deprecated
-	public Sphere(org.springframework.data.mongodb.core.geo.Circle circle) {
-		this(circle.getCenter(), circle.getRadius());
-	}
-
-	/**
-	 * Returns the center of the {@link Circle}.
-	 * 
-	 * @return will never be {@literal null}.
-	 */
-	public org.springframework.data.mongodb.core.geo.Point getCenter() {
-		return new org.springframework.data.mongodb.core.geo.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;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.geo.Shape#asList()
-	 */
-	@Override
-	public List<? extends Object> asList() {
-		return Arrays.asList(Arrays.asList(center.getX(), center.getY()), this.radius.getValue());
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.geo.Shape#getCommand()
-	 */
-	@Override
-	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

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

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

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

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2010-2013 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,8 +24,7 @@ import java.lang.annotation.Target;
 /**
  * Mark a field to be indexed using MongoDB's geospatial indexing feature.
  * 
- * @author Jon Brisbin
- * @author Laurent Canet
+ * @author Jon Brisbin <jbrisbin@vmware.com>
  */
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
@@ -65,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-2013 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,18 +25,14 @@ import com.mongodb.DBObject;
  * 
  * @author Jon Brisbin
  * @author Oliver Gierke
- * @author Laurent Canet
  */
 public class GeospatialIndex implements IndexDefinition {
 
 	private final String field;
 	private String name;
-	private Integer min;
-	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.
@@ -45,146 +40,52 @@ 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) {
-
-		Assert.hasText(name, "Name must have text!");
-
 		this.name = name;
 		return this;
 	}
 
-	/**
-	 * @param min
-	 * @return
-	 */
 	public GeospatialIndex withMin(int min) {
 		this.min = Integer.valueOf(min);
 		return this;
 	}
 
-	/**
-	 * @param max
-	 * @return
-	 */
 	public GeospatialIndex withMax(int max) {
 		this.max = Integer.valueOf(max);
 		return this;
 	}
 
-	/**
-	 * @param bits
-	 * @return
-	 */
 	public GeospatialIndex withBits(int bits) {
 		this.bits = Integer.valueOf(bits);
 		return this;
 	}
 
-	/**
-	 * @param type must not be {@literal null}.
-	 * @return
-	 */
-	public GeospatialIndex typed(GeoSpatialIndexType type) {
-
-		Assert.notNull(type, "Type must not be null!");
-
-		this.type = type;
-		return this;
-	}
-
-	/**
-	 * @param bucketSize
-	 * @return
-	 */
-	public GeospatialIndex withBucketSize(double bucketSize) {
-		this.bucketSize = bucketSize;
-		return this;
-	}
-
-	/**
-	 * @param fieldName.
-	 * @return
-	 */
-	public GeospatialIndex withAdditionalField(String fieldName) {
-		this.additionalField = fieldName;
-		return this;
-	}
-
 	public DBObject getIndexKeys() {
-
 		DBObject dbo = new BasicDBObject();
-
-		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 (name == null && min == null && max == null && bucketSize == null) {
+		if (name == null && min == null && max == null) {
 			return null;
 		}
-
 		DBObject dbo = new BasicDBObject();
 		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

@@ -41,7 +41,8 @@ public class Index implements IndexDefinition {
 
 	private boolean sparse = false;
 
-	public Index() {}
+	public Index() {
+	}
 
 	public Index(String key, Direction direction) {
 		fieldSpec.put(key, direction);
@@ -82,33 +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;
 	}
 
-	/**
-	 * @see http://docs.mongodb.org/manual/core/index-creation/#index-creation-duplicate-dropping
-	 * @param duplicates
-	 * @return
-	 */
 	public Index unique(Duplicates duplicates) {
 		if (duplicates == Duplicates.DROP) {
 			this.dropDuplicates = true;

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-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;
 
@@ -44,12 +45,11 @@ import com.mongodb.util.JSON;
  * @author Oliver Gierke
  * @author Philipp Schneider
  * @author Johno Crawford
- * @author Laurent Canet
  */
 public class MongoPersistentEntityIndexCreator implements
 		ApplicationListener<MappingContextEvent<MongoPersistentEntity<?>, MongoPersistentProperty>> {
 
-	private static final Logger 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;
@@ -96,8 +96,8 @@ public class MongoPersistentEntityIndexCreator implements
 	protected void checkForIndexes(final MongoPersistentEntity<?> entity) {
 		final Class<?> type = entity.getType();
 		if (!classesSeen.containsKey(type)) {
-			if (LOGGER.isDebugEnabled()) {
-				LOGGER.debug("Analyzing class " + type + " for index information.");
+			if (log.isDebugEnabled()) {
+				log.debug("Analyzing class " + type + " for index information.");
 			}
 
 			// Make sure indexes get created
@@ -111,27 +111,29 @@ public class MongoPersistentEntityIndexCreator implements
 					ensureIndex(indexColl, index.name(), definition, index.unique(), index.dropDups(), index.sparse(),
 							index.background(), index.expireAfterSeconds());
 
-					if (LOGGER.isDebugEnabled()) {
-						LOGGER.debug("Created compound index " + index);
+					if (log.isDebugEnabled()) {
+						log.debug("Created compound index " + index);
 					}
 				}
 			}
 
 			entity.doWithProperties(new PropertyHandler<MongoPersistentProperty>() {
-				public void doWithPersistentProperty(MongoPersistentProperty property) {
+				public void doWithPersistentProperty(MongoPersistentProperty persistentProperty) {
 
-					if (property.isAnnotationPresent(Indexed.class)) {
+					Field field = persistentProperty.getField();
 
-						Indexed index = property.findAnnotation(Indexed.class);
+					if (field.isAnnotationPresent(Indexed.class)) {
+
+						Indexed index = field.getAnnotation(Indexed.class);
 						String name = index.name();
 
 						if (!StringUtils.hasText(name)) {
-							name = property.getFieldName();
+							name = persistentProperty.getFieldName();
 						} else {
-							if (!name.equals(property.getName()) && index.unique() && !index.sparse()) {
+							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 (LOGGER.isWarnEnabled()) {
-									LOGGER.warn("The index name " + name + " doesn't match this property name: " + property.getName()
+								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.");
 								}
 							}
@@ -139,31 +141,29 @@ public class MongoPersistentEntityIndexCreator implements
 
 						String collection = StringUtils.hasText(index.collection()) ? index.collection() : entity.getCollection();
 						int direction = index.direction() == IndexDirection.ASCENDING ? 1 : -1;
-						DBObject definition = new BasicDBObject(property.getFieldName(), direction);
+						DBObject definition = new BasicDBObject(persistentProperty.getFieldName(), direction);
 
 						ensureIndex(collection, name, definition, index.unique(), index.dropDups(), index.sparse(),
 								index.background(), index.expireAfterSeconds());
 
-						if (LOGGER.isDebugEnabled()) {
-							LOGGER.debug("Created property index " + index);
+						if (log.isDebugEnabled()) {
+							log.debug("Created property index " + index);
 						}
 
-					} else if (property.isAnnotationPresent(GeoSpatialIndexed.class)) {
+					} else if (field.isAnnotationPresent(GeoSpatialIndexed.class)) {
 
-						GeoSpatialIndexed index = property.findAnnotation(GeoSpatialIndexed.class);
+						GeoSpatialIndexed index = field.getAnnotation(GeoSpatialIndexed.class);
 
-						GeospatialIndex indexObject = new GeospatialIndex(property.getFieldName());
+						GeospatialIndex indexObject = new GeospatialIndex(persistentProperty.getFieldName());
 						indexObject.withMin(index.min()).withMax(index.max());
-						indexObject.named(StringUtils.hasText(index.name()) ? index.name() : property.getName());
-						indexObject.typed(index.type()).withBucketSize(index.bucketSize())
-								.withAdditionalField(index.additionalField());
+						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 (LOGGER.isDebugEnabled()) {
-							LOGGER.debug(String.format("Created %s for entity %s in collection %s! ", indexObject, entity.getType(),
+						if (log.isDebugEnabled()) {
+							log.debug(String.format("Created %s for entity %s in collection %s! ", indexObject, entity.getType(),
 									collection));
 						}
 					}

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

@@ -29,6 +29,7 @@ import org.springframework.data.mapping.Association;
 import org.springframework.data.mapping.model.AnnotationBasedPersistentProperty;
 import org.springframework.data.mapping.model.MappingException;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
+import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 
 import com.mongodb.DBObject;
@@ -49,14 +50,17 @@ public class BasicMongoPersistentProperty extends AnnotationBasedPersistentPrope
 	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;
@@ -82,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.
 	 * 
@@ -96,7 +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
-		return SUPPORTED_ID_PROPERTY_NAMES.contains(getName());
+		return SUPPORTED_ID_PROPERTY_NAMES.contains(field.getName());
 	}
 
 	/*
@@ -151,7 +163,8 @@ public class BasicMongoPersistentProperty extends AnnotationBasedPersistentPrope
 	 * @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;
 	}
 
@@ -169,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);
 	}
 
 	/*
@@ -177,6 +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#usePropertyAccess()
+	 */
+	public boolean usePropertyAccess() {
+		return CAUSE_FIELD.equals(getField());
 	}
 }

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/event/AuditingEventListener.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,7 +15,6 @@
  */
 package org.springframework.data.mongodb.core.mapping.event;
 
-import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.context.ApplicationListener;
 import org.springframework.data.auditing.AuditingHandler;
 import org.springframework.data.auditing.IsNewAwareAuditingHandler;
@@ -26,22 +25,20 @@ import org.springframework.util.Assert;
  * Event listener to populate auditing related fields on an entity about to be saved.
  * 
  * @author Oliver Gierke
- * @author Thomas Darimont
  */
 public class AuditingEventListener implements ApplicationListener<BeforeConvertEvent<Object>> {
 
-	private final ObjectFactory<IsNewAwareAuditingHandler> auditingHandlerFactory;
+	private final IsNewAwareAuditingHandler<Object> auditingHandler;
 
 	/**
-	 * Creates a new {@link AuditingEventListener} using the given {@link MappingContext} and {@link AuditingHandler}
-	 * provided by the given {@link ObjectFactory}.
+	 * Creates a new {@link AuditingEventListener} using the given {@link MappingContext} and {@link AuditingHandler}.
 	 * 
-	 * @param auditingHandlerFactory must not be {@literal null}.
+	 * @param auditingHandler must not be {@literal null}.
 	 */
-	public AuditingEventListener(ObjectFactory<IsNewAwareAuditingHandler> auditingHandlerFactory) {
+	public AuditingEventListener(IsNewAwareAuditingHandler<Object> auditingHandler) {
 
-		Assert.notNull(auditingHandlerFactory, "IsNewAwareAuditingHandler must not be null!");
-		this.auditingHandlerFactory = auditingHandlerFactory;
+		Assert.notNull(auditingHandler, "IsNewAwareAuditingHandler must not be null!");
+		this.auditingHandler = auditingHandler;
 	}
 
 	/* 
@@ -51,6 +48,6 @@ public class AuditingEventListener implements ApplicationListener<BeforeConvertE
 	public void onApplicationEvent(BeforeConvertEvent<Object> event) {
 
 		Object entity = event.getSource();
-		auditingHandlerFactory.getObject().markAudited(entity);
+		auditingHandler.markAudited(entity);
 	}
 }

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-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.
@@ -25,11 +25,10 @@ import java.util.List;
 import java.util.regex.Pattern;
 
 import org.bson.BSON;
-import org.springframework.data.geo.Circle;
-import org.springframework.data.geo.Point;
-import org.springframework.data.geo.Shape;
 import org.springframework.data.mongodb.InvalidMongoDbApiUsageException;
-import org.springframework.data.mongodb.core.geo.Sphere;
+import org.springframework.data.mongodb.core.geo.Circle;
+import org.springframework.data.mongodb.core.geo.Point;
+import org.springframework.data.mongodb.core.geo.Shape;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 
@@ -44,7 +43,6 @@ import com.mongodb.DBObject;
  * @author Thomas Risberg
  * @author Oliver Gierke
  * @author Thomas Darimont
- * @author Christoph Strobl
  */
 public class Criteria implements CriteriaDefinition {
 
@@ -54,8 +52,11 @@ public class Criteria implements CriteriaDefinition {
 	private static final Object NOT_SET = new Object();
 
 	private String key;
+
 	private List<Criteria> criteriaChain;
+
 	private LinkedHashMap<String, Object> criteria = new LinkedHashMap<String, Object>();
+
 	private Object isValue = NOT_SET;
 
 	public Criteria() {
@@ -100,16 +101,13 @@ public class Criteria implements CriteriaDefinition {
 	 * @return
 	 */
 	public Criteria is(Object o) {
-
-		if (!isValue.equals(NOT_SET)) {
+		if (isValue != NOT_SET) {
 			throw new InvalidMongoDbApiUsageException(
 					"Multiple 'is' values declared. You need to use 'and' with multiple criteria");
 		}
-
 		if (lastOperatorWasNot()) {
 			throw new InvalidMongoDbApiUsageException("Invalid query: 'not' can't be used with 'is' - use 'ne' instead.");
 		}
-
 		this.isValue = o;
 		return this;
 	}
@@ -119,9 +117,8 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a criterion using the {@literal $ne} operator.
+	 * Creates a criterion using the $ne operator
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/query/ne/
 	 * @param o
 	 * @return
 	 */
@@ -131,9 +128,8 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a criterion using the {@literal $lt} operator.
+	 * Creates a criterion using the $lt operator
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/query/lt/
 	 * @param o
 	 * @return
 	 */
@@ -143,9 +139,8 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a criterion using the {@literal $lte} operator.
+	 * Creates a criterion using the $lte operator
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/query/lte/
 	 * @param o
 	 * @return
 	 */
@@ -155,9 +150,8 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a criterion using the {@literal $gt} operator.
+	 * Creates a criterion using the $gt operator
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/query/gt/
 	 * @param o
 	 * @return
 	 */
@@ -167,9 +161,8 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a criterion using the {@literal $gte} operator.
+	 * Creates a criterion using the $gte operator
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/query/gte/
 	 * @param o
 	 * @return
 	 */
@@ -179,9 +172,8 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a criterion using the {@literal $in} operator.
+	 * Creates a criterion using the $in operator
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/query/in/
 	 * @param o the values to match against
 	 * @return
 	 */
@@ -195,9 +187,8 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a criterion using the {@literal $in} operator.
+	 * Creates a criterion using the $in operator
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/query/in/
 	 * @param c the collection containing the values to match against
 	 * @return
 	 */
@@ -207,9 +198,8 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a criterion using the {@literal $nin} operator.
+	 * Creates a criterion using the $nin operator
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/query/nin/
 	 * @param o
 	 * @return
 	 */
@@ -217,22 +207,14 @@ public class Criteria implements CriteriaDefinition {
 		return nin(Arrays.asList(o));
 	}
 
-	/**
-	 * Creates a criterion using the {@literal $nin} operator.
-	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/query/nin/
-	 * @param o
-	 * @return
-	 */
 	public Criteria nin(Collection<?> o) {
 		criteria.put("$nin", o);
 		return this;
 	}
 
 	/**
-	 * Creates a criterion using the {@literal $mod} operator.
+	 * Creates a criterion using the $mod operator
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/query/mod/
 	 * @param value
 	 * @param remainder
 	 * @return
@@ -246,9 +228,8 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a criterion using the {@literal $all} operator.
+	 * Creates a criterion using the $all operator
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/query/all/
 	 * @param o
 	 * @return
 	 */
@@ -256,22 +237,14 @@ public class Criteria implements CriteriaDefinition {
 		return all(Arrays.asList(o));
 	}
 
-	/**
-	 * Creates a criterion using the {@literal $all} operator.
-	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/query/all/
-	 * @param o
-	 * @return
-	 */
 	public Criteria all(Collection<?> o) {
 		criteria.put("$all", o);
 		return this;
 	}
 
 	/**
-	 * Creates a criterion using the {@literal $size} operator.
+	 * Creates a criterion using the $size operator
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/query/size/
 	 * @param s
 	 * @return
 	 */
@@ -281,9 +254,8 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a criterion using the {@literal $exists} operator.
+	 * Creates a criterion using the $exists operator
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/query/exists/
 	 * @param b
 	 * @return
 	 */
@@ -293,9 +265,8 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a criterion using the {@literal $type} operator.
+	 * Creates a criterion using the $type operator
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/query/type/
 	 * @param t
 	 * @return
 	 */
@@ -305,31 +276,22 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a criterion using the {@literal $not} meta operator which affects the clause directly following
+	 * Creates a criterion using the $not meta operator which affects the clause directly following
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/query/not/
 	 * @return
 	 */
 	public Criteria not() {
 		return not(null);
 	}
 
-	/**
-	 * Creates a criterion using the {@literal $not} operator.
-	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/query/not/
-	 * @param value
-	 * @return
-	 */
 	private Criteria not(Object value) {
 		criteria.put("$not", value);
 		return this;
 	}
 
 	/**
-	 * Creates a criterion using a {@literal $regex} operator.
+	 * Creates a criterion using a $regex
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/query/regex/
 	 * @param re
 	 * @return
 	 */
@@ -338,10 +300,8 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a criterion using a {@literal $regex} and {@literal $options} operator.
+	 * Creates a criterion using a $regex and $options
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/query/regex/
-	 * @see http://docs.mongodb.org/manual/reference/operator/query/regex/#op._S_options
 	 * @param re
 	 * @param options
 	 * @return
@@ -374,79 +334,51 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a geospatial criterion using a {@literal $within $centerSphere} operation. This is only available for Mongo
-	 * 1.7 and higher.
+	 * Creates a geospatial criterion using a $within $center operation. This is only available for Mongo 1.7 and higher.
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/query/geoWithin/
-	 * @see http://docs.mongodb.org/manual/reference/operator/query/centerSphere/
 	 * @param circle must not be {@literal null}
 	 * @return
 	 */
 	public Criteria withinSphere(Circle circle) {
 		Assert.notNull(circle);
-		criteria.put("$within", new GeoCommand(new Sphere(circle)));
+		criteria.put("$within", new BasicDBObject("$centerSphere", circle.asList()));
 		return this;
 	}
 
-	/**
-	 * @see Criteria#withinSphere(Circle)
-	 * @param circle
-	 * @return
-	 * @deprecated As of 1.5, Use {@link #withinSphere(Circle)}. This method is scheduled to be removed in the next major
-	 *             release.
-	 */
-	@Deprecated
-	public Criteria withinSphere(org.springframework.data.mongodb.core.geo.Circle circle) {
-		Assert.notNull(circle);
-		criteria.put("$within", new GeoCommand(new Sphere(circle)));
-		return this;
-	}
-
-	/**
-	 * Creates a geospatial criterion using a {@literal $within} operation.
-	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/query/geoWithin/
-	 * @param shape
-	 * @return
-	 */
 	public Criteria within(Shape shape) {
 
 		Assert.notNull(shape);
-		criteria.put("$within", new GeoCommand(shape));
+		criteria.put("$within", new BasicDBObject(shape.getCommand(), shape.asList()));
 		return this;
 	}
 
 	/**
-	 * Creates a geospatial criterion using a {@literal $near} operation.
+	 * Creates a geospatial criterion using a $near operation
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/query/near/
 	 * @param point must not be {@literal null}
 	 * @return
 	 */
 	public Criteria near(Point point) {
 		Assert.notNull(point);
-		criteria.put("$near", point);
+		criteria.put("$near", point.asList());
 		return this;
 	}
 
 	/**
-	 * Creates a geospatial criterion using a {@literal $nearSphere} operation. This is only available for Mongo 1.7 and
-	 * higher.
+	 * Creates a geospatial criterion using a $nearSphere operation. This is only available for Mongo 1.7 and higher.
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/query/nearSphere/
 	 * @param point must not be {@literal null}
 	 * @return
 	 */
 	public Criteria nearSphere(Point point) {
 		Assert.notNull(point);
-		criteria.put("$nearSphere", point);
+		criteria.put("$nearSphere", point.asList());
 		return this;
 	}
 
 	/**
-	 * Creates a geospatical criterion using a {@literal $maxDistance} operation, for use with $near
+	 * Creates a geospatical criterion using a $maxDistance operation, for use with $near
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/query/maxDistance/
 	 * @param maxDistance
 	 * @return
 	 */
@@ -456,9 +388,8 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	/**
-	 * Creates a criterion using the {@literal $elemMatch} operator
+	 * Creates a criterion using the $elemMatch operator
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/query/elemMatch/
 	 * @param c
 	 * @return
 	 */
@@ -544,10 +475,8 @@ public class Criteria implements CriteriaDefinition {
 	}
 
 	protected DBObject getSingleCriteriaObject() {
-
 		DBObject dbo = new BasicDBObject();
 		boolean not = false;
-
 		for (String k : this.criteria.keySet()) {
 			Object value = this.criteria.get(k);
 			if (not) {
@@ -565,14 +494,12 @@ public class Criteria implements CriteriaDefinition {
 		}
 
 		DBObject queryCriteria = new BasicDBObject();
-
-		if (!NOT_SET.equals(isValue)) {
+		if (isValue != NOT_SET) {
 			queryCriteria.put(this.key, this.isValue);
 			queryCriteria.putAll(dbo);
 		} else {
 			queryCriteria.put(this.key, dbo);
 		}
-
 		return queryCriteria;
 	}
 

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

@@ -1,86 +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.query;
-
-import org.springframework.data.geo.Box;
-import org.springframework.data.geo.Circle;
-import org.springframework.data.geo.Polygon;
-import org.springframework.data.geo.Shape;
-import org.springframework.data.mongodb.core.geo.Sphere;
-import org.springframework.util.Assert;
-
-/**
- * Wrapper around a {@link Shape} to allow appropriate query rendering.
- * 
- * @author Thomas Darimont
- * @since 1.5
- */
-public class GeoCommand {
-
-	private final Shape shape;
-	private final String command;
-
-	/**
-	 * Creates a new {@link GeoCommand}.
-	 * 
-	 * @param shape must not be {@literal null}.
-	 */
-	public GeoCommand(Shape shape) {
-
-		Assert.notNull(shape, "Shape must not be null!");
-
-		this.shape = shape;
-		this.command = getCommand(shape);
-	}
-
-	/**
-	 * @return the shape
-	 */
-	public Shape getShape() {
-		return shape;
-	}
-
-	/**
-	 * @return the command
-	 */
-	public String getCommand() {
-		return command;
-	}
-
-	/**
-	 * Returns the MongoDB command for the given {@link Shape}.
-	 * 
-	 * @param shape must not be {@literal null}.
-	 * @return
-	 */
-	@SuppressWarnings("deprecation")
-	private String getCommand(Shape shape) {
-
-		Assert.notNull(shape, "Shape must not be null!");
-
-		if (shape instanceof Box) {
-			return org.springframework.data.mongodb.core.geo.Box.COMMAND;
-		} else if (shape instanceof Circle || shape instanceof org.springframework.data.mongodb.core.geo.Circle) {
-			return org.springframework.data.mongodb.core.geo.Circle.COMMAND;
-		} else if (shape instanceof Polygon) {
-			return org.springframework.data.mongodb.core.geo.Polygon.COMMAND;
-		} else if (shape instanceof Sphere) {
-			return org.springframework.data.mongodb.core.geo.Sphere.COMMAND;
-		}
-
-		throw new IllegalArgumentException("Unknown shape: " + shape);
-	}
-}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/NearQuery.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,14 +15,12 @@
  */
 package org.springframework.data.mongodb.core.query;
 
-import java.util.Arrays;
-
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.geo.CustomMetric;
-import org.springframework.data.geo.Distance;
-import org.springframework.data.geo.Metric;
-import org.springframework.data.geo.Metrics;
-import org.springframework.data.geo.Point;
+import org.springframework.data.mongodb.core.geo.CustomMetric;
+import org.springframework.data.mongodb.core.geo.Distance;
+import org.springframework.data.mongodb.core.geo.Metric;
+import org.springframework.data.mongodb.core.geo.Metrics;
+import org.springframework.data.mongodb.core.geo.Point;
 import org.springframework.util.Assert;
 
 import com.mongodb.BasicDBObject;
@@ -35,7 +33,7 @@ import com.mongodb.DBObject;
  * @author Thomas Darimont
  * @author Christoph Strobl
  */
-public final class NearQuery {
+public class NearQuery {
 
 	private final Point point;
 	private Query query;
@@ -343,7 +341,6 @@ public final class NearQuery {
 	 * 
 	 * @return
 	 */
-	@SuppressWarnings("deprecation")
 	public DBObject toDBObject() {
 
 		BasicDBObject dbObject = new BasicDBObject();
@@ -364,8 +361,7 @@ public final class NearQuery {
 			dbObject.put("num", num);
 		}
 
-		dbObject.put("near", Arrays.asList(point.getX(), point.getY()));
-
+		dbObject.put("near", point.asList());
 		dbObject.put("spherical", spherical);
 
 		return dbObject;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.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.
@@ -23,7 +23,6 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 import org.springframework.data.domain.Pageable;
@@ -42,10 +41,10 @@ import com.mongodb.DBObject;
  */
 public class Query {
 
-	private static final String RESTRICTED_TYPES_KEY = "_$RESTRICTED_TYPES";
+	private final static String RESTRICTED_TYPES_KEY = "_$RESTRICTED_TYPES";
 
 	private final Set<Class<?>> restrictedTypes = new HashSet<Class<?>>();
-	private final Map<String, Criteria> criteria = new LinkedHashMap<String, Criteria>();
+	private LinkedHashMap<String, Criteria> criteria = new LinkedHashMap<String, Criteria>();
 	private Field fieldSpec;
 	private Sort sort;
 	private int skip;
@@ -99,23 +98,11 @@ public class Query {
 		return this.fieldSpec;
 	}
 
-	/**
-	 * Set number of documents to skip before returning results.
-	 * 
-	 * @param skip
-	 * @return
-	 */
 	public Query skip(int skip) {
 		this.skip = skip;
 		return this;
 	}
 
-	/**
-	 * Limit the number of returned documents to {@code limit}.
-	 * 
-	 * @param limit
-	 * @return
-	 */
 	public Query limit(int limit) {
 		this.limit = limit;
 		return this;
@@ -210,7 +197,6 @@ public class Query {
 	public DBObject getQueryObject() {
 
 		DBObject dbo = new BasicDBObject();
-
 		for (String k : criteria.keySet()) {
 			CriteriaDefinition c = criteria.get(k);
 			DBObject cl = c.getCriteriaObject();
@@ -225,45 +211,37 @@ public class Query {
 	}
 
 	public DBObject getFieldsObject() {
-		return this.fieldSpec == null ? null : fieldSpec.getFieldsObject();
+		if (this.fieldSpec == null) {
+			return null;
+		}
+		return fieldSpec.getFieldsObject();
 	}
 
 	public DBObject getSortObject() {
 
-		if (this.sort == null) {
+		if (this.sort == null && this.sort == null) {
 			return null;
 		}
 
 		DBObject dbo = new BasicDBObject();
 
-		for (org.springframework.data.domain.Sort.Order order : this.sort) {
-			dbo.put(order.getProperty(), order.isAscending() ? 1 : -1);
+		if (this.sort != null) {
+			for (org.springframework.data.domain.Sort.Order order : this.sort) {
+				dbo.put(order.getProperty(), order.isAscending() ? 1 : -1);
+			}
 		}
 
 		return dbo;
 	}
 
-	/**
-	 * Get the number of documents to skip.
-	 * 
-	 * @return
-	 */
 	public int getSkip() {
 		return this.skip;
 	}
 
-	/**
-	 * Get the maximum number of documents to be return.
-	 * 
-	 * @return
-	 */
 	public int getLimit() {
 		return this.limit;
 	}
 
-	/**
-	 * @return
-	 */
 	public String getHint() {
 		return hint;
 	}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-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.
@@ -16,18 +16,11 @@
 package org.springframework.data.mongodb.core.query;
 
 import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
 
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
@@ -38,8 +31,6 @@ import com.mongodb.DBObject;
  * @author Thomas Risberg
  * @author Mark Pollack
  * @author Oliver Gierke
- * @author Becca Gaspard
- * @author Christoph Strobl
  */
 public class Update {
 
@@ -47,9 +38,7 @@ public class Update {
 		LAST, FIRST
 	}
 
-	private Set<String> keysToUpdate = new HashSet<String>();
-	private Map<String, Object> modifierOps = new LinkedHashMap<String, Object>();
-	private Map<String, PushOperatorBuilder> pushCommandBuilders = new LinkedHashMap<String, PushOperatorBuilder>(1);
+	private HashMap<String, Object> modifierOps = new LinkedHashMap<String, Object>();
 
 	/**
 	 * Static factory method to create an Update using the provided key
@@ -83,22 +72,15 @@ public class Update {
 				continue;
 			}
 
-			Object value = object.get(key);
-			update.modifierOps.put(key, value);
-			if (isKeyword(key) && value instanceof DBObject) {
-				update.keysToUpdate.addAll(((DBObject) value).keySet());
-			} else {
-				update.keysToUpdate.add(key);
-			}
+			update.modifierOps.put(key, object.get(key));
 		}
 
 		return update;
 	}
 
 	/**
-	 * Update using the {@literal $set} update modifier
+	 * Update using the $set update modifier
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/update/set/
 	 * @param key
 	 * @param value
 	 * @return
@@ -109,22 +91,8 @@ public class Update {
 	}
 
 	/**
-	 * Update using the {@literal $setOnInsert} update modifier
+	 * Update using the $unset update modifier
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/update/setOnInsert/
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public Update setOnInsert(String key, Object value) {
-		addMultiFieldOperation("$setOnInsert", key, value);
-		return this;
-	}
-
-	/**
-	 * Update using the {@literal $unset} update modifier
-	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/update/unset/
 	 * @param key
 	 * @return
 	 */
@@ -134,9 +102,8 @@ public class Update {
 	}
 
 	/**
-	 * Update using the {@literal $inc} update modifier
+	 * Update using the $inc update modifier
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/update/inc/
 	 * @param key
 	 * @param inc
 	 * @return
@@ -147,9 +114,8 @@ public class Update {
 	}
 
 	/**
-	 * Update using the {@literal $push} update modifier
+	 * Update using the $push update modifier
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/update/push/
 	 * @param key
 	 * @param value
 	 * @return
@@ -160,59 +126,27 @@ public class Update {
 	}
 
 	/**
-	 * Update using {@code $push} modifier. <br/>
-	 * Allows creation of {@code $push} command for single or multiple (using {@code $each}) values.
+	 * Update using the $pushAll update modifier
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/update/push/
-	 * @see http://docs.mongodb.org/manual/reference/operator/update/each/
-	 * @param key
-	 * @return {@link PushOperatorBuilder} for given key
-	 */
-	public PushOperatorBuilder push(String key) {
-
-		if (!pushCommandBuilders.containsKey(key)) {
-			pushCommandBuilders.put(key, new PushOperatorBuilder(key));
-		}
-		return pushCommandBuilders.get(key);
-	}
-
-	/**
-	 * Update using the {@code $pushAll} update modifier. <br>
-	 * <b>Note</b>: In mongodb 2.4 the usage of {@code $pushAll} has been deprecated in favor of {@code $push $each}.
-	 * {@link #push(String)}) returns a builder that can be used to populate the {@code $each} object.
-	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/update/pushAll/
 	 * @param key
 	 * @param values
 	 * @return
 	 */
 	public Update pushAll(String key, Object[] values) {
-
 		Object[] convertedValues = new Object[values.length];
 		for (int i = 0; i < values.length; i++) {
 			convertedValues[i] = values[i];
 		}
-		addMultiFieldOperation("$pushAll", key, convertedValues);
+		DBObject keyValue = new BasicDBObject();
+		keyValue.put(key, convertedValues);
+		modifierOps.put("$pushAll", keyValue);
 		return this;
 	}
 
 	/**
-	 * Update using {@code $addToSet} modifier. <br/>
-	 * Allows creation of {@code $push} command for single or multiple (using {@code $each}) values
+	 * Update using the $addToSet update modifier
 	 * 
 	 * @param key
-	 * @return
-	 * @since 1.5
-	 */
-	public AddToSetBuilder addToSet(String key) {
-		return new AddToSetBuilder(key);
-	}
-
-	/**
-	 * Update using the {@literal $addToSet} update modifier
-	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/update/addToSet/
-	 * @param key
 	 * @param value
 	 * @return
 	 */
@@ -222,9 +156,8 @@ public class Update {
 	}
 
 	/**
-	 * Update using the {@literal $pop} update modifier
+	 * Update using the $pop update modifier
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/update/pop/
 	 * @param key
 	 * @param pos
 	 * @return
@@ -235,9 +168,8 @@ public class Update {
 	}
 
 	/**
-	 * Update using the {@literal $pull} update modifier
+	 * Update using the $pull update modifier
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/update/pull/
 	 * @param key
 	 * @param value
 	 * @return
@@ -248,27 +180,26 @@ public class Update {
 	}
 
 	/**
-	 * Update using the {@literal $pullAll} update modifier
+	 * Update using the $pullAll update modifier
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/update/pullAll/
 	 * @param key
 	 * @param values
 	 * @return
 	 */
 	public Update pullAll(String key, Object[] values) {
-
 		Object[] convertedValues = new Object[values.length];
 		for (int i = 0; i < values.length; i++) {
 			convertedValues[i] = values[i];
 		}
-		addFieldOperation("$pullAll", key, convertedValues);
+		DBObject keyValue = new BasicDBObject();
+		keyValue.put(key, convertedValues);
+		modifierOps.put("$pullAll", keyValue);
 		return this;
 	}
 
 	/**
-	 * Update using the {@literal $rename} update modifier
+	 * Update using the $rename update modifier
 	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/update/rename/
 	 * @param oldName
 	 * @param newName
 	 * @return
@@ -286,16 +217,8 @@ public class Update {
 		return dbo;
 	}
 
-	protected void addFieldOperation(String operator, String key, Object value) {
-
-		Assert.hasText(key, "Key/Path for update must not be null or blank.");
-		modifierOps.put(operator, new BasicDBObject(key, value));
-		this.keysToUpdate.add(key);
-	}
-
 	protected void addMultiFieldOperation(String operator, String key, Object value) {
 
-		Assert.hasText(key, "Key/Path for update must not be null or blank.");
 		Object existingValue = this.modifierOps.get(operator);
 		DBObject keyValueMap;
 
@@ -312,183 +235,5 @@ public class Update {
 		}
 
 		keyValueMap.put(key, value);
-		this.keysToUpdate.add(key);
 	}
-
-	/**
-	 * Determine if a given {@code key} will be touched on execution.
-	 * 
-	 * @param key
-	 * @return
-	 */
-	public boolean modifies(String key) {
-		return this.keysToUpdate.contains(key);
-	}
-
-	/**
-	 * Inspects given {@code key} for '$'.
-	 * 
-	 * @param key
-	 * @return
-	 */
-	private static boolean isKeyword(String key) {
-		return StringUtils.startsWithIgnoreCase(key, "$");
-	}
-
-	/**
-	 * Modifiers holds a distinct collection of {@link Modifier}
-	 * 
-	 * @author Christoph Strobl
-	 */
-	public static class Modifiers {
-
-		private HashMap<String, Modifier> modifiers;
-
-		public Modifiers() {
-			this.modifiers = new LinkedHashMap<String, Modifier>(1);
-		}
-
-		public Collection<Modifier> getModifiers() {
-			return Collections.unmodifiableCollection(this.modifiers.values());
-		}
-
-		public void addModifier(Modifier modifier) {
-			this.modifiers.put(modifier.getKey(), modifier);
-		}
-	}
-
-	/**
-	 * Marker interface of nested commands.
-	 * 
-	 * @author Christoph Strobl
-	 */
-	public static interface Modifier {
-
-		/**
-		 * @return the command to send eg. {@code $push}
-		 */
-		String getKey();
-
-		/**
-		 * @return value to be sent with command
-		 */
-		Object getValue();
-	}
-
-	/**
-	 * Implementation of {@link Modifier} representing {@code $each}.
-	 * 
-	 * @author Christoph Strobl
-	 */
-	private static class Each implements Modifier {
-
-		private Object[] values;
-
-		public Each(Object... values) {
-			this.values = extractValues(values);
-		}
-
-		private Object[] extractValues(Object[] values) {
-
-			if (values == null || values.length == 0) {
-				return values;
-			}
-
-			if (values.length == 1 && values[0] instanceof Collection) {
-				return ((Collection<?>) values[0]).toArray();
-			}
-
-			Object[] convertedValues = new Object[values.length];
-			for (int i = 0; i < values.length; i++) {
-				convertedValues[i] = values[i];
-			}
-
-			return convertedValues;
-		}
-
-		@Override
-		public String getKey() {
-			return "$each";
-		}
-
-		@Override
-		public Object getValue() {
-			return this.values;
-		}
-	}
-
-	/**
-	 * Builder for creating {@code $push} modifiers
-	 * 
-	 * @author Christoph Strobl
-	 */
-	public class PushOperatorBuilder {
-
-		private final String key;
-		private final Modifiers modifiers;
-
-		PushOperatorBuilder(String key) {
-			this.key = key;
-			this.modifiers = new Modifiers();
-		}
-
-		/**
-		 * Propagates {@code $each} to {@code $push}
-		 * 
-		 * @param values
-		 * @return
-		 */
-		public Update each(Object... values) {
-
-			this.modifiers.addModifier(new Each(values));
-			return Update.this.push(key, this.modifiers);
-		}
-
-		/**
-		 * Propagates {@link #value(Object)} to {@code $push}
-		 * 
-		 * @param values
-		 * @return
-		 */
-		public Update value(Object value) {
-			return Update.this.push(key, value);
-		}
-	}
-
-	/**
-	 * Builder for creating {@code $addToSet} modifier.
-	 * 
-	 * @author Christoph Strobl
-	 * @since 1.5
-	 */
-	public class AddToSetBuilder {
-
-		private final String key;
-
-		public AddToSetBuilder(String key) {
-			this.key = key;
-		}
-
-		/**
-		 * Propagates {@code $each} to {@code $addToSet}
-		 * 
-		 * @param values
-		 * @return
-		 */
-		public Update each(Object... values) {
-			return Update.this.addToSet(this.key, new Each(values));
-		}
-
-		/**
-		 * Propagates {@link #value(Object)} to {@code $addToSet}
-		 * 
-		 * @param values
-		 * @return
-		 */
-		public Update value(Object value) {
-			return Update.this.addToSet(this.key, value);
-		}
-
-	}
-
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsOperations.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.
@@ -32,7 +32,6 @@ import com.mongodb.gridfs.GridFSFile;
  * @author Oliver Gierke
  * @author Philipp Schneider
  * @author Thomas Darimont
- * @author Martin Baumgartner
  */
 public interface GridFsOperations extends ResourcePatternResolver {
 
@@ -45,24 +44,6 @@ public interface GridFsOperations extends ResourcePatternResolver {
 	 */
 	GridFSFile store(InputStream content, String filename);
 
-	/**
-	 * Stores the given content into a file with the given name.
-	 * 
-	 * @param content must not be {@literal null}.
-	 * @param metadata can be {@literal null}.
-	 * @return the {@link GridFSFile} just created
-	 */
-	GridFSFile store(InputStream content, Object metadata);
-
-	/**
-	 * Stores the given content into a file with the given name.
-	 * 
-	 * @param content must not be {@literal null}.
-	 * @param metadata can be {@literal null}.
-	 * @return the {@link GridFSFile} just created
-	 */
-	GridFSFile store(InputStream content, DBObject metadata);
-
 	/**
 	 * Stores the given content into a file with the given name and content type.
 	 * 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsTemplate.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.
@@ -44,7 +44,6 @@ import com.mongodb.gridfs.GridFSInputFile;
  * @author Oliver Gierke
  * @author Philipp Schneider
  * @author Thomas Darimont
- * @author Martin Baumgartner
  */
 public class GridFsTemplate implements GridFsOperations, ResourcePatternResolver {
 
@@ -90,25 +89,6 @@ public class GridFsTemplate implements GridFsOperations, ResourcePatternResolver
 		return store(content, filename, (Object) null);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#store(java.io.InputStream, java.lang.Object)
-	 */
-
-	@Override
-	public GridFSFile store(InputStream content, Object metadata) {
-		return store(content, null, metadata);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#store(java.io.InputStream, com.mongodb.DBObject)
-	 */
-	@Override
-	public GridFSFile store(InputStream content, DBObject metadata) {
-		return store(content, null, metadata);
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#store(java.io.InputStream, java.lang.String, java.lang.String)
@@ -122,6 +102,7 @@ public class GridFsTemplate implements GridFsOperations, ResourcePatternResolver
 	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#store(java.io.InputStream, java.lang.String, java.lang.Object)
 	 */
 	public GridFSFile store(InputStream content, String filename, Object metadata) {
+
 		return store(content, filename, null, metadata);
 	}
 
@@ -156,12 +137,10 @@ public class GridFsTemplate implements GridFsOperations, ResourcePatternResolver
 	public GridFSFile store(InputStream content, String filename, String contentType, DBObject metadata) {
 
 		Assert.notNull(content);
+		Assert.hasText(filename);
 
 		GridFSInputFile file = getGridFs().createFile(content);
-
-		if (filename != null) {
-			file.setFilename(filename);
-		}
+		file.setFilename(filename);
 
 		if (metadata != null) {
 			file.setMetaData(metadata);
@@ -180,15 +159,7 @@ public class GridFsTemplate implements GridFsOperations, ResourcePatternResolver
 	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#find(com.mongodb.DBObject)
 	 */
 	public List<GridFSDBFile> find(Query query) {
-
-		if (query == null) {
-			return getGridFs().find((DBObject) null);
-		}
-
-		DBObject queryObject = getMappedQuery(query.getQueryObject());
-		DBObject sortObject = getMappedQuery(query.getSortObject());
-
-		return getGridFs().find(queryObject, sortObject);
+		return getGridFs().find(getMappedQuery(query));
 	}
 
 	/*
@@ -253,11 +224,7 @@ public class GridFsTemplate implements GridFsOperations, ResourcePatternResolver
 	}
 
 	private DBObject getMappedQuery(Query query) {
-		return query == null ? new Query().getQueryObject() : getMappedQuery(query.getQueryObject());
-	}
-
-	private DBObject getMappedQuery(DBObject query) {
-		return query == null ? null : queryMapper.getMappedObject(query, null);
+		return query == null ? null : queryMapper.getMappedObject(query.getQueryObject(), null);
 	}
 
 	private GridFS getGridFs() {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,28 +1,13 @@
-/*
- * 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.repository;
 
 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;
 
-import org.springframework.data.geo.Distance;
-import org.springframework.data.geo.Point;
+import java.lang.annotation.Retention;
+
+import org.springframework.data.mongodb.core.geo.Distance;
 
 /**
  * Annotation to be used for disambiguing method parameters that shall be used to trigger geo near queries. By default
@@ -35,4 +20,5 @@ import org.springframework.data.geo.Point;
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.PARAMETER)
 public @interface Near {
+
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/Query.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.
@@ -21,20 +21,15 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.springframework.data.annotation.QueryAnnotation;
-
 /**
  * Annotation to declare finder queries directly on repository methods. Both attributes allow using a placeholder
  * notation of {@code ?0}, {@code ?1} and so on.
  * 
  * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Christoph Strobl
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 @Documented
-@QueryAnnotation
 public @interface Query {
 
 	/**
@@ -60,12 +55,4 @@ public @interface Query {
 	 * @return
 	 */
 	boolean count() default false;
-
-	/**
-	 * Returns whether the query should delete matching documents.
-	 * 
-	 * @since 1.5
-	 * @return
-	 */
-	boolean delete() default false;
 }

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

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

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

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

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoryConfigNamespaceHandler.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.repository.config;
-
-import org.springframework.beans.factory.xml.NamespaceHandler;
-import org.springframework.data.mongodb.config.MongoNamespaceHandler;
-import org.springframework.data.repository.config.RepositoryBeanDefinitionParser;
-import org.springframework.data.repository.config.RepositoryConfigurationExtension;
-
-/**
- * {@link NamespaceHandler} to register repository configuration.
- * 
- * @author Oliver Gierke
- */
-public class MongoRepositoryConfigNamespaceHandler extends MongoNamespaceHandler {
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.config.MongoNamespaceHandler#init()
-	 */
-	@Override
-	public void init() {
-
-		RepositoryConfigurationExtension extension = new MongoRepositoryConfigurationExtension();
-		RepositoryBeanDefinitionParser repositoryBeanDefinitionParser = new RepositoryBeanDefinitionParser(extension);
-
-		registerBeanDefinitionParser("repositories", repositoryBeanDefinitionParser);
-
-		super.init();
-	}
-}

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

@@ -15,19 +15,13 @@
  */
 package org.springframework.data.mongodb.repository.config;
 
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.data.config.ParsingUtils;
-import org.springframework.data.mongodb.config.BeanNames;
-import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.repository.support.MongoRepositoryFactoryBean;
 import org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource;
 import org.springframework.data.repository.config.RepositoryConfigurationExtension;
 import org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport;
-import org.springframework.data.repository.config.RepositoryConfigurationSource;
 import org.springframework.data.repository.config.XmlRepositoryConfigurationSource;
 import org.w3c.dom.Element;
 
@@ -41,8 +35,6 @@ public class MongoRepositoryConfigurationExtension extends RepositoryConfigurati
 	private static final String MONGO_TEMPLATE_REF = "mongo-template-ref";
 	private static final String CREATE_QUERY_INDEXES = "create-query-indexes";
 
-	private boolean fallbackMappingContextCreated = false;
-
 	/* 
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getModulePrefix()
@@ -60,18 +52,6 @@ public class MongoRepositoryConfigurationExtension extends RepositoryConfigurati
 		return MongoRepositoryFactoryBean.class.getName();
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#postProcess(org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.data.repository.config.RepositoryConfigurationSource)
-	 */
-	@Override
-	public void postProcess(BeanDefinitionBuilder builder, RepositoryConfigurationSource source) {
-
-		if (fallbackMappingContextCreated) {
-			builder.addPropertyReference("mappingContext", BeanNames.MAPPING_CONTEXT_BEAN_NAME);
-		}
-	}
-
 	/* 
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#postProcess(org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.data.repository.config.XmlRepositoryConfigurationSource)
@@ -97,21 +77,4 @@ public class MongoRepositoryConfigurationExtension extends RepositoryConfigurati
 		builder.addPropertyReference("mongoOperations", attributes.getString("mongoTemplateRef"));
 		builder.addPropertyValue("createIndexesForQueryMethods", attributes.getBoolean("createIndexesForQueryMethods"));
 	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#registerBeansForRoot(org.springframework.beans.factory.support.BeanDefinitionRegistry, org.springframework.data.repository.config.RepositoryConfigurationSource)
-	 */
-	@Override
-	public void registerBeansForRoot(BeanDefinitionRegistry registry, RepositoryConfigurationSource configurationSource) {
-
-		if (!registry.containsBeanDefinition(BeanNames.MAPPING_CONTEXT_BEAN_NAME)) {
-
-			RootBeanDefinition definition = new RootBeanDefinition(MongoMappingContext.class);
-			definition.setRole(AbstractBeanDefinition.ROLE_INFRASTRUCTURE);
-			definition.setSource(configurationSource.getSource());
-
-			registry.registerBeanDefinition(BeanNames.MAPPING_CONTEXT_BEAN_NAME, definition);
-		}
-	}
 }

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

@@ -20,15 +20,13 @@ import java.util.List;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Slice;
-import org.springframework.data.domain.SliceImpl;
-import org.springframework.data.geo.Distance;
-import org.springframework.data.geo.GeoResult;
-import org.springframework.data.geo.GeoResults;
-import org.springframework.data.geo.Point;
 import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.geo.Distance;
+import org.springframework.data.mongodb.core.geo.GeoPage;
+import org.springframework.data.mongodb.core.geo.GeoResult;
+import org.springframework.data.mongodb.core.geo.GeoResults;
+import org.springframework.data.mongodb.core.geo.Point;
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.repository.query.ParameterAccessor;
@@ -36,14 +34,11 @@ import org.springframework.data.repository.query.RepositoryQuery;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.util.Assert;
 
-import com.mongodb.WriteResult;
-
 /**
  * Base class for {@link RepositoryQuery} implementations for Mongo.
  * 
  * @author Oliver Gierke
  * @author Thomas Darimont
- * @author Christoph Strobl
  */
 public abstract class AbstractMongoQuery implements RepositoryQuery {
 
@@ -86,18 +81,14 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 
 		Object result = null;
 
-		if (isDeleteQuery()) {
-			result = new DeleteExecution().execute(query);
-		} else if (method.isGeoNearQuery() && method.isPageQuery()) {
+		if (method.isGeoNearQuery() && method.isPageQuery()) {
 
 			MongoParameterAccessor countAccessor = new MongoParametersParameterAccessor(method, parameters);
 			Query countQuery = createCountQuery(new ConvertingParameterAccessor(operations.getConverter(), countAccessor));
 
 			result = new GeoNearExecution(accessor).execute(query, countQuery);
 		} else if (method.isGeoNearQuery()) {
-			result = new GeoNearExecution(accessor).execute(query);
-		} else if (method.isSliceQuery()) {
-			result = new SlicedExecution(accessor.getPageable()).execute(query);
+			return new GeoNearExecution(accessor).execute(query);
 		} else if (method.isCollectionQuery()) {
 			result = new CollectionExecution(accessor.getPageable()).execute(query);
 		} else if (method.isPageQuery()) {
@@ -146,14 +137,6 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 	 */
 	protected abstract boolean isCountQuery();
 
-	/**
-	 * Return weather the query should delete matching documents.
-	 * 
-	 * @return
-	 * @since 1.5
-	 */
-	protected abstract boolean isDeleteQuery();
-
 	private abstract class Execution {
 
 		abstract Object execute(Query query);
@@ -172,7 +155,7 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 	 * 
 	 * @author Oliver Gierke
 	 */
-	final class CollectionExecution extends Execution {
+	class CollectionExecution extends Execution {
 
 		private final Pageable pageable;
 
@@ -190,47 +173,12 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 		}
 	}
 
-	/**
-	 * {@link Execution} for {@link Slice} query methods.
-	 * 
-	 * @author Oliver Gierke
-	 * @since 1.5
-	 */
-
-	final class SlicedExecution extends Execution {
-
-		private final Pageable pageable;
-
-		SlicedExecution(Pageable pageable) {
-			this.pageable = pageable;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery.Execution#execute(org.springframework.data.mongodb.core.query.Query)
-		 */
-		@Override
-		@SuppressWarnings({ "unchecked", "rawtypes" })
-		Object execute(Query query) {
-
-			MongoEntityMetadata<?> metadata = method.getEntityInformation();
-			int pageSize = pageable.getPageSize();
-			Pageable slicePageable = new PageRequest(pageable.getPageNumber(), pageSize + 1, pageable.getSort());
-
-			List result = operations.find(query.with(slicePageable), metadata.getJavaType(), metadata.getCollectionName());
-
-			boolean hasNext = result.size() > pageSize;
-
-			return new SliceImpl<Object>(hasNext ? result.subList(0, pageSize) : result, pageable, hasNext);
-		}
-	}
-
 	/**
 	 * {@link Execution} for pagination queries.
 	 * 
 	 * @author Oliver Gierke
 	 */
-	final class PagedExecution extends Execution {
+	class PagedExecution extends Execution {
 
 		private final Pageable pageable;
 
@@ -267,7 +215,7 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 	 * 
 	 * @author Oliver Gierke
 	 */
-	final class SingleEntityExecution extends Execution {
+	class SingleEntityExecution extends Execution {
 
 		private final boolean countProjection;
 
@@ -293,8 +241,7 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 	 * 
 	 * @author Oliver Gierke
 	 */
-	@SuppressWarnings("deprecation")
-	final class GeoNearExecution extends Execution {
+	class GeoNearExecution extends Execution {
 
 		private final MongoParameterAccessor accessor;
 
@@ -325,12 +272,11 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 			MongoEntityMetadata<?> metadata = method.getEntityInformation();
 			long count = operations.count(countQuery, metadata.getCollectionName());
 
-			return new org.springframework.data.mongodb.core.geo.GeoPage<Object>(doExecuteQuery(query),
-					accessor.getPageable(), count);
+			return new GeoPage<Object>(doExecuteQuery(query), accessor.getPageable(), count);
 		}
 
 		@SuppressWarnings("unchecked")
-		private org.springframework.data.mongodb.core.geo.GeoResults<Object> doExecuteQuery(Query query) {
+		private GeoResults<Object> doExecuteQuery(Query query) {
 
 			Point nearLocation = accessor.getGeoNearLocation();
 			NearQuery nearQuery = NearQuery.near(nearLocation);
@@ -350,8 +296,7 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 			}
 
 			MongoEntityMetadata<?> metadata = method.getEntityInformation();
-			return (org.springframework.data.mongodb.core.geo.GeoResults<Object>) operations.geoNear(nearQuery,
-					metadata.getJavaType(), metadata.getCollectionName());
+			return (GeoResults<Object>) operations.geoNear(nearQuery, metadata.getJavaType(), metadata.getCollectionName());
 		}
 
 		private boolean isListOfGeoResult() {
@@ -366,33 +311,4 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 			return componentType == null ? false : GeoResult.class.equals(componentType.getType());
 		}
 	}
-
-	/**
-	 * {@link Execution} removing documents matching the query.
-	 * 
-	 * @since 1.5
-	 */
-	final class DeleteExecution extends Execution {
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery.Execution#execute(org.springframework.data.mongodb.core.query.Query)
-		 */
-		@Override
-		Object execute(Query query) {
-
-			MongoEntityMetadata<?> metadata = method.getEntityInformation();
-			return deleteAndConvertResult(query, metadata);
-		}
-
-		private Object deleteAndConvertResult(Query query, MongoEntityMetadata<?> metadata) {
-
-			if (method.isCollectionQuery()) {
-				return operations.findAllAndRemove(query, metadata.getJavaType());
-			}
-
-			WriteResult writeResult = operations.remove(query, metadata.getCollectionName());
-			return writeResult != null ? writeResult.getN() : 0L;
-		}
-	}
 }