DATAMONGO-911 - Release version 1.4.2.RELEASE (Codd SR2).

Updated to Spring Data Build 1.3.2.RELEASE and Spring Data Commons 1.7.2.RELEASE. Update readme, changelog, notice to reflect recent version. Update pom.xml, index.xml to recent version.

README.md

@@ -11,7 +11,7 @@ For a comprehensive treatment of all the Spring Data MongoDB features, please re
 * the [User Guide](http://docs.spring.io/spring-data/mongodb/docs/current/reference/html/)
 * the [JavaDocs](http://docs.spring.io/spring-data/mongodb/docs/current/api/) have extensive comments in them as well.
 * the home page of [Spring Data MongoDB](http://projects.spring.io/spring-data-mongodb) contains links to articles and other resources.
-* for more detailed questions, use [Spring Data Mongodb on Stackoverflow](http://stackoverflow.com/questions/tagged/spring-data-mongodb).
+* for more detailed questions, use the [forum](http://forum.spring.io/forum/spring-projects/data/nosql).
 
 If you are new to Spring as well as to Spring Data, look for information about [Spring projects](http://projects.spring.io/).
 
@@ -26,7 +26,7 @@ Add the Maven dependency:
 <dependency>
   <groupId>org.springframework.data</groupId>
   <artifactId>spring-data-mongodb</artifactId>
-  <version>1.5.0.RELEASE</version>
+  <version>1.4.2.RELEASE</version>
 </dependency>
 ```
 
@@ -36,7 +36,7 @@ If you'd rather like the latest snapshots of the upcoming major version, use our
 <dependency>
   <groupId>org.springframework.data</groupId>
   <artifactId>spring-data-mongodb</artifactId>
-  <version>1.6.0.BUILD-SNAPSHOT</version>
+  <version>1.5.0.BUILD-SNAPSHOT</version>
 </dependency>
 
 <repository>
@@ -139,7 +139,7 @@ public class MyService {
 
 Here are some ways for you to get involved in the community:
 
-* Get involved with the Spring community on Stackoverflow and help out on the [spring-data-mongodb](http://stackoverflow.com/questions/tagged/spring-data-mongodb) tag by responding to questions and joining the debate.
+* Get involved with the Spring community on the Spring Community Forums.  Please help out on the [forum](http://forum.spring.io/forum/spring-projects/data/nosql) by responding to questions and joining the debate.
 * Create [JIRA](https://jira.springframework.org/browse/DATADOC) tickets for bugs and new features and comment and vote on the ones that you are interested in.  
 * Github is for social coding: if you want to write code, we encourage contributions through pull requests from [forks of this repository](http://help.github.com/forking/). If you want to contribute code this way, please reference a JIRA ticket as well covering the specific issue you are addressing.
 * Watch for upcoming articles on Spring by [subscribing](http://spring.io/blog) to spring.io.

pom.xml

@@ -2,10 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
-
+	
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-mongodb-parent</artifactId>
-	<version>1.5.4.RELEASE</version>
+	<version>1.4.2.RELEASE</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.4.RELEASE</version>
+		<version>1.3.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,11 +29,11 @@
 	<properties>
 		<project.type>multi</project.type>
 		<dist.id>spring-data-mongodb</dist.id>
-		<springdata.commons>1.8.4.RELEASE</springdata.commons>
-		<mongo>2.12.1</mongo>
-		<mongo.osgi>2.12.1</mongo.osgi>
+		<springdata.commons>1.7.2.RELEASE</springdata.commons>
+		<mongo>2.11.4</mongo>
+		<mongo-osgi>${mongo}</mongo-osgi>
 	</properties>
-
+	
 	<developers>
 		<developer>
 			<id>ogierke</id>
@@ -105,35 +105,11 @@
 
 	<profiles>
 		<profile>
-
 			<id>mongo-next</id>
 			<properties>
-				<mongo>2.12.3-SNAPSHOT</mongo>
+				<mongo>2.12.0</mongo>
+				<mongo-osgi>2.12.0</mongo-osgi>
 			</properties>
-
-			<repositories>
-				<repository>
-					<id>mongo-snapshots</id>
-					<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-				</repository>
-			</repositories>
-
-		</profile>
-
-		<profile>
-
-			<id>mongo-3-next</id>
-			<properties>
-				<mongo>3.0.0-SNAPSHOT</mongo>
-			</properties>
-
-			<repositories>
-				<repository>
-					<id>mongo-snapshots</id>
-					<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-				</repository>
-			</repositories>
-
 		</profile>
 	</profiles>
 
@@ -145,14 +121,14 @@
 			<version>${mongo}</version>
 		</dependency>
 	</dependencies>
-
+	
 	<repositories>
 		<repository>
 			<id>spring-libs-release</id>
-			<url>http://repo.spring.io/libs-release</url>
+			<url>http://repo.spring.io/libs-release/</url>
 		</repository>
 	</repositories>
-
+	
 	<pluginRepositories>
 		<pluginRepository>
 			<id>spring-plugins-release</id>

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

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.5.4.RELEASE</version>
+		<version>1.4.2.RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
@@ -48,7 +48,7 @@
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-mongodb</artifactId>
-			<version>1.5.4.RELEASE</version>
+			<version>1.4.2.RELEASE</version>
 		</dependency>
 
 		<dependency>
@@ -98,7 +98,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>aspectj-maven-plugin</artifactId>
-				<version>1.6</version>
+				<version>1.4</version>
 				<dependencies>
 					<dependency>
 						<groupId>org.aspectj</groupId>
@@ -126,8 +126,7 @@
 							<groupId>org.springframework</groupId>
 							<artifactId>spring-aspects</artifactId>
 						</aspectLibrary>
-					</aspectLibraries> 
-					<complianceLevel>${source.level}</complianceLevel>
+					</aspectLibraries>
 					<source>${source.level}</source>
 					<target>${source.level}</target>
 				</configuration>

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

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

spring-data-mongodb-distribution/pom.xml

@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.5.4.RELEASE</version>
+		<version>1.4.2.RELEASE</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.4.RELEASE</version>
+		<version>1.4.2.RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-mongodb-log4j/template.mf

@@ -5,5 +5,5 @@ 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-osgi:[=.=.=,+1.0.0)}",
  org.apache.log4j.*;version="${log4j:[=.=.=,+1.0.0)}"

spring-data-mongodb/Spring Data MongoDB.sonargraph

@@ -5,6 +5,15 @@
             <element type="IncludeTypePattern" name="org.springframework.data.mongodb.**"/>
         </element>
         <architecture>
+            <element type="Layer" name="Config">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="WeakTypePattern" name="**.config.**"/>
+                </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"/>
+                <dependency toName="Project|spring-data-mongodb::Layer|Repositories" type="AllowedDependency"/>
+            </element>
             <element type="Layer" name="Repositories">
                 <element type="TypeFilter" name="Assignment">
                     <element type="IncludeTypePattern" name="**.repository.**"/>
@@ -31,20 +40,10 @@
                     <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"/>
             </element>
-            <element type="Layer" name="Config">
-                <element type="TypeFilter" name="Assignment">
-                    <element type="WeakTypePattern" name="**.config.**"/>
-                </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>
             <element type="Layer" name="Monitoring">
                 <element type="TypeFilter" name="Assignment">
                     <element type="IncludeTypePattern" name="**.monitor.**"/>
@@ -58,39 +57,41 @@
                 <dependency toName="Project|spring-data-mongodb::Layer|Core" type="AllowedDependency"/>
             </element>
             <element type="Layer" name="Core">
-                <element type="TypeFilter" name="Assignment"/>
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="**.core.**"/>
+                </element>
                 <element type="Subsystem" name="Mapping">
                     <element type="TypeFilter" name="Assignment">
-                        <element type="IncludeTypePattern" name="**.core.mapping.**"/>
+                        <element type="IncludeTypePattern" name="**.mapping.**"/>
                     </element>
                 </element>
                 <element type="Subsystem" name="Geospatial">
                     <element type="TypeFilter" name="Assignment">
-                        <element type="IncludeTypePattern" name="**.core.geo.**"/>
+                        <element type="IncludeTypePattern" name="**.geo.**"/>
                     </element>
+                    <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Mapping" type="AllowedDependency"/>
                 </element>
                 <element type="Subsystem" name="Query">
                     <element type="TypeFilter" name="Assignment">
-                        <element type="IncludeTypePattern" name="**.core.query.**"/>
+                        <element type="IncludeTypePattern" name="**.query.**"/>
                     </element>
                     <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Geospatial" type="AllowedDependency"/>
                 </element>
                 <element type="Subsystem" name="Conversion">
                     <element type="TypeFilter" name="Assignment">
-                        <element type="IncludeTypePattern" name="**.core.convert.**"/>
+                        <element type="IncludeTypePattern" name="**.convert.**"/>
                     </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"/>
                 </element>
                 <element type="Subsystem" name="SpEL">
                     <element type="TypeFilter" name="Assignment">
-                        <element type="IncludeTypePattern" name="**.core.spel.**"/>
+                        <element type="IncludeTypePattern" name="**.spel.**"/>
                     </element>
                 </element>
                 <element type="Subsystem" name="Aggregation">
                     <element type="TypeFilter" name="Assignment">
-                        <element type="IncludeTypePattern" name="**.core.aggregation.**"/>
+                        <element type="IncludeTypePattern" name="**.aggregation.**"/>
                     </element>
                     <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Conversion" type="AllowedDependency"/>
                     <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Mapping" type="AllowedDependency"/>
@@ -99,7 +100,7 @@
                 </element>
                 <element type="Subsystem" name="Index">
                     <element type="TypeFilter" name="Assignment">
-                        <element type="IncludeTypePattern" name="**.core.index.**"/>
+                        <element type="IncludeTypePattern" name="**.index.**"/>
                     </element>
                     <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Mapping" type="AllowedDependency"/>
                     <dependency toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Query" type="AllowedDependency"/>
@@ -115,13 +116,6 @@
                     <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"/>
-                </element>
             </element>
             <element type="Subsystem" name="API">
                 <element type="TypeFilter" name="Assignment">

spring-data-mongodb/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
-
+	
 	<artifactId>spring-data-mongodb</artifactId>
 
 	<name>Spring Data MongoDB - Core</name>
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.5.4.RELEASE</version>
+		<version>1.4.2.RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -21,7 +21,7 @@
 	</properties>
 
 	<dependencies>
-
+		
 		<!--  Spring -->
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -77,7 +77,7 @@
 			<version>1.0</version>
 			<optional>true</optional>
 		</dependency>
-
+		
 		<!-- CDI -->
 		<dependency>
 			<groupId>javax.enterprise</groupId>
@@ -86,21 +86,21 @@
 			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
-
+		
 		<dependency>
 			<groupId>javax.el</groupId>
 			<artifactId>el-api</artifactId>
 			<version>${cdi}</version>
 			<scope>test</scope>
 		</dependency>
-
+		
 		<dependency>
 			<groupId>org.apache.openwebbeans.test</groupId>
 			<artifactId>cditest-owb</artifactId>
 			<version>${webbeans}</version>
 			<scope>test</scope>
 		</dependency>
-
+		
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
@@ -115,7 +115,7 @@
 			<version>${validation}</version>
 			<optional>true</optional>
 		</dependency>
-
+		
 		<dependency>
 			<groupId>org.objenesis</groupId>
 			<artifactId>objenesis</artifactId>
@@ -129,23 +129,23 @@
 			<version>4.2.0.Final</version>
 			<scope>test</scope>
 		</dependency>
-
+		
 		<dependency>
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time</artifactId>
 			<version>${jodatime}</version>
 			<scope>test</scope>
 		</dependency>
-
+		
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jul-to-slf4j</artifactId>
 			<version>${slf4j}</version>
 			<scope>test</scope>
 		</dependency>
-
+		
 	</dependencies>
-
+	
 	<build>
 		<plugins>
 
@@ -189,14 +189,9 @@
 					<systemPropertyVariables>
 						<java.util.logging.config.file>src/test/resources/logging.properties</java.util.logging.config.file>
 					</systemPropertyVariables>
-					<properties>
-						<property>
-							<name>listener</name>
-							<value>org.springframework.data.mongodb.test.util.CleanMongoDBJunitRunListener</value>
-						</property>
-					</properties>
 				</configuration>
 			</plugin>
 		</plugins>
 	</build>
+
 </project>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,9 +37,7 @@ import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.mapping.CamelCaseAbbreviatingFieldNamingStrategy;
 import org.springframework.data.mongodb.core.mapping.Document;
-import org.springframework.data.mongodb.core.mapping.FieldNamingStrategy;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
-import org.springframework.data.mongodb.core.mapping.PropertyNameFieldNamingStrategy;
 import org.springframework.data.support.CachingIsNewStrategyFactory;
 import org.springframework.data.support.IsNewStrategyFactory;
 import org.springframework.util.ClassUtils;
@@ -53,7 +51,6 @@ import com.mongodb.Mongo;
  * @author Mark Pollack
  * @author Oliver Gierke
  * @author Thomas Darimont
- * @author Ryan Tenney
  */
 @Configuration
 public abstract class AbstractMongoConfiguration {
@@ -147,7 +144,10 @@ public abstract class AbstractMongoConfiguration {
 		MongoMappingContext mappingContext = new MongoMappingContext();
 		mappingContext.setInitialEntitySet(getInitialEntitySet());
 		mappingContext.setSimpleTypeHolder(customConversions().getSimpleTypeHolder());
-		mappingContext.setFieldNamingStrategy(fieldNamingStrategy());
+
+		if (abbreviateFieldNames()) {
+			mappingContext.setFieldNamingStrategy(new CamelCaseAbbreviatingFieldNamingStrategy());
+		}
 
 		return mappingContext;
 	}
@@ -232,15 +232,4 @@ public abstract class AbstractMongoConfiguration {
 	protected boolean abbreviateFieldNames() {
 		return false;
 	}
-
-	/**
-	 * Configures a {@link FieldNamingStrategy} on the {@link MongoMappingContext} instance created.
-	 * 
-	 * @return
-	 * @since 1.5
-	 */
-	protected FieldNamingStrategy fieldNamingStrategy() {
-		return abbreviateFieldNames() ? new CamelCaseAbbreviatingFieldNamingStrategy()
-				: PropertyNameFieldNamingStrategy.INSTANCE;
-	}
 }

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

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

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

@@ -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;
 	}
 
 	/*
@@ -64,7 +64,7 @@ class GridFsTemplateParser extends AbstractBeanDefinitionParser {
 		if (StringUtils.hasText(dbFactoryRef)) {
 			gridFsTemplateBuilder.addConstructorArgReference(dbFactoryRef);
 		} else {
-			gridFsTemplateBuilder.addConstructorArgReference(BeanNames.DB_FACTORY_BEAN_NAME);
+			gridFsTemplateBuilder.addConstructorArgReference(BeanNames.DB_FACTORY);
 		}
 
 		if (StringUtils.hasText(converterRef)) {
@@ -77,7 +77,7 @@ class GridFsTemplateParser extends AbstractBeanDefinitionParser {
 			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

@@ -30,7 +30,6 @@ import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.parsing.BeanComponentDefinition;
 import org.springframework.beans.factory.parsing.CompositeComponentDefinition;
-import org.springframework.beans.factory.parsing.ReaderContext;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -91,7 +90,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));
 
@@ -103,7 +102,7 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 		// Need a reference to a Mongo instance
 		String dbFactoryRef = element.getAttribute("db-factory-ref");
 		if (!StringUtils.hasText(dbFactoryRef)) {
-			dbFactoryRef = DB_FACTORY_BEAN_NAME;
+			dbFactoryRef = DB_FACTORY;
 		}
 
 		// Converter
@@ -121,10 +120,10 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 		}
 
 		try {
-			registry.getBeanDefinition(INDEX_HELPER_BEAN_NAME);
+			registry.getBeanDefinition(INDEX_HELPER);
 		} catch (NoSuchBeanDefinitionException ignored) {
 			if (!StringUtils.hasText(dbFactoryRef)) {
-				dbFactoryRef = DB_FACTORY_BEAN_NAME;
+				dbFactoryRef = DB_FACTORY;
 			}
 			BeanDefinitionBuilder indexHelperBuilder = BeanDefinitionBuilder
 					.genericBeanDefinition(MongoPersistentEntityIndexCreator.class);
@@ -133,14 +132,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));
@@ -185,7 +184,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");
@@ -214,43 +213,18 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 			mappingContextBuilder.addPropertyValue("simpleTypeHolder", simpleTypesDefinition);
 		}
 
-		parseFieldNamingStrategy(element, parserContext.getReaderContext(), mappingContextBuilder);
+		String abbreviateFieldNames = element.getAttribute("abbreviate-field-names");
+		if ("true".equals(abbreviateFieldNames)) {
+			mappingContextBuilder.addPropertyValue("fieldNamingStrategy", new RootBeanDefinition(
+					CamelCaseAbbreviatingFieldNamingStrategy.class));
+		}
 
-		ctxRef = converterId == null || DEFAULT_CONVERTER_BEAN_NAME.equals(converterId) ? MAPPING_CONTEXT_BEAN_NAME
-				: converterId + "." + MAPPING_CONTEXT_BEAN_NAME;
+		ctxRef = converterId + "." + MAPPING_CONTEXT;
 
 		parserContext.registerBeanComponent(componentDefinitionBuilder.getComponent(mappingContextBuilder, ctxRef));
 		return ctxRef;
 	}
 
-	private static void parseFieldNamingStrategy(Element element, ReaderContext context, BeanDefinitionBuilder builder) {
-
-		String abbreviateFieldNames = element.getAttribute("abbreviate-field-names");
-		String fieldNamingStrategy = element.getAttribute("field-naming-strategy-ref");
-
-		boolean fieldNamingStrategyReferenced = StringUtils.hasText(fieldNamingStrategy);
-		boolean abbreviationActivated = StringUtils.hasText(abbreviateFieldNames)
-				&& Boolean.parseBoolean(abbreviateFieldNames);
-
-		if (fieldNamingStrategyReferenced && abbreviationActivated) {
-			context.error("Field name abbreviation cannot be activated if a field-naming-strategy-ref is configured!",
-					element);
-			return;
-		}
-
-		Object value = null;
-
-		if ("true".equals(abbreviateFieldNames)) {
-			value = new RootBeanDefinition(CamelCaseAbbreviatingFieldNamingStrategy.class);
-		} else if (fieldNamingStrategyReferenced) {
-			value = new RuntimeBeanReference(fieldNamingStrategy);
-		}
-
-		if (value != null) {
-			builder.addPropertyValue("fieldNamingStrategy", value);
-		}
-	}
-
 	private BeanDefinition getCustomConversions(Element element, ParserContext parserContext) {
 
 		List<Element> customConvertersElements = DomUtils.getChildElementsByTagName(element, "custom-converters");
@@ -340,10 +314,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

@@ -21,15 +21,17 @@ import static org.springframework.data.mongodb.config.BeanNames.*;
 import java.lang.annotation.Annotation;
 
 import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.data.auditing.IsNewAwareAuditingHandler;
+import org.springframework.data.auditing.config.AnnotationAuditingConfiguration;
 import org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport;
-import org.springframework.data.auditing.config.AuditingConfiguration;
 import org.springframework.data.config.ParsingUtils;
+import org.springframework.data.mapping.context.MappingContextIsNewStrategyFactory;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.event.AuditingEventListener;
 import org.springframework.data.support.IsNewStrategyFactory;
@@ -52,15 +54,6 @@ class MongoAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
 		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)
@@ -77,16 +70,16 @@ class MongoAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
 
 	/* 
 	 * (non-Javadoc)
-	 * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#getAuditHandlerBeanDefinitionBuilder(org.springframework.data.auditing.config.AuditingConfiguration)
+	 * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#getAuditHandlerBeanDefinitionBuilder(org.springframework.data.auditing.config.AnnotationAuditingConfiguration)
 	 */
 	@Override
-	protected BeanDefinitionBuilder getAuditHandlerBeanDefinitionBuilder(AuditingConfiguration configuration) {
+	protected BeanDefinitionBuilder getAuditHandlerBeanDefinitionBuilder(AnnotationAuditingConfiguration configuration) {
 
-		Assert.notNull(configuration, "AuditingConfiguration must not be null!");
+		Assert.notNull(configuration, "AnnotationAuditingConfiguration must not be null!");
 
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(IsNewAwareAuditingHandler.class);
-		builder.addConstructorArgReference(MAPPING_CONTEXT_BEAN_NAME);
-		return configureDefaultAuditHandlerAttributes(configuration, builder);
+		return configureDefaultAuditHandlerAttributes(configuration,
+				BeanDefinitionBuilder.rootBeanDefinition(IsNewAwareAuditingHandler.class)).addConstructorArgReference(
+				BeanNames.IS_NEW_STRATEGY_FACTORY);
 	}
 
 	/* 
@@ -100,12 +93,8 @@ class MongoAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
 		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(),
+		registerInfrastructureBeanWithId(BeanDefinitionBuilder.rootBeanDefinition(AuditingEventListener.class)
+				.addConstructorArgValue(auditingHandlerDefinition).getRawBeanDefinition(),
 				AuditingEventListener.class.getName(), registry);
 	}
 
@@ -118,13 +107,25 @@ class MongoAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
 	 */
 	private void defaultDependenciesIfNecessary(BeanDefinitionRegistry registry, Object source) {
 
-		if (!registry.containsBeanDefinition(MAPPING_CONTEXT_BEAN_NAME)) {
+		if (!registry.containsBeanDefinition(MAPPING_CONTEXT)) {
 
 			RootBeanDefinition definition = new RootBeanDefinition(MongoMappingContext.class);
 			definition.setRole(ROLE_INFRASTRUCTURE);
 			definition.setSource(source);
 
-			registry.registerBeanDefinition(MAPPING_CONTEXT_BEAN_NAME, definition);
+			registry.registerBeanDefinition(MAPPING_CONTEXT, definition);
+		}
+
+		if (!registry.containsBeanDefinition(IS_NEW_STRATEGY_FACTORY)) {
+
+			BeanDefinitionBuilder builder = BeanDefinitionBuilder
+					.rootBeanDefinition(MappingContextIsNewStrategyFactory.class);
+			builder.addConstructorArgReference(MAPPING_CONTEXT);
+
+			AbstractBeanDefinition definition = ParsingUtils.getSourceBeanDefinition(builder, source);
+			definition.setRole(ROLE_INFRASTRUCTURE);
+
+			registry.registerBeanDefinition(IS_NEW_STRATEGY_FACTORY, definition);
 		}
 	}
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoDbFactoryParser.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.
@@ -54,7 +54,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;
 	}
 
 	/* 
@@ -103,7 +103,7 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 		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/MongoTemplateParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,6 @@ import org.w3c.dom.Element;
  * {@link BeanDefinitionParser} to parse {@code template} elements into {@link BeanDefinition}s.
  * 
  * @author Martin Baumgartner
- * @author Oliver Gierke
  */
 class MongoTemplateParser extends AbstractBeanDefinitionParser {
 
@@ -48,7 +47,7 @@ class MongoTemplateParser extends AbstractBeanDefinitionParser {
 			throws BeanDefinitionStoreException {
 
 		String id = super.resolveId(element, definition, parserContext);
-		return StringUtils.hasText(id) ? id : BeanNames.MONGO_TEMPLATE_BEAN_NAME;
+		return StringUtils.hasText(id) ? id : BeanNames.MONGO_TEMPLATE;
 	}
 
 	/*
@@ -69,7 +68,7 @@ class MongoTemplateParser extends AbstractBeanDefinitionParser {
 		if (StringUtils.hasText(dbFactoryRef)) {
 			mongoTemplateBuilder.addConstructorArgReference(dbFactoryRef);
 		} else {
-			mongoTemplateBuilder.addConstructorArgReference(BeanNames.DB_FACTORY_BEAN_NAME);
+			mongoTemplateBuilder.addConstructorArgReference(BeanNames.DB_FACTORY);
 		}
 
 		if (StringUtils.hasText(converterRef)) {
@@ -81,7 +80,7 @@ class MongoTemplateParser extends AbstractBeanDefinitionParser {
 		BeanComponentDefinition component = helper.getComponent(writeConcernPropertyEditorBuilder);
 		parserContext.registerBeanComponent(component);
 
-		return (AbstractBeanDefinition) helper.getComponentIdButFallback(mongoTemplateBuilder,
-				BeanNames.MONGO_TEMPLATE_BEAN_NAME).getBeanDefinition();
+		return (AbstractBeanDefinition) helper.getComponentIdButFallback(mongoTemplateBuilder, BeanNames.MONGO_TEMPLATE)
+				.getBeanDefinition();
 	}
 }

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

@@ -18,8 +18,6 @@ package org.springframework.data.mongodb.core;
 import static org.springframework.data.domain.Sort.Direction.*;
 
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
 
 import org.springframework.dao.DataAccessException;
@@ -43,7 +41,6 @@ public class DefaultIndexOperations implements IndexOperations {
 
 	private static final Double ONE = Double.valueOf(1);
 	private static final Double MINUS_ONE = Double.valueOf(-1);
-	private static final Collection<String> TWO_D_IDENTIFIERS = Arrays.asList("2d", "2dsphere");
 
 	private final MongoOperations mongoOperations;
 	private final String collectionName;
@@ -143,7 +140,7 @@ public class DefaultIndexOperations implements IndexOperations {
 
 						Object value = keyDbObject.get(key);
 
-						if (TWO_D_IDENTIFIERS.contains(value)) {
+						if ("2d".equals(value)) {
 							indexFields.add(IndexField.geo(key));
 						} else {
 

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

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

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

@@ -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}.
@@ -865,7 +863,7 @@ public interface MongoOperations {
 	 * 
 	 * @param object
 	 */
-	WriteResult remove(Object object);
+	void remove(Object object);
 
 	/**
 	 * Removes the given object from the given collection.
@@ -873,7 +871,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,7 +880,7 @@ 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
@@ -892,7 +890,7 @@ public interface MongoOperations {
 	 * @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 +899,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/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;
 
@@ -48,12 +47,9 @@ 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;
@@ -71,7 +67,10 @@ 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 +95,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;
 
@@ -131,7 +129,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);
@@ -745,7 +742,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);
 		}
 	}
@@ -839,11 +837,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) {
@@ -857,7 +856,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();
@@ -1049,53 +1048,24 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		return dbObject.containsField(persistentEntity.getVersionProperty().getFieldName());
 	}
 
-	public WriteResult remove(Object object) {
+	public void remove(Object object) {
 
 		if (object == null) {
-			return null;
+			return;
 		}
 
-		return remove(getIdQueryFor(object), object.getClass());
+		remove(getIdQueryFor(object), object.getClass());
 	}
 
-	public WriteResult remove(Object object, String collection) {
+	public void remove(Object object, String collection) {
 
 		Assert.hasText(collection);
 
 		if (object == null) {
-			return null;
+			return;
 		}
 
-		return doRemove(collection, getIdQueryFor(object), object.getClass());
-	}
-
-	/**
-	 * Returns {@link Entry} containing the field name of the id property as {@link Entry#getKey()} and the {@link Id}s
-	 * property value as its {@link Entry#getValue()}.
-	 * 
-	 * @param object
-	 * @return
-	 */
-	private Entry<String, Object> extractIdPropertyAndValue(Object object) {
-
-		Assert.notNull(object, "Id cannot be extracted from 'null'.");
-
-		Class<?> objectType = object.getClass();
-
-		if (object instanceof DBObject) {
-			return Collections.singletonMap(ID_FIELD, ((DBObject) object).get(ID_FIELD)).entrySet().iterator().next();
-		}
-
-		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(objectType);
-		MongoPersistentProperty idProp = entity == null ? null : entity.getIdProperty();
-
-		if (idProp == null) {
-			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.getFieldName(), idValue).entrySet().iterator().next();
+		doRemove(collection, getIdQueryFor(object), object.getClass());
 	}
 
 	/**
@@ -1106,31 +1076,21 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 */
 	private Query getIdQueryFor(Object object) {
 
-		Entry<String, Object> id = extractIdPropertyAndValue(object);
-		return new Query(where(id.getKey()).is(id.getValue()));
-	}
+		Assert.notNull(object);
 
-	/**
-	 * Returns a {@link Query} for the given entities by their ids.
-	 * 
-	 * @param objects must not be {@literal null} or {@literal empty}.
-	 * @return
-	 */
-	private Query getIdInQueryFor(Collection<?> objects) {
+		Class<?> objectType = object.getClass();
+		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(objectType);
+		MongoPersistentProperty idProp = entity == null ? null : entity.getIdProperty();
 
-		Assert.notEmpty(objects, "Cannot create Query for empty collection.");
-
-		Iterator<?> it = objects.iterator();
-		Entry<String, Object> firstEntry = extractIdPropertyAndValue(it.next());
-
-		ArrayList<Object> ids = new ArrayList<Object>(objects.size());
-		ids.add(firstEntry.getValue());
-
-		while (it.hasNext()) {
-			ids.add(extractIdPropertyAndValue(it.next()).getValue());
+		if (idProp == null) {
+			throw new MappingException("No id property found for object of type " + objectType);
 		}
 
-		return new Query(where(firstEntry.getKey()).in(ids));
+		ConversionService service = mongoConverter.getConversionService();
+		Object idProperty = null;
+
+		idProperty = BeanWrapper.create(object, service).getProperty(idProp, Object.class, true);
+		return new Query(where(idProp.getFieldName()).is(idProperty));
 	}
 
 	private void assertUpdateableIdIfNotSet(Object entity) {
@@ -1143,7 +1103,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(
@@ -1152,19 +1112,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!");
@@ -1175,8 +1135,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));
 
@@ -1192,12 +1152,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;
 			}
 		});
 	}
@@ -1353,54 +1312,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) {
 
@@ -1460,13 +1371,13 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 						"Can not use skip or field specification with map reduce operations");
 			}
 			if (query.getQueryObject() != null) {
-				copyMapReduceOptions.put("query", queryMapper.getMappedObject(query.getQueryObject(), null));
+				copyMapReduceOptions.put("query", query.getQueryObject());
 			}
 			if (query.getLimit() > 0) {
 				copyMapReduceOptions.put("limit", query.getLimit());
 			}
 			if (query.getSortObject() != null) {
-				copyMapReduceOptions.put("sort", queryMapper.getMappedObject(query.getSortObject(), null));
+				copyMapReduceOptions.put("sort", query.getSortObject());
 			}
 		}
 		return copyMapReduceOptions;
@@ -1702,9 +1613,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;
@@ -2184,8 +2095,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 					cursorToUse = cursorToUse.limit(query.getLimit());
 				}
 				if (query.getSortObject() != null) {
-					DBObject sortDbo = type != null ? getMappedSortObject(query, type) : query.getSortObject();
-					cursorToUse = cursorToUse.sort(sortDbo);
+					cursorToUse = cursorToUse.sort(getMappedSortObject(query, type));
 				}
 				if (StringUtils.hasText(query.getHint())) {
 					cursorToUse = cursorToUse.hint(query.getHint());

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-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.
@@ -248,7 +248,7 @@ public class Aggregation {
 
 			if (operation instanceof FieldsExposingAggregationOperation) {
 				FieldsExposingAggregationOperation exposedFieldsOperation = (FieldsExposingAggregationOperation) operation;
-				context = new ExposedFieldsAggregationOperationContext(exposedFieldsOperation.getFields(), rootContext);
+				context = new ExposedFieldsAggregationOperationContext(exposedFieldsOperation.getFields());
 			}
 		}
 

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

@@ -268,21 +268,14 @@ public final class ExposedFields implements Iterable<ExposedField> {
 			return field.isAliased();
 		}
 
-		/**
-		 * @return the synthetic
-		 */
-		public boolean isSynthetic() {
-			return synthetic;
-		}
-
 		/**
 		 * Returns whether the field can be referred to using the given name.
 		 * 
-		 * @param name
+		 * @param input
 		 * @return
 		 */
-		public boolean canBeReferredToBy(String name) {
-			return getName().equals(name) || getTarget().equals(name);
+		public boolean canBeReferredToBy(String input) {
+			return getTarget().equals(input);
 		}
 
 		/*
@@ -347,7 +340,6 @@ public final class ExposedFields implements Iterable<ExposedField> {
 		public FieldReference(ExposedField field) {
 
 			Assert.notNull(field, "ExposedField must not be null!");
-
 			this.field = field;
 		}
 

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

@@ -32,22 +32,16 @@ import com.mongodb.DBObject;
 class ExposedFieldsAggregationOperationContext implements AggregationOperationContext {
 
 	private final ExposedFields exposedFields;
-	private final AggregationOperationContext rootContext;
 
 	/**
-	 * Creates a new {@link ExposedFieldsAggregationOperationContext} from the given {@link ExposedFields}. Uses the given
-	 * {@link AggregationOperationContext} to perform a mapping to mongo types if necessary.
+	 * Creates a new {@link ExposedFieldsAggregationOperationContext} from the given {@link ExposedFields}.
 	 * 
 	 * @param exposedFields must not be {@literal null}.
-	 * @param rootContext must not be {@literal null}.
 	 */
-	public ExposedFieldsAggregationOperationContext(ExposedFields exposedFields, AggregationOperationContext rootContext) {
+	public ExposedFieldsAggregationOperationContext(ExposedFields exposedFields) {
 
 		Assert.notNull(exposedFields, "ExposedFields must not be null!");
-		Assert.notNull(rootContext, "RootContext must not be null!");
-
 		this.exposedFields = exposedFields;
-		this.rootContext = rootContext;
 	}
 
 	/* 
@@ -56,7 +50,7 @@ class ExposedFieldsAggregationOperationContext implements AggregationOperationCo
 	 */
 	@Override
 	public DBObject getMappedObject(DBObject dbObject) {
-		return rootContext.getMappedObject(dbObject);
+		return dbObject;
 	}
 
 	/* 
@@ -65,7 +59,7 @@ class ExposedFieldsAggregationOperationContext implements AggregationOperationCo
 	 */
 	@Override
 	public FieldReference getReference(Field field) {
-		return getReference(field, field.getTarget());
+		return getReference(field.getTarget());
 	}
 
 	/* 
@@ -74,30 +68,13 @@ class ExposedFieldsAggregationOperationContext implements AggregationOperationCo
 	 */
 	@Override
 	public FieldReference getReference(String name) {
-		return getReference(null, name);
-	}
-
-	/**
-	 * Returns a {@link FieldReference} to the given {@link Field} with the given {@code name}.
-	 * 
-	 * @param field may be {@literal null}
-	 * @param name must not be {@literal null}
-	 * @return
-	 */
-	private FieldReference getReference(Field field, String name) {
 
 		Assert.notNull(name, "Name must not be null!");
 
-		ExposedField exposedField = exposedFields.getField(name);
+		ExposedField field = exposedFields.getField(name);
 
-		if (exposedField != null) {
-
-			if (field != null) {
-				// we return a FieldReference to the given field directly to make sure that we reference the proper alias here.
-				return new FieldReference(new ExposedField(field, exposedField.isSynthetic()));
-			}
-
-			return new FieldReference(exposedField);
+		if (field != null) {
+			return new FieldReference(field);
 		}
 
 		if (name.contains(".")) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 the original author or authors.
+ * Copyright 2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ import com.mongodb.DBObject;
  * @author Oliver Gierke
  * @since 1.3
  */
-public class LimitOperation implements AggregationOperation {
+class LimitOperation implements AggregationOperation {
 
 	private final long maxElements;
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 the original author or authors.
+ * Copyright 2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 package org.springframework.data.mongodb.core.aggregation;
 
 import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.CriteriaDefinition;
 import org.springframework.util.Assert;
 
 import com.mongodb.BasicDBObject;
@@ -33,29 +32,17 @@ import com.mongodb.DBObject;
  */
 public class MatchOperation implements AggregationOperation {
 
-	private final CriteriaDefinition criteriaDefinition;
+	private final Criteria criteria;
 
 	/**
 	 * Creates a new {@link MatchOperation} for the given {@link Criteria}.
 	 * 
 	 * @param criteria must not be {@literal null}.
-	 * @deprecated Use {@link MatchOperation#MatchOperation(CriteriaDefinition)} instead. This constructor is scheduled
-	 *             for removal in the next versions.
 	 */
-	@Deprecated
 	public MatchOperation(Criteria criteria) {
-		this((CriteriaDefinition) criteria);
-	}
 
-	/**
-	 * Creates a new {@link MatchOperation} for the given {@link CriteriaDefinition}.
-	 * 
-	 * @param criteriaDefinition must not be {@literal null}.
-	 */
-	public MatchOperation(CriteriaDefinition criteriaDefinition) {
-
-		Assert.notNull(criteriaDefinition, "Criteria must not be null!");
-		this.criteriaDefinition = criteriaDefinition;
+		Assert.notNull(criteria, "Criteria must not be null!");
+		this.criteria = criteria;
 	}
 
 	/* 
@@ -64,6 +51,6 @@ public class MatchOperation implements AggregationOperation {
 	 */
 	@Override
 	public DBObject toDBObject(AggregationOperationContext context) {
-		return new BasicDBObject("$match", context.getMappedObject(criteriaDefinition.getCriteriaObject()));
+		return new BasicDBObject("$match", context.getMappedObject(criteria.getCriteriaObject()));
 	}
 }

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

@@ -96,7 +96,6 @@ public class CustomConversions {
 
 		List<Object> toRegister = new ArrayList<Object>();
 
-		// Add user provided converters to make sure they can override the defaults
 		toRegister.addAll(converters);
 		toRegister.add(CustomToStringConverter.INSTANCE);
 		toRegister.add(BigDecimalToStringConverter.INSTANCE);
@@ -106,9 +105,9 @@ public class CustomConversions {
 		toRegister.add(URLToStringConverter.INSTANCE);
 		toRegister.add(StringToURLConverter.INSTANCE);
 		toRegister.add(DBObjectToStringConverter.INSTANCE);
-		
 		toRegister.addAll(JodaTimeConverters.getConvertersToRegister());
-		toRegister.addAll(GeoConverters.getConvertersToRegister());
+
+		// Add user provided converters to make sure they can override the defaults
 
 		for (Object c : toRegister) {
 			registerConversion(c);

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

@@ -28,11 +28,11 @@ import org.aopalliance.intercept.MethodInvocation;
 import org.objenesis.Objenesis;
 import org.objenesis.ObjenesisStd;
 import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.beans.BeanUtils;
 import org.springframework.cglib.proxy.Callback;
 import org.springframework.cglib.proxy.Enhancer;
 import org.springframework.cglib.proxy.Factory;
 import org.springframework.cglib.proxy.MethodProxy;
+import org.springframework.core.SpringVersion;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.mongodb.LazyLoadingException;
@@ -57,6 +57,7 @@ import com.mongodb.DBRef;
  */
 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;
@@ -137,7 +138,7 @@ public class DefaultDbRefResolver implements DbRefResolver {
 		proxyFactory.setProxyTargetClass(true);
 		proxyFactory.setTargetClass(propertyType);
 
-		if (!OBJENESIS_PRESENT) {
+		if (IS_SPRING_4_OR_BETTER || !OBJENESIS_PRESENT) {
 			proxyFactory.addAdvice(interceptor);
 			return proxyFactory.getProxy();
 		}
@@ -373,27 +374,13 @@ public class DefaultDbRefResolver implements DbRefResolver {
 	}
 
 	/**
-	 * Static class to accommodate optional dependency on Objenesis.
+	 * Static class to accomodate optional dependency on Objenesis.
 	 * 
 	 * @author Oliver Gierke
-	 * @author Thomas Darimont
-	 * @since 1.4
 	 */
 	private static class ObjenesisProxyEnhancer {
 
-		private static final boolean IS_SPRING_4_OR_BETTER = ClassUtils.isPresent(
-				"org.springframework.core.DefaultParameterNameDiscoverer", null);
-
-		private static final InstanceCreatorStrategy INSTANCE_CREATOR;
-
-		static {
-
-			if (IS_SPRING_4_OR_BETTER) {
-				INSTANCE_CREATOR = new Spring4ObjenesisInstanceCreatorStrategy();
-			} else {
-				INSTANCE_CREATOR = new DefaultObjenesisInstanceCreatorStrategy();
-			}
-		}
+		private static final Objenesis OBJENESIS = new ObjenesisStd(true);
 
 		public static Object enhanceAndGet(ProxyFactory proxyFactory, Class<?> type,
 				org.springframework.cglib.proxy.MethodInterceptor interceptor) {
@@ -403,77 +390,9 @@ public class DefaultDbRefResolver implements DbRefResolver {
 			enhancer.setCallbackType(org.springframework.cglib.proxy.MethodInterceptor.class);
 			enhancer.setInterfaces(new Class[] { LazyLoadingProxy.class });
 
-			Factory factory = (Factory) INSTANCE_CREATOR.newInstance(enhancer.createClass());
+			Factory factory = (Factory) OBJENESIS.newInstance(enhancer.createClass());
 			factory.setCallbacks(new Callback[] { interceptor });
 			return factory;
 		}
-
-		/**
-		 * Strategy for constructing new instances of a given {@link Class}.
-		 * 
-		 * @author Thomas Darimont
-		 */
-		interface InstanceCreatorStrategy {
-			Object newInstance(Class<?> clazz);
-		}
-
-		/**
-		 * An {@link InstanceCreatorStrategy} that uses Objenesis from the classpath.
-		 * 
-		 * @author Thomas Darimont
-		 */
-		private static class DefaultObjenesisInstanceCreatorStrategy implements InstanceCreatorStrategy {
-
-			private static final Objenesis OBJENESIS = new ObjenesisStd(true);
-
-			/*
-			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.convert.DefaultDbRefResolver.ObjenesisProxyEnhancer.InstanceCreatorStrategy#newInstance(java.lang.Class)
-			 */
-			@Override
-			public Object newInstance(Class<?> clazz) {
-				return OBJENESIS.newInstance(clazz);
-			}
-		}
-
-		/**
-		 * An {@link InstanceCreatorStrategy} that uses a repackaged version of Objenesis from Spring 4.
-		 * 
-		 * @author Thomas Darimont
-		 */
-		private static class Spring4ObjenesisInstanceCreatorStrategy implements InstanceCreatorStrategy {
-
-			private static final String SPRING4_OBJENESIS_CLASS_NAME = "org.springframework.objenesis.ObjenesisStd";
-			private static final Object OBJENESIS;
-			private static final Method NEW_INSTANCE_METHOD;
-
-			static {
-
-				try {
-					Class<?> objenesisClass = ClassUtils.forName(SPRING4_OBJENESIS_CLASS_NAME,
-							ObjenesisProxyEnhancer.class.getClassLoader());
-
-					OBJENESIS = BeanUtils.instantiateClass(objenesisClass.getConstructor(boolean.class), true);
-					NEW_INSTANCE_METHOD = objenesisClass.getMethod("newInstance", Class.class);
-
-				} catch (Exception e) {
-					throw new RuntimeException("Could not setup Objenesis infrastructure with Spring 4 ", e);
-				}
-			}
-
-			/*
-			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.convert.DefaultDbRefResolver.ObjenesisProxyEnhancer.InstanceCreatorStrategy#newInstance(java.lang.Class)
-			 */
-			@Override
-			public Object newInstance(Class<?> clazz) {
-
-				try {
-					return NEW_INSTANCE_METHOD.invoke(OBJENESIS, clazz);
-				} catch (Exception e) {
-					throw new RuntimeException("Could not created instance for " + clazz, e);
-				}
-			}
-		}
 	}
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/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/MappingMongoConverter.java

@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.EnumMap;
+import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -29,10 +31,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;
@@ -56,7 +58,6 @@ import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
 import org.springframework.util.CollectionUtils;
 
 import com.mongodb.BasicDBList;
@@ -76,8 +77,6 @@ import com.mongodb.DBRef;
  */
 public class MappingMongoConverter extends AbstractMongoConverter implements ApplicationContextAware {
 
-	private static final String INCOMPATIBLE_TYPES = "Cannot convert %1$s of type %2$s into an instance of %3$s! Implement a custom Converter<%2$s, %3$s> and register it with the CustomConversions. Parent object was: %4$s";
-
 	protected static final Logger LOGGER = LoggerFactory.getLogger(MappingMongoConverter.class);
 
 	protected final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
@@ -85,6 +84,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	protected final QueryMapper idMapper;
 	protected final DbRefResolver dbRefResolver;
 	protected ApplicationContext applicationContext;
+	protected boolean useFieldAccessOnly = true;
 	protected MongoTypeMapper typeMapper;
 	protected String mapKeyDotReplacement = null;
 
@@ -168,6 +168,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)
@@ -216,10 +227,6 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			return (S) readMap(typeToUse, dbo, parent);
 		}
 
-		if (dbo instanceof BasicDBList) {
-			throw new MappingException(String.format(INCOMPATIBLE_TYPES, dbo, BasicDBList.class, typeToUse.getType(), parent));
-		}
-
 		// Retrieve persistent entity info
 		MongoPersistentEntity<S> persistentEntity = (MongoPersistentEntity<S>) mappingContext
 				.getPersistentEntity(typeToUse);
@@ -249,7 +256,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
@@ -260,7 +267,8 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 					return;
 				}
 
-				wrapper.setProperty(prop, getValueInternal(prop, dbo, evaluator, result));
+				Object obj = getValueInternal(prop, dbo, evaluator, result);
+				wrapper.setProperty(prop, obj, useFieldAccessOnly);
 			}
 		});
 
@@ -269,20 +277,18 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			public void doWithAssociation(Association<MongoPersistentProperty> association) {
 
 				MongoPersistentProperty property = association.getInverse();
+
 				Object value = dbo.get(property.getName());
-
-				if (value == null) {
-					return;
-				}
-
 				DBRef dbref = value instanceof DBRef ? (DBRef) value : null;
-				wrapper.setProperty(property, dbRefResolver.resolveDbRef(property, dbref, new DbRefResolverCallback() {
+				Object obj = dbRefResolver.resolveDbRef(property, dbref, new DbRefResolverCallback() {
 
 					@Override
 					public Object resolve(MongoPersistentProperty property) {
 						return getValueInternal(property, dbo, evaluator, parent);
 					}
-				}));
+				});
+
+				wrapper.setProperty(property, obj);
 			}
 		});
 
@@ -302,11 +308,6 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			Assert.isTrue(annotation != null, "The referenced property has to be mapped with @DBRef!");
 		}
 
-		// @see DATAMONGO-913
-		if (object instanceof LazyLoadingProxy) {
-			return ((LazyLoadingProxy) object).toDBRef();
-		}
-
 		return createDBRef(object, referingProperty);
 	}
 
@@ -322,17 +323,14 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			return;
 		}
 
-		Class<?> entityType = obj.getClass();
-		boolean handledByCustomConverter = conversions.getCustomWriteTarget(entityType, DBObject.class) != null;
-		TypeInformation<? extends Object> type = ClassTypeInformation.from(entityType);
+		boolean handledByCustomConverter = conversions.getCustomWriteTarget(obj.getClass(), DBObject.class) != null;
+		TypeInformation<? extends Object> type = ClassTypeInformation.from(obj.getClass());
 
 		if (!handledByCustomConverter && !(dbo instanceof BasicDBList)) {
 			typeMapper.writeType(type, dbo);
 		}
 
-		Object target = obj instanceof LazyLoadingProxy ? ((LazyLoadingProxy) obj).initialize() : obj;
-
-		writeInternal(target, dbo, type);
+		writeInternal(obj, dbo, type);
 	}
 
 	/**
@@ -348,8 +346,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			return;
 		}
 
-		Class<?> entityType = obj.getClass();
-		Class<?> customTarget = conversions.getCustomWriteTarget(entityType, DBObject.class);
+		Class<?> customTarget = conversions.getCustomWriteTarget(obj.getClass(), DBObject.class);
 
 		if (customTarget != null) {
 			DBObject result = conversionService.convert(obj, DBObject.class);
@@ -357,17 +354,17 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			return;
 		}
 
-		if (Map.class.isAssignableFrom(entityType)) {
+		if (Map.class.isAssignableFrom(obj.getClass())) {
 			writeMapInternal((Map<Object, Object>) obj, dbo, ClassTypeInformation.MAP);
 			return;
 		}
 
-		if (Collection.class.isAssignableFrom(entityType)) {
+		if (Collection.class.isAssignableFrom(obj.getClass())) {
 			writeCollectionInternal((Collection<?>) obj, ClassTypeInformation.LIST, (BasicDBList) dbo);
 			return;
 		}
 
-		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(entityType);
+		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(obj.getClass());
 		writeInternal(obj, dbo, entity);
 		addCustomTypeKeyIfNecessary(typeHint, obj, dbo);
 	}
@@ -382,13 +379,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) {}
 		}
@@ -401,7 +400,9 @@ 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) {
 
@@ -418,7 +419,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);
 				}
@@ -694,11 +695,10 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 
 		TypeInformation<?> actualType = type != null ? type.getActualType() : null;
 		Class<?> reference = actualType == null ? Object.class : actualType.getType();
-		Class<?> valueType = ClassUtils.getUserClass(value.getClass());
 
-		boolean notTheSameClass = !valueType.equals(reference);
+		boolean notTheSameClass = !value.getClass().equals(reference);
 		if (notTheSameClass) {
-			typeMapper.writeType(valueType, dbObject);
+			typeMapper.writeType(value.getClass(), dbObject);
 		}
 	}
 
@@ -792,8 +792,8 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		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);
+			id = wrapper.getProperty(idProperty, Object.class, useFieldAccessOnly);
 		}
 
 		if (null == id) {
@@ -804,10 +804,11 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 				idMapper.convertId(id));
 	}
 
-	protected Object getValueInternal(MongoPersistentProperty prop, DBObject dbo, SpELExpressionEvaluator evaluator,
+	protected Object getValueInternal(MongoPersistentProperty prop, DBObject dbo, SpELExpressionEvaluator eval,
 			Object parent) {
 
-		return new MongoDbPropertyValueProvider(dbo, evaluator, parent).getPropertyValue(prop);
+		MongoDbPropertyValueProvider provider = new MongoDbPropertyValueProvider(dbo, spELContext, parent);
+		return provider.getPropertyValue(prop);
 	}
 
 	/**
@@ -817,6 +818,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", "null" })
 	private Object readCollectionOrArray(TypeInformation<?> targetType, BasicDBList sourceValue, Object parent) {
 
 		Assert.notNull(targetType);
@@ -827,12 +829,21 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			return getPotentiallyConvertedSimpleRead(new HashSet<Object>(), collectionType);
 		}
 
+		collectionType = Collection.class.isAssignableFrom(collectionType) ? collectionType : List.class;
+
 		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());
+		Collection<Object> items;
+
+		if (targetType.getType().isArray()) {
+			items = new ArrayList<Object>();
+		} else if (EnumSet.class.isAssignableFrom(collectionType)) {
+			Assert.notNull(rawComponentType, "Component type must not be null for enum sets!");
+			items = EnumSet.noneOf(rawComponentType.asSubclass(Enum.class));
+		} else {
+			items = CollectionFactory.createCollection(collectionType, sourceValue.size());
+		}
 
 		for (int i = 0; i < sourceValue.size(); i++) {
 
@@ -858,7 +869,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	 * @param dbObject
 	 * @return
 	 */
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "null", "rawtypes" })
 	protected Map<Object, Object> readMap(TypeInformation<?> type, DBObject dbObject, Object parent) {
 
 		Assert.notNull(dbObject);
@@ -871,10 +882,19 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		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;
+
+		if (EnumMap.class.isAssignableFrom(mapType)) {
+			Assert.notNull(keyType, "Key type must nut be null for enum maps!");
+			map = new EnumMap(rawKeyType.asSubclass(Enum.class));
+		} else {
+			map = CollectionFactory.createMap(mapType, dbObject.keySet().size());
+		}
+
 		Map<String, Object> sourceMap = dbObject.toMap();
 
 		for (Entry<String, Object> entry : sourceMap.entrySet()) {
+
 			if (typeMapper.isTypeKey(entry.getKey())) {
 				continue;
 			}
@@ -1024,27 +1044,17 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		return dbObject;
 	}
 
-	/**
-	 * {@link PropertyValueProvider} to evaluate a SpEL expression if present on the property or simply accesses the field
-	 * of the configured source {@link DBObject}.
-	 *
-	 * @author Oliver Gierke
-	 */
 	private class MongoDbPropertyValueProvider implements PropertyValueProvider<MongoPersistentProperty> {
 
 		private final DBObjectAccessor source;
 		private final SpELExpressionEvaluator evaluator;
 		private final Object parent;
 
-		/**
-		 * Creates a new {@link MongoDbPropertyValueProvider} for the given source, {@link SpELExpressionEvaluator} and
-		 * parent object.
-		 * 
-		 * @param source must not be {@literal null}.
-		 * @param evaluator must not be {@literal null}.
-		 * @param parent can be {@literal null}.
-		 */
-		public MongoDbPropertyValueProvider(DBObject source, SpELExpressionEvaluator evaluator, Object parent) {
+		public MongoDbPropertyValueProvider(DBObject source, SpELContext factory, Object parent) {
+			this(source, new DefaultSpELExpressionEvaluator(source, factory), parent);
+		}
+
+		public MongoDbPropertyValueProvider(DBObject source, DefaultSpELExpressionEvaluator evaluator, Object parent) {
 
 			Assert.notNull(source);
 			Assert.notNull(evaluator);

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

@@ -25,7 +25,6 @@ import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty.PropertyToFieldNameConverter;
-import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update.Modifier;
 import org.springframework.data.mongodb.core.query.Update.Modifiers;
 import org.springframework.data.util.ClassTypeInformation;
@@ -80,19 +79,10 @@ public class UpdateMapper extends QueryMapper {
 			return createMapEntry(field, convertSimpleOrDBObject(rawValue, field.getPropertyEntity()));
 		}
 
-		if (isQuery(rawValue)) {
-			return createMapEntry(field,
-					super.getMappedObject(((Query) rawValue).getQueryObject(), field.getPropertyEntity()));
+		if (!isUpdateModifier(rawValue)) {
+			return super.getMappedObjectForField(field, getMappedValue(field, rawValue));
 		}
 
-		if (isUpdateModifier(rawValue)) {
-			return getMappedUpdateModifier(field, rawValue);
-		}
-
-		return super.getMappedObjectForField(field, getMappedValue(field, rawValue));
-	}
-
-	private Entry<String, Object> getMappedUpdateModifier(Field field, Object rawValue) {
 		Object value = null;
 
 		if (rawValue instanceof Modifier) {
@@ -109,6 +99,7 @@ public class UpdateMapper extends QueryMapper {
 
 			value = modificationOperations;
 		} else {
+
 			throw new IllegalArgumentException(String.format("Unable to map value of type '%s'!", rawValue.getClass()));
 		}
 
@@ -128,10 +119,6 @@ public class UpdateMapper extends QueryMapper {
 		return value instanceof Modifier || value instanceof Modifiers;
 	}
 
-	private boolean isQuery(Object value) {
-		return value instanceof Query;
-	}
-
 	private DBObject getMappedValue(Modifier modifier) {
 
 		Object value = converter.convertToMongoType(modifier.getValue(), ClassTypeInformation.OBJECT);

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

@@ -19,37 +19,83 @@ 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 [x=%f, y=%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

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

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

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

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

@@ -1,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,62 +25,18 @@ import java.lang.annotation.Target;
  * 
  * @author Jon Brisbin
  * @author Laurent Canet
- * @author Thomas Darimont
  */
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface GeoSpatialIndexed {
 
 	/**
-	 * Index name. <br />
-	 * <br />
-	 * The name will only be applied as is when defined on root level. For usage on nested or embedded structures the
-	 * provided name will be prefixed with the path leading to the entity. <br />
-	 * <br />
-	 * The structure below
-	 * 
-	 * <pre>
-	 * <code>
-	 * &#64;Document
-	 * class Root {
-	 *   Hybrid hybrid;
-	 *   Nested nested;
-	 * }
-	 * 
-	 * &#64;Document
-	 * class Hybrid {
-	 *   &#64;GeoSpatialIndexed(name="index") Point h1;
-	 * }
-	 * 
-	 * class Nested {
-	 *   &#64;GeoSpatialIndexed(name="index") Point n1;
-	 * }
-	 * </code>
-	 * </pre>
-	 * 
-	 * resolves in the following index structures
-	 * 
-	 * <pre>
-	 * <code>
-	 * db.root.ensureIndex( { hybrid.h1: "2d" } , { name: "hybrid.index" } )
-	 * db.root.ensureIndex( { nested.n1: "2d" } , { name: "nested.index" } )
-	 * db.hybrid.ensureIndex( { h1: "2d" } , { name: "index" } )
-	 * </code>
-	 * </pre>
+	 * Name of the property in the document that contains the [x, y] or radial coordinates to index.
 	 * 
 	 * @return
 	 */
 	String name() default "";
 
-	/**
-	 * If set to {@literal true} then MongoDB will ignore the given index name and instead generate a new name. Defaults
-	 * to {@literal false}.
-	 * 
-	 * @return
-	 * @since 1.5
-	 */
-	boolean useGeneratedName() default false;
-
 	/**
 	 * Name of the collection in which to create the index.
 	 * 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 the original author or authors.
+ * Copyright 2010-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@ import com.mongodb.DBObject;
  * @author Jon Brisbin
  * @author Oliver Gierke
  * @author Laurent Canet
- * @author Christoph Strobl
  */
 public class GeospatialIndex implements IndexDefinition {
 
@@ -58,6 +57,8 @@ public class GeospatialIndex implements IndexDefinition {
 	 */
 	public GeospatialIndex named(String name) {
 
+		Assert.hasText(name, "Name must have text!");
+
 		this.name = name;
 		return this;
 	}
@@ -150,12 +151,12 @@ public class GeospatialIndex implements IndexDefinition {
 
 	public DBObject getIndexOptions() {
 
-		if (!StringUtils.hasText(name) && min == null && max == null && bucketSize == null) {
+		if (name == null && min == null && max == null && bucketSize == null) {
 			return null;
 		}
 
 		DBObject dbo = new BasicDBObject();
-		if (StringUtils.hasText(name)) {
+		if (name != null) {
 			dbo.put("name", name);
 		}
 
@@ -185,7 +186,6 @@ public class GeospatialIndex implements IndexDefinition {
 				}
 				break;
 		}
-
 		return dbo;
 	}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 the original author or authors.
+ * Copyright 2010-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,20 +17,13 @@ package org.springframework.data.mongodb.core.index;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
 
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.mongodb.core.query.Order;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
 
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
 
-/**
- * @author Oliver Gierke
- * @author Christoph Strobl
- */
 @SuppressWarnings("deprecation")
 public class Index implements IndexDefinition {
 
@@ -48,10 +41,6 @@ public class Index implements IndexDefinition {
 
 	private boolean sparse = false;
 
-	private boolean background = false;
-
-	private long expire = -1;
-
 	public Index() {}
 
 	public Index(String key, Direction direction) {
@@ -115,44 +104,6 @@ public class Index implements IndexDefinition {
 		return this;
 	}
 
-	/**
-	 * Build the index in background (non blocking).
-	 * 
-	 * @return
-	 * @since 1.5
-	 */
-	public Index background() {
-
-		this.background = true;
-		return this;
-	}
-
-	/**
-	 * Specifies TTL in seconds.
-	 * 
-	 * @param value
-	 * @return
-	 * @since 1.5
-	 */
-	public Index expire(long value) {
-		return expire(value, TimeUnit.SECONDS);
-	}
-
-	/**
-	 * Specifies TTL with given {@link TimeUnit}.
-	 * 
-	 * @param value
-	 * @param unit
-	 * @return
-	 * @since 1.5
-	 */
-	public Index expire(long value, TimeUnit unit) {
-
-		Assert.notNull(unit, "TimeUnit for expiration must not be null.");
-		this.expire = unit.toSeconds(value);
-		return this;
-	}
-
 	/**
 	 * @see http://docs.mongodb.org/manual/core/index-creation/#index-creation-duplicate-dropping
 	 * @param duplicates
@@ -174,9 +125,11 @@ public class Index implements IndexDefinition {
 	}
 
 	public DBObject getIndexOptions() {
-
+		if (name == null && !unique) {
+			return null;
+		}
 		DBObject dbo = new BasicDBObject();
-		if (StringUtils.hasText(name)) {
+		if (name != null) {
 			dbo.put("name", name);
 		}
 		if (unique) {
@@ -188,13 +141,6 @@ public class Index implements IndexDefinition {
 		if (sparse) {
 			dbo.put("sparse", true);
 		}
-		if (background) {
-			dbo.put("background", true);
-		}
-		if (expire >= 0) {
-			dbo.put("expireAfterSeconds", expire);
-		}
-
 		return dbo;
 	}
 

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@ import java.lang.annotation.Target;
  * @author Oliver Gierke
  * @author Philipp Schneider
  * @author Johno Crawford
- * @author Thomas Darimont
  */
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
@@ -58,55 +57,12 @@ public @interface Indexed {
 	boolean dropDups() default false;
 
 	/**
-	 * Index name. <br />
-	 * <br />
-	 * The name will only be applied as is when defined on root level. For usage on nested or embedded structures the
-	 * provided name will be prefixed with the path leading to the entity. <br />
-	 * <br />
-	 * The structure below
-	 * 
-	 * <pre>
-	 * <code>
-	 * &#64;Document
-	 * class Root {
-	 *   Hybrid hybrid;
-	 *   Nested nested;
-	 * }
-	 * 
-	 * &#64;Document
-	 * class Hybrid {
-	 *   &#64;Indexed(name="index") String h1;
-	 * }
-	 * 
-	 * class Nested {
-	 *   &#64;Indexed(name="index") String n1;
-	 * }
-	 * </code>
-	 * </pre>
-	 * 
-	 * resolves in the following index structures
-	 * 
-	 * <pre>
-	 * <code>
-	 * db.root.ensureIndex( { hybrid.h1: 1 } , { name: "hybrid.index" } )
-	 * db.root.ensureIndex( { nested.n1: 1 } , { name: "nested.index" } )
-	 * db.hybrid.ensureIndex( { h1: 1} , { name: "index" } )
-	 * </code>
-	 * </pre>
+	 * Index name.
 	 * 
 	 * @return
 	 */
 	String name() default "";
 
-	/**
-	 * If set to {@literal true} then MongoDB will ignore the given index name and instead generate a new name. Defaults
-	 * to {@literal false}.
-	 * 
-	 * @return
-	 * @since 1.5
-	 */
-	boolean useGeneratedName() default false;
-
 	/**
 	 * Colleciton name for index to be created on.
 	 * 

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

@@ -15,6 +15,7 @@
  */
 package org.springframework.data.mongodb.core.index;
 
+import java.lang.reflect.Field;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -22,15 +23,19 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationListener;
 import org.springframework.data.mapping.PersistentEntity;
+import org.springframework.data.mapping.PropertyHandler;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.context.MappingContextEvent;
 import org.springframework.data.mongodb.MongoDbFactory;
-import org.springframework.data.mongodb.core.index.MongoPersistentEntityIndexResolver.IndexDefinitionHolder;
-import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+import com.mongodb.util.JSON;
 
 /**
  * Component that inspects {@link MongoPersistentEntity} instances contained in the given {@link MongoMappingContext}
@@ -41,7 +46,6 @@ import org.springframework.util.Assert;
  * @author Philipp Schneider
  * @author Johno Crawford
  * @author Laurent Canet
- * @author Christoph Strobl
  */
 public class MongoPersistentEntityIndexCreator implements
 		ApplicationListener<MappingContextEvent<MongoPersistentEntity<?>, MongoPersistentProperty>> {
@@ -51,37 +55,21 @@ public class MongoPersistentEntityIndexCreator implements
 	private final Map<Class<?>, Boolean> classesSeen = new ConcurrentHashMap<Class<?>, Boolean>();
 	private final MongoDbFactory mongoDbFactory;
 	private final MongoMappingContext mappingContext;
-	private final IndexResolver indexResolver;
 
 	/**
 	 * Creats a new {@link MongoPersistentEntityIndexCreator} for the given {@link MongoMappingContext} and
 	 * {@link MongoDbFactory}.
 	 * 
-	 * @param mappingContext must not be {@literal null}.
-	 * @param mongoDbFactory must not be {@literal null}.
+	 * @param mappingContext must not be {@literal null}
+	 * @param mongoDbFactory must not be {@literal null}
 	 */
 	public MongoPersistentEntityIndexCreator(MongoMappingContext mappingContext, MongoDbFactory mongoDbFactory) {
-		this(mappingContext, mongoDbFactory, new MongoPersistentEntityIndexResolver(mappingContext));
-	}
-
-	/**
-	 * Creats a new {@link MongoPersistentEntityIndexCreator} for the given {@link MongoMappingContext} and
-	 * {@link MongoDbFactory}.
-	 * 
-	 * @param mappingContext must not be {@literal null}.
-	 * @param mongoDbFactory must not be {@literal null}.
-	 * @param indexResolver must not be {@literal null}.
-	 */
-	public MongoPersistentEntityIndexCreator(MongoMappingContext mappingContext, MongoDbFactory mongoDbFactory,
-			IndexResolver indexResolver) {
 
 		Assert.notNull(mongoDbFactory);
 		Assert.notNull(mappingContext);
-		Assert.notNull(indexResolver);
 
 		this.mongoDbFactory = mongoDbFactory;
 		this.mappingContext = mappingContext;
-		this.indexResolver = indexResolver;
 
 		for (MongoPersistentEntity<?> entity : mappingContext.getPersistentEntities()) {
 			checkForIndexes(entity);
@@ -106,34 +94,87 @@ public class MongoPersistentEntityIndexCreator implements
 		}
 	}
 
-	private void checkForIndexes(final MongoPersistentEntity<?> entity) {
-
-		Class<?> type = entity.getType();
-
+	protected void checkForIndexes(final MongoPersistentEntity<?> entity) {
+		final Class<?> type = entity.getType();
 		if (!classesSeen.containsKey(type)) {
-
-			this.classesSeen.put(type, Boolean.TRUE);
-
 			if (LOGGER.isDebugEnabled()) {
 				LOGGER.debug("Analyzing class " + type + " for index information.");
 			}
 
-			checkForAndCreateIndexes(entity);
-		}
-	}
+			// Make sure indexes get created
+			if (type.isAnnotationPresent(CompoundIndexes.class)) {
+				CompoundIndexes indexes = type.getAnnotation(CompoundIndexes.class);
+				for (CompoundIndex index : indexes.value()) {
 
-	private void checkForAndCreateIndexes(MongoPersistentEntity<?> entity) {
+					String indexColl = StringUtils.hasText(index.collection()) ? index.collection() : entity.getCollection();
+					DBObject definition = (DBObject) JSON.parse(index.def());
 
-		if (entity.findAnnotation(Document.class) != null) {
-			for (IndexDefinitionHolder indexToCreate : indexResolver.resolveIndexForClass(entity.getType())) {
-				createIndex(indexToCreate);
+					ensureIndex(indexColl, index.name(), definition, index.unique(), index.dropDups(), index.sparse(),
+							index.background(), index.expireAfterSeconds());
+
+					if (LOGGER.isDebugEnabled()) {
+						LOGGER.debug("Created compound index " + index);
+					}
+				}
 			}
-		}
-	}
 
-	private void createIndex(IndexDefinitionHolder indexDefinition) {
-		mongoDbFactory.getDb().getCollection(indexDefinition.getCollection())
-				.createIndex(indexDefinition.getIndexKeys(), indexDefinition.getIndexOptions());
+			entity.doWithProperties(new PropertyHandler<MongoPersistentProperty>() {
+				public void doWithPersistentProperty(MongoPersistentProperty persistentProperty) {
+
+					Field field = persistentProperty.getField();
+
+					if (field.isAnnotationPresent(Indexed.class)) {
+
+						Indexed index = field.getAnnotation(Indexed.class);
+						String name = index.name();
+
+						if (!StringUtils.hasText(name)) {
+							name = persistentProperty.getFieldName();
+						} else {
+							if (!name.equals(field.getName()) && index.unique() && !index.sparse()) {
+								// Names don't match, and sparse is not true. This situation will generate an error on the server.
+								if (LOGGER.isWarnEnabled()) {
+									LOGGER.warn("The index name " + name + " doesn't match this property name: " + field.getName()
+											+ ". Setting sparse=true on this index will prevent errors when inserting documents.");
+								}
+							}
+						}
+
+						String collection = StringUtils.hasText(index.collection()) ? index.collection() : entity.getCollection();
+						int direction = index.direction() == IndexDirection.ASCENDING ? 1 : -1;
+						DBObject definition = new BasicDBObject(persistentProperty.getFieldName(), direction);
+
+						ensureIndex(collection, name, definition, index.unique(), index.dropDups(), index.sparse(),
+								index.background(), index.expireAfterSeconds());
+
+						if (LOGGER.isDebugEnabled()) {
+							LOGGER.debug("Created property index " + index);
+						}
+
+					} else if (field.isAnnotationPresent(GeoSpatialIndexed.class)) {
+
+						GeoSpatialIndexed index = field.getAnnotation(GeoSpatialIndexed.class);
+
+						GeospatialIndex indexObject = new GeospatialIndex(persistentProperty.getFieldName());
+						indexObject.withMin(index.min()).withMax(index.max());
+						indexObject.named(StringUtils.hasText(index.name()) ? index.name() : field.getName());
+						indexObject.typed(index.type()).withBucketSize(index.bucketSize())
+								.withAdditionalField(index.additionalField());
+
+						String collection = StringUtils.hasText(index.collection()) ? index.collection() : entity.getCollection();
+						mongoDbFactory.getDb().getCollection(collection)
+								.ensureIndex(indexObject.getIndexKeys(), indexObject.getIndexOptions());
+
+						if (LOGGER.isDebugEnabled()) {
+							LOGGER.debug(String.format("Created %s for entity %s in collection %s! ", indexObject, entity.getType(),
+									collection));
+						}
+					}
+				}
+			});
+
+			classesSeen.put(type, true);
+		}
 	}
 
 	/**
@@ -145,4 +186,33 @@ public class MongoPersistentEntityIndexCreator implements
 	public boolean isIndexCreatorFor(MappingContext<?, ?> context) {
 		return this.mappingContext.equals(context);
 	}
+
+	/**
+	 * Triggers the actual index creation.
+	 * 
+	 * @param collection the collection to create the index in
+	 * @param name the name of the index about to be created
+	 * @param indexDefinition the index definition
+	 * @param unique whether it shall be a unique index
+	 * @param dropDups whether to drop duplicates
+	 * @param sparse sparse or not
+	 * @param background whether the index will be created in the background
+	 * @param expireAfterSeconds the time to live for documents in the collection
+	 */
+	protected void ensureIndex(String collection, String name, DBObject indexDefinition, boolean unique,
+			boolean dropDups, boolean sparse, boolean background, int expireAfterSeconds) {
+
+		DBObject opts = new BasicDBObject();
+		opts.put("name", name);
+		opts.put("dropDups", dropDups);
+		opts.put("sparse", sparse);
+		opts.put("unique", unique);
+		opts.put("background", background);
+
+		if (expireAfterSeconds != -1) {
+			opts.put("expireAfterSeconds", expireAfterSeconds);
+		}
+
+		mongoDbFactory.getDb().getCollection(collection).ensureIndex(indexDefinition, opts);
+	}
 }

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 the original author or authors.
+ * Copyright 2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 package org.springframework.data.mongodb.core.mapping;
 
+import java.util.Locale;
+
 /**
  * {@link FieldNamingStrategy} that abbreviates field names by using the very first letter of the camel case parts of
  * the {@link MongoPersistentProperty}'s name.
@@ -22,18 +24,23 @@ package org.springframework.data.mongodb.core.mapping;
  * @since 1.3
  * @author Oliver Gierke
  */
-public class CamelCaseAbbreviatingFieldNamingStrategy extends CamelCaseSplittingFieldNamingStrategy {
+public class CamelCaseAbbreviatingFieldNamingStrategy implements FieldNamingStrategy {
 
-	public CamelCaseAbbreviatingFieldNamingStrategy() {
-		super("");
-	}
+	private static final String CAMEL_CASE_PATTERN = "(?<!(^|[A-Z]))(?=[A-Z])|(?<!^)(?=[A-Z][a-z])";
 
 	/* 
 	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.CamelCaseSplittingFieldNamingStrategy#preparePart(java.lang.String)
+	 * @see org.springframework.data.mongodb.core.mapping.FieldNamingStrategy#getFieldName(org.springframework.data.mongodb.core.mapping.MongoPersistentProperty)
 	 */
-	@Override
-	protected String preparePart(String part) {
-		return part.substring(0, 1);
+	public String getFieldName(MongoPersistentProperty property) {
+
+		String[] parts = property.getName().split(CAMEL_CASE_PATTERN);
+		StringBuilder builder = new StringBuilder();
+
+		for (String part : parts) {
+			builder.append(part.substring(0, 1).toLowerCase(Locale.US));
+		}
+
+		return builder.toString();
 	}
 }

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

@@ -1,79 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.mapping;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.data.util.ParsingUtils;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
-/**
- * Configurable {@link FieldNamingStrategy} that splits up camel-case property names and reconcatenates them using a
- * configured delimiter. Individual parts of the name can be manipulated using {@link #preparePart(String)}.
- * 
- * @author Oliver Gierke
- * @since 1.5
- */
-public class CamelCaseSplittingFieldNamingStrategy implements FieldNamingStrategy {
-
-	private final String delimiter;
-
-	/**
-	 * Creates a new {@link CamelCaseSplittingFieldNamingStrategy}.
-	 * 
-	 * @param delimiter must not be {@literal null}.
-	 */
-	public CamelCaseSplittingFieldNamingStrategy(String delimiter) {
-
-		Assert.notNull(delimiter, "Delimiter must not be null!");
-		this.delimiter = delimiter;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.FieldNamingStrategy#getFieldName(org.springframework.data.mongodb.core.mapping.MongoPersistentProperty)
-	 */
-	@Override
-	public String getFieldName(MongoPersistentProperty property) {
-
-		List<String> parts = ParsingUtils.splitCamelCaseToLower(property.getName());
-		List<String> result = new ArrayList<String>();
-
-		for (String part : parts) {
-
-			String candidate = preparePart(part);
-
-			if (StringUtils.hasText(candidate)) {
-				result.add(candidate);
-			}
-		}
-
-		return StringUtils.collectionToDelimitedString(result, delimiter);
-	}
-
-	/**
-	 * Callback to prepare the uncapitalized part obtained from the split up of the camel case source. Default
-	 * implementation returns the part as is.
-	 * 
-	 * @param part
-	 * @return
-	 */
-	protected String preparePart(String part) {
-		return part;
-	}
-}

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

@@ -21,7 +21,6 @@ package org.springframework.data.mongodb.core.mapping;
  * @see DocumentField
  * @see PropertyNameFieldNamingStrategy
  * @see CamelCaseAbbreviatingFieldNamingStrategy
- * @see SnakeCaseFieldNamingStrategy
  * @since 1.3
  * @author Oliver Gierke
  */

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

@@ -1,34 +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.mapping;
-
-/**
- * {@link FieldNamingStrategy} that translates typical camel case Java property names to lower case JSON element names,
- * separated by underscores.
- * 
- * @since 1.5
- * @author Ryan Tenney
- * @author Oliver Gierke
- */
-public class SnakeCaseFieldNamingStrategy extends CamelCaseSplittingFieldNamingStrategy {
-
-	/**
-	 * Creates a new {@link SnakeCaseFieldNamingStrategy}.
-	 */
-	public SnakeCaseFieldNamingStrategy() {
-		super("_");
-	}
-}

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

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

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

@@ -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 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 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/query/Criteria.java

@@ -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;
 
@@ -384,21 +383,7 @@ public class Criteria implements CriteriaDefinition {
 	 */
 	public Criteria withinSphere(Circle circle) {
 		Assert.notNull(circle);
-		criteria.put("$within", new GeoCommand(new Sphere(circle)));
-		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)));
+		criteria.put("$within", new BasicDBObject("$centerSphere", circle.asList()));
 		return this;
 	}
 
@@ -412,7 +397,7 @@ public class Criteria implements CriteriaDefinition {
 	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;
 	}
 
@@ -425,7 +410,7 @@ public class Criteria implements CriteriaDefinition {
 	 */
 	public Criteria near(Point point) {
 		Assert.notNull(point);
-		criteria.put("$near", point);
+		criteria.put("$near", point.asList());
 		return this;
 	}
 
@@ -439,7 +424,7 @@ public class Criteria implements CriteriaDefinition {
 	 */
 	public Criteria nearSphere(Point point) {
 		Assert.notNull(point);
-		criteria.put("$nearSphere", point);
+		criteria.put("$nearSphere", point.asList());
 		return this;
 	}
 

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

@@ -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;
@@ -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/Update.java

@@ -15,11 +15,10 @@
  */
 package org.springframework.data.mongodb.core.query;
 
-import static org.springframework.util.ObjectUtils.*;
-
 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;
@@ -41,7 +40,6 @@ import com.mongodb.DBObject;
  * @author Oliver Gierke
  * @author Becca Gaspard
  * @author Christoph Strobl
- * @author Thomas Darimont
  */
 public class Update {
 
@@ -198,18 +196,6 @@ public class Update {
 		return this;
 	}
 
-	/**
-	 * Update using {@code $addToSet} modifier. <br/>
-	 * Allows creation of {@code $push} command for single or multiple (using {@code $each}) values
-	 * 
-	 * @param key
-	 * @return
-	 * @since 1.5
-	 */
-	public AddToSetBuilder addToSet(String key) {
-		return new AddToSetBuilder(key);
-	}
-
 	/**
 	 * Update using the {@literal $addToSet} update modifier
 	 * 
@@ -281,7 +267,6 @@ public class Update {
 	}
 
 	public DBObject getUpdateObject() {
-
 		DBObject dbo = new BasicDBObject();
 		for (String k : modifierOps.keySet()) {
 			dbo.put(k, modifierOps.get(k));
@@ -338,52 +323,14 @@ public class Update {
 		return StringUtils.startsWithIgnoreCase(key, "$");
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-		return getUpdateObject().hashCode();
-	}
-
-	/* 
-	 * (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() != obj.getClass()) {
-			return false;
-		}
-
-		Update that = (Update) obj;
-		return this.getUpdateObject().equals(that.getUpdateObject());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return SerializationUtils.serializeToJsonSafely(getUpdateObject());
-	}
-
 	/**
 	 * Modifiers holds a distinct collection of {@link Modifier}
 	 * 
 	 * @author Christoph Strobl
-	 * @author Thomas Darimont
 	 */
 	public static class Modifiers {
 
-		private Map<String, Modifier> modifiers;
+		private HashMap<String, Modifier> modifiers;
 
 		public Modifiers() {
 			this.modifiers = new LinkedHashMap<String, Modifier>(1);
@@ -396,33 +343,6 @@ public class Update {
 		public void addModifier(Modifier modifier) {
 			this.modifiers.put(modifier.getKey(), modifier);
 		}
-
-		/* (non-Javadoc)
-		 * @see java.lang.Object#hashCode()
-		 */
-		@Override
-		public int hashCode() {
-			return nullSafeHashCode(modifiers);
-		}
-
-		/* (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() != obj.getClass()) {
-				return false;
-			}
-
-			Modifiers that = (Modifiers) obj;
-
-			return this.modifiers.equals(that.modifiers);
-		}
 	}
 
 	/**
@@ -447,7 +367,6 @@ public class Update {
 	 * Implementation of {@link Modifier} representing {@code $each}.
 	 * 
 	 * @author Christoph Strobl
-	 * @author Thomas Darimont
 	 */
 	private static class Each implements Modifier {
 
@@ -468,7 +387,6 @@ public class Update {
 			}
 
 			Object[] convertedValues = new Object[values.length];
-
 			for (int i = 0; i < values.length; i++) {
 				convertedValues[i] = values[i];
 			}
@@ -476,57 +394,21 @@ public class Update {
 			return convertedValues;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.query.Update.Modifier#getKey()
-		 */
 		@Override
 		public String getKey() {
 			return "$each";
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.query.Update.Modifier#getValue()
-		 */
 		@Override
 		public Object getValue() {
 			return this.values;
 		}
-
-		/* 
-		 * (non-Javadoc)
-		 * @see java.lang.Object#hashCode()
-		 */
-		@Override
-		public int hashCode() {
-			return nullSafeHashCode(values);
-		}
-
-		/* 
-		 * (non-Javadoc)
-		 * @see java.lang.Object#equals(java.lang.Object)
-		 */
-		@Override
-		public boolean equals(Object that) {
-
-			if (this == that) {
-				return true;
-			}
-
-			if (that == null || getClass() != that.getClass()) {
-				return false;
-			}
-
-			return nullSafeEquals(values, ((Each) that).values);
-		}
 	}
 
 	/**
 	 * Builder for creating {@code $push} modifiers
 	 * 
-	 * @author Christoph Strobl
-	 * @author Thomas Darimont
+	 * @author Christop Strobl
 	 */
 	public class PushOperatorBuilder {
 
@@ -559,84 +441,5 @@ public class Update {
 		public Update value(Object value) {
 			return Update.this.push(key, value);
 		}
-
-		/* 
-		 * (non-Javadoc)
-		 * @see java.lang.Object#hashCode()
-		 */
-		@Override
-		public int hashCode() {
-
-			int result = 17;
-
-			result += 31 * result + getOuterType().hashCode();
-			result += 31 * result + nullSafeHashCode(key);
-			result += 31 * result + nullSafeHashCode(modifiers);
-
-			return result;
-		}
-
-		/* 
-		 * (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() != obj.getClass()) {
-				return false;
-			}
-
-			PushOperatorBuilder that = (PushOperatorBuilder) obj;
-
-			if (!getOuterType().equals(that.getOuterType())) {
-				return false;
-			}
-
-			return nullSafeEquals(this.key, that.key) && nullSafeEquals(this.modifiers, that.modifiers);
-		}
-
-		private Update getOuterType() {
-			return Update.this;
-		}
-	}
-
-	/**
-	 * 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/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);

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.
@@ -29,7 +29,6 @@ import org.springframework.data.annotation.QueryAnnotation;
  * 
  * @author Oliver Gierke
  * @author Thomas Darimont
- * @author Christoph Strobl
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
@@ -60,12 +59,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/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,23 +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) {
-
-		super.registerBeansForRoot(registry, 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);
@@ -190,41 +173,6 @@ 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.
 	 * 
@@ -284,7 +232,7 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 
 			MongoEntityMetadata<?> metadata = method.getEntityInformation();
 			return countProjection ? operations.count(query, metadata.getJavaType()) : operations.findOne(query,
-					metadata.getJavaType(), metadata.getCollectionName());
+					metadata.getJavaType());
 		}
 	}
 
@@ -293,7 +241,6 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 	 * 
 	 * @author Oliver Gierke
 	 */
-	@SuppressWarnings("deprecation")
 	final 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.getJavaType(), metadata.getCollectionName());
-			return writeResult != null ? writeResult.getN() : 0L;
-		}
-	}
 }

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

@@ -23,9 +23,9 @@ import java.util.List;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
-import org.springframework.data.geo.Distance;
-import org.springframework.data.geo.Point;
 import org.springframework.data.mongodb.core.convert.MongoWriter;
+import org.springframework.data.mongodb.core.geo.Distance;
+import org.springframework.data.mongodb.core.geo.Point;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.repository.query.ParameterAccessor;
 import org.springframework.data.util.TypeInformation;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoParameterAccessor.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,8 +15,8 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
-import org.springframework.data.geo.Distance;
-import org.springframework.data.geo.Point;
+import org.springframework.data.mongodb.core.geo.Distance;
+import org.springframework.data.mongodb.core.geo.Point;
 import org.springframework.data.repository.query.ParameterAccessor;
 
 /**

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

@@ -20,8 +20,8 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.springframework.core.MethodParameter;
-import org.springframework.data.geo.Distance;
-import org.springframework.data.geo.Point;
+import org.springframework.data.mongodb.core.geo.Distance;
+import org.springframework.data.mongodb.core.geo.Point;
 import org.springframework.data.mongodb.repository.Near;
 import org.springframework.data.mongodb.repository.query.MongoParameters.MongoParameter;
 import org.springframework.data.repository.query.Parameter;
@@ -64,11 +64,10 @@ public class MongoParameters extends Parameters<MongoParameters, MongoParameter>
 		this.nearIndex = nearIndex;
 	}
 
-	@SuppressWarnings({ "unchecked", "deprecation" })
+	@SuppressWarnings("unchecked")
 	private final int getNearIndex(List<Class<?>> parameterTypes) {
 
-		for (Class<?> reference : Arrays.asList(Point.class, org.springframework.data.mongodb.core.geo.Point.class,
-				double[].class)) {
+		for (Class<?> reference : Arrays.asList(Point.class, double[].class)) {
 
 			int nearIndex = parameterTypes.indexOf(reference);
 
@@ -162,7 +161,7 @@ public class MongoParameters extends Parameters<MongoParameters, MongoParameter>
 		 */
 		@Override
 		public boolean isSpecialParameter() {
-			return super.isSpecialParameter() || Distance.class.isAssignableFrom(getType()) || isNearParameter();
+			return super.isSpecialParameter() || getType().equals(Distance.class) || isNearParameter();
 		}
 
 		private boolean isNearParameter() {
@@ -175,7 +174,7 @@ public class MongoParameters extends Parameters<MongoParameters, MongoParameter>
 		}
 
 		private boolean isPoint() {
-			return Point.class.isAssignableFrom(getType()) || getType().equals(double[].class);
+			return getType().equals(Point.class) || getType().equals(double[].class);
 		}
 
 		private boolean hasNearAnnotation() {

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoParametersParameterAccessor.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,8 +15,8 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
-import org.springframework.data.geo.Distance;
-import org.springframework.data.geo.Point;
+import org.springframework.data.mongodb.core.geo.Distance;
+import org.springframework.data.mongodb.core.geo.Point;
 import org.springframework.data.repository.query.ParametersParameterAccessor;
 
 /**

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

@@ -24,11 +24,11 @@ import java.util.Iterator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.Sort;
-import org.springframework.data.geo.Distance;
-import org.springframework.data.geo.Point;
-import org.springframework.data.geo.Shape;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.context.PersistentPropertyPath;
+import org.springframework.data.mongodb.core.geo.Distance;
+import org.springframework.data.mongodb.core.geo.Point;
+import org.springframework.data.mongodb.core.geo.Shape;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.CriteriaDefinition;

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

@@ -15,16 +15,15 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
-import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
 
 import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.data.geo.GeoPage;
-import org.springframework.data.geo.GeoResult;
-import org.springframework.data.geo.GeoResults;
 import org.springframework.data.mapping.context.MappingContext;
+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.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.repository.Query;
@@ -42,8 +41,8 @@ import org.springframework.util.StringUtils;
  */
 public class MongoQueryMethod extends QueryMethod {
 
-	@SuppressWarnings("unchecked") private static final List<Class<? extends Serializable>> GEO_NEAR_RESULTS = Arrays
-			.asList(GeoResult.class, GeoResults.class, GeoPage.class);
+	@SuppressWarnings("unchecked") private static final List<Class<?>> GEO_NEAR_RESULTS = Arrays.asList(GeoResult.class,
+			GeoResults.class, GeoPage.class);
 
 	private final Method method;
 	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
@@ -153,15 +152,11 @@ public class MongoQueryMethod extends QueryMethod {
 
 	private boolean isGeoNearQuery(Method method) {
 
-		Class<?> returnType = method.getReturnType();
-
-		for (Class<?> type : GEO_NEAR_RESULTS) {
-			if (type.isAssignableFrom(returnType)) {
-				return true;
-			}
+		if (GEO_NEAR_RESULTS.contains(method.getReturnType())) {
+			return true;
 		}
 
-		if (Iterable.class.isAssignableFrom(returnType)) {
+		if (Iterable.class.isAssignableFrom(method.getReturnType())) {
 			TypeInformation<?> from = ClassTypeInformation.fromReturnTypeOf(method);
 			return GeoResult.class.equals(from.getComponentType().getType());
 		}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 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.
@@ -19,20 +19,15 @@ import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.repository.query.QueryMethod;
 import org.springframework.data.repository.query.RepositoryQuery;
 import org.springframework.data.repository.query.parser.PartTree;
-import org.springframework.util.StringUtils;
-
-import com.mongodb.util.JSONParseException;
 
 /**
  * {@link RepositoryQuery} implementation for Mongo.
  * 
  * @author Oliver Gierke
- * @author Christoph Strobl
  */
 public class PartTreeMongoQuery extends AbstractMongoQuery {
 
@@ -71,24 +66,7 @@ public class PartTreeMongoQuery extends AbstractMongoQuery {
 	protected Query createQuery(ConvertingParameterAccessor accessor) {
 
 		MongoQueryCreator creator = new MongoQueryCreator(tree, accessor, context, isGeoNearQuery);
-		Query query = creator.createQuery();
-
-		String fieldSpec = this.getQueryMethod().getFieldSpecification();
-
-		if (!StringUtils.hasText(fieldSpec)) {
-			return query;
-		}
-
-		try {
-
-			BasicQuery result = new BasicQuery(query.getQueryObject().toString(), fieldSpec);
-			result.setSortObject(query.getSortObject());
-			return result;
-
-		} catch (JSONParseException o_O) {
-			throw new IllegalStateException(String.format("Invalid query or field specification in %s!", getQueryMethod(),
-					o_O));
-		}
+		return creator.createQuery();
 	}
 
 	/* 
@@ -108,13 +86,4 @@ public class PartTreeMongoQuery extends AbstractMongoQuery {
 	protected boolean isCountQuery() {
 		return tree.isCountProjection();
 	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#isDeleteQuery()
-	 */
-	@Override
-	protected boolean isDeleteQuery() {
-		return tree.isDelete();
-	}
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/StringBasedMongoQuery.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,9 +15,6 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -26,44 +23,25 @@ import org.slf4j.LoggerFactory;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.util.StringUtils;
 
-import com.mongodb.DBObject;
 import com.mongodb.util.JSON;
 
 /**
  * Query to use a plain JSON String to create the {@link Query} to actually execute.
  * 
  * @author Oliver Gierke
- * @author Christoph Strobl
- * @author Thomas Darimont
  */
 public class StringBasedMongoQuery extends AbstractMongoQuery {
 
-	private static final String COUND_AND_DELETE = "Manually defined query for %s cannot be both a count and delete query at the same time!";
+	private static final Pattern PLACEHOLDER = Pattern.compile("\\?(\\d+)");
 	private static final Logger LOG = LoggerFactory.getLogger(StringBasedMongoQuery.class);
-	private static final ParameterBindingParser PARSER = ParameterBindingParser.INSTANCE;
 
 	private final String query;
 	private final String fieldSpec;
 	private final boolean isCountQuery;
-	private final boolean isDeleteQuery;
-	private final List<ParameterBinding> queryParameterBindings;
-	private final List<ParameterBinding> fieldSpecParameterBindings;
 
 	/**
-	 * Creates a new {@link StringBasedMongoQuery} for the given {@link MongoQueryMethod} and {@link MongoOperations}.
-	 * 
-	 * @param method must not be {@literal null}.
-	 * @param mongoOperations must not be {@literal null}.
-	 */
-	public StringBasedMongoQuery(MongoQueryMethod method, MongoOperations mongoOperations) {
-		this(method.getAnnotatedQuery(), method, mongoOperations);
-	}
-
-	/**
-	 * Creates a new {@link StringBasedMongoQuery} for the given {@link String}, {@link MongoQueryMethod} and
-	 * {@link MongoOperations}.
+	 * Creates a new {@link StringBasedMongoQuery}.
 	 * 
 	 * @param method must not be {@literal null}.
 	 * @param template must not be {@literal null}.
@@ -73,17 +51,12 @@ public class StringBasedMongoQuery extends AbstractMongoQuery {
 		super(method, mongoOperations);
 
 		this.query = query;
-		this.queryParameterBindings = PARSER.parseParameterBindingsFrom(query);
-
 		this.fieldSpec = method.getFieldSpecification();
-		this.fieldSpecParameterBindings = PARSER.parseParameterBindingsFrom(method.getFieldSpecification());
-
 		this.isCountQuery = method.hasAnnotatedQuery() ? method.getQueryAnnotation().count() : false;
-		this.isDeleteQuery = method.hasAnnotatedQuery() ? method.getQueryAnnotation().delete() : false;
+	}
 
-		if (isCountQuery && isDeleteQuery) {
-			throw new IllegalArgumentException(String.format(COUND_AND_DELETE, method));
-		}
+	public StringBasedMongoQuery(MongoQueryMethod method, MongoOperations mongoOperations) {
+		this(method.getAnnotatedQuery(), method, mongoOperations);
 	}
 
 	/*
@@ -93,12 +66,12 @@ public class StringBasedMongoQuery extends AbstractMongoQuery {
 	@Override
 	protected Query createQuery(ConvertingParameterAccessor accessor) {
 
-		String queryString = replacePlaceholders(query, accessor, queryParameterBindings);
+		String queryString = replacePlaceholders(query, accessor);
 
 		Query query = null;
 
 		if (fieldSpec != null) {
-			String fieldString = replacePlaceholders(fieldSpec, accessor, fieldSpecParameterBindings);
+			String fieldString = replacePlaceholders(fieldSpec, accessor);
 			query = new BasicQuery(queryString, fieldString);
 		} else {
 			query = new BasicQuery(queryString);
@@ -122,182 +95,21 @@ public class StringBasedMongoQuery extends AbstractMongoQuery {
 		return isCountQuery;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#isDeleteQuery()
-	 */
-	@Override
-	protected boolean isDeleteQuery() {
-		return this.isDeleteQuery;
+	private String replacePlaceholders(String input, ConvertingParameterAccessor accessor) {
+
+		Matcher matcher = PLACEHOLDER.matcher(input);
+		String result = input;
+
+		while (matcher.find()) {
+			String group = matcher.group();
+			int index = Integer.parseInt(matcher.group(1));
+			result = result.replace(group, getParameterWithIndex(accessor, index));
+		}
+
+		return result;
 	}
 
-	/**
-	 * Replaced the parameter place-holders with the actual parameter values from the given {@link ParameterBinding}s.
-	 * 
-	 * @param input
-	 * @param accessor
-	 * @param bindings
-	 * @return
-	 */
-	private String replacePlaceholders(String input, ConvertingParameterAccessor accessor, List<ParameterBinding> bindings) {
-
-		if (bindings.isEmpty()) {
-			return input;
-		}
-
-		StringBuilder result = new StringBuilder(input);
-
-		for (ParameterBinding binding : bindings) {
-
-			String parameter = binding.getParameter();
-			int idx = result.indexOf(parameter);
-
-			if (idx != -1) {
-				result.replace(idx, idx + parameter.length(), getParameterValueForBinding(accessor, binding));
-			}
-		}
-
-		return result.toString();
-	}
-
-	/**
-	 * Returns the serialized value to be used for the given {@link ParameterBinding}.
-	 * 
-	 * @param accessor
-	 * @param binding
-	 * @return
-	 */
-	private String getParameterValueForBinding(ConvertingParameterAccessor accessor, ParameterBinding binding) {
-
-		Object value = accessor.getBindableValue(binding.getParameterIndex());
-
-		if (value instanceof String && binding.isQuoted()) {
-			return (String) value;
-		}
-
-		return JSON.serialize(value);
-	}
-
-	/**
-	 * A parser that extracts the parameter bindings from a given query string.
-	 * 
-	 * @author Thomas Darimont
-	 */
-	private static enum ParameterBindingParser {
-
-		INSTANCE;
-
-		private static final String PARAMETER_PREFIX = "_param_";
-		private static final String PARSEABLE_PARAMETER = "\"" + PARAMETER_PREFIX + "$1\"";
-		private static final Pattern PARAMETER_BINDING_PATTERN = Pattern.compile("\\?(\\d+)");
-		private static final Pattern PARSEABLE_BINDING_PATTERN = Pattern.compile("\"?" + PARAMETER_PREFIX + "(\\d+)\"?");
-
-		private final static int PARAMETER_INDEX_GROUP = 1;
-
-		/**
-		 * Returns a list of {@link ParameterBinding}s found in the given {@code input} or an
-		 * {@link Collections#emptyList()}.
-		 * 
-		 * @param input
-		 * @return
-		 */
-		public List<ParameterBinding> parseParameterBindingsFrom(String input) {
-
-			if (!StringUtils.hasText(input)) {
-				return Collections.emptyList();
-			}
-
-			List<ParameterBinding> bindings = new ArrayList<ParameterBinding>();
-
-			String parseableInput = makeParameterReferencesParseable(input);
-
-			collectParameterReferencesIntoBindings(bindings, JSON.parse(parseableInput));
-
-			return bindings;
-		}
-
-		private String makeParameterReferencesParseable(String input) {
-
-			Matcher matcher = PARAMETER_BINDING_PATTERN.matcher(input);
-			String parseableInput = matcher.replaceAll(PARSEABLE_PARAMETER);
-
-			return parseableInput;
-		}
-
-		private void collectParameterReferencesIntoBindings(List<ParameterBinding> bindings, Object value) {
-
-			if (value instanceof String) {
-
-				String string = ((String) value).trim();
-
-				Matcher valueMatcher = PARSEABLE_BINDING_PATTERN.matcher(string);
-				while (valueMatcher.find()) {
-					int paramIndex = Integer.parseInt(valueMatcher.group(PARAMETER_INDEX_GROUP));
-					boolean quoted = (string.startsWith("'") && string.endsWith("'"))
-							|| (string.startsWith("\"") && string.endsWith("\""));
-					bindings.add(new ParameterBinding(paramIndex, quoted));
-				}
-
-			} else if (value instanceof Pattern) {
-
-				String string = ((Pattern) value).toString().trim();
-
-				Matcher valueMatcher = PARSEABLE_BINDING_PATTERN.matcher(string);
-				while (valueMatcher.find()) {
-					int paramIndex = Integer.parseInt(valueMatcher.group(PARAMETER_INDEX_GROUP));
-
-					/*
-					 * The pattern is used as a direct parameter replacement, e.g. 'field': ?1, 
-					 * therefore we treat it as not quoted to remain backwards compatible.
-					 */
-					boolean quoted = !string.equals(PARAMETER_PREFIX + paramIndex);
-
-					bindings.add(new ParameterBinding(paramIndex, quoted));
-				}
-
-			} else if (value instanceof DBObject) {
-
-				DBObject dbo = (DBObject) value;
-
-				for (String field : dbo.keySet()) {
-					collectParameterReferencesIntoBindings(bindings, dbo.get(field));
-				}
-			}
-		}
-	}
-
-	/**
-	 * A generic parameter binding with name or position information.
-	 * 
-	 * @author Thomas Darimont
-	 */
-	private static class ParameterBinding {
-
-		private final int parameterIndex;
-		private final boolean quoted;
-
-		/**
-		 * Creates a new {@link ParameterBinding} with the given {@code parameterIndex} and {@code quoted} information.
-		 * 
-		 * @param parameterIndex
-		 * @param quoted whether or not the parameter is already quoted.
-		 */
-		public ParameterBinding(int parameterIndex, boolean quoted) {
-
-			this.parameterIndex = parameterIndex;
-			this.quoted = quoted;
-		}
-
-		public boolean isQuoted() {
-			return quoted;
-		}
-
-		public int getParameterIndex() {
-			return parameterIndex;
-		}
-
-		public String getParameter() {
-			return "?" + parameterIndex;
-		}
+	private String getParameterWithIndex(ConvertingParameterAccessor accessor, int index) {
+		return JSON.serialize(accessor.getBindableValue(index));
 	}
 }

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

@@ -17,7 +17,6 @@ package org.springframework.data.mongodb.repository.support;
 
 import java.io.Serializable;
 
-import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.repository.Repository;
@@ -35,7 +34,6 @@ public class MongoRepositoryFactoryBean<T extends Repository<S, ID>, S, ID exten
 
 	private MongoOperations operations;
 	private boolean createIndexesForQueryMethods = false;
-	private boolean mappingContextConfigured = false;
 
 	/**
 	 * Configures the {@link MongoOperations} to be used.
@@ -44,6 +42,7 @@ public class MongoRepositoryFactoryBean<T extends Repository<S, ID>, S, ID exten
 	 */
 	public void setMongoOperations(MongoOperations operations) {
 		this.operations = operations;
+		setMappingContext(operations.getConverter().getMappingContext());
 	}
 
 	/**
@@ -55,17 +54,6 @@ public class MongoRepositoryFactoryBean<T extends Repository<S, ID>, S, ID exten
 		this.createIndexesForQueryMethods = createIndexesForQueryMethods;
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport#setMappingContext(org.springframework.data.mapping.context.MappingContext)
-	 */
-	@Override
-	protected void setMappingContext(MappingContext<?, ?> mappingContext) {
-
-		super.setMappingContext(mappingContext);
-		this.mappingContextConfigured = true;
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * 
@@ -107,9 +95,5 @@ public class MongoRepositoryFactoryBean<T extends Repository<S, ID>, S, ID exten
 
 		super.afterPropertiesSet();
 		Assert.notNull(operations, "MongoTemplate must not be null!");
-
-		if (!mappingContextConfigured) {
-			setMappingContext(operations.getConverter().getMappingContext());
-		}
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,10 +25,7 @@ import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.util.Assert;
 
 import com.mongodb.DBObject;
-import com.mongodb.DBRef;
 import com.mysema.query.mongodb.MongodbSerializer;
-import com.mysema.query.types.Constant;
-import com.mysema.query.types.Operation;
 import com.mysema.query.types.Path;
 import com.mysema.query.types.PathMetadata;
 import com.mysema.query.types.PathType;
@@ -37,12 +34,9 @@ import com.mysema.query.types.PathType;
  * Custom {@link MongodbSerializer} to take mapping information into account when building keys for constraints.
  * 
  * @author Oliver Gierke
- * @author Christoph Strobl
  */
 class SpringDataMongodbSerializer extends MongodbSerializer {
 
-	private final String ID_KEY = "_id";
-
 	private final MongoConverter converter;
 	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
 	private final QueryMapper mapper;
@@ -50,7 +44,7 @@ class SpringDataMongodbSerializer extends MongodbSerializer {
 	/**
 	 * Creates a new {@link SpringDataMongodbSerializer} for the given {@link MappingContext}.
 	 * 
-	 * @param mappingContext must not be {@literal null}.
+	 * @param mappingContext
 	 */
 	public SpringDataMongodbSerializer(MongoConverter converter) {
 
@@ -86,63 +80,10 @@ class SpringDataMongodbSerializer extends MongodbSerializer {
 	@Override
 	protected DBObject asDBObject(String key, Object value) {
 
-		if (ID_KEY.equals(key)) {
-			return mapper.getMappedObject(super.asDBObject(key, value), null);
+		if ("_id".equals(key)) {
+			return super.asDBObject(key, mapper.convertId(value));
 		}
 
 		return super.asDBObject(key, value instanceof Pattern ? value : converter.convertToMongoType(value));
 	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see com.mysema.query.mongodb.MongodbSerializer#isReference(com.mysema.query.types.Path)
-	 */
-	@Override
-	protected boolean isReference(Path<?> path) {
-
-		MongoPersistentProperty property = getPropertyFor(path);
-		return property == null ? false : property.isAssociation();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see com.mysema.query.mongodb.MongodbSerializer#asReference(java.lang.Object)
-	 */
-	@Override
-	protected DBRef asReference(Object constant) {
-		return converter.toDBRef(constant, null);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see com.mysema.query.mongodb.MongodbSerializer#asReference(com.mysema.query.types.Operation, int)
-	 */
-	@Override
-	protected DBRef asReference(Operation<?> expr, int constIndex) {
-
-		for (Object arg : expr.getArgs()) {
-
-			if (arg instanceof Path) {
-
-				MongoPersistentProperty property = getPropertyFor((Path<?>) arg);
-				Object constant = ((Constant<?>) expr.getArg(constIndex)).getConstant();
-
-				return converter.toDBRef(constant, property);
-			}
-		}
-
-		return super.asReference(expr, constIndex);
-	}
-
-	private MongoPersistentProperty getPropertyFor(Path<?> path) {
-
-		Path<?> parent = path.getMetadata().getParent();
-
-		if (parent == null) {
-			return null;
-		}
-
-		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(parent.getType());
-		return entity != null ? entity.getPersistentProperty(path.getMetadata().getName()) : null;
-	}
 }

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

@@ -1 +1 @@
-http\://www.springframework.org/schema/data/mongo=org.springframework.data.mongodb.repository.config.MongoRepositoryConfigNamespaceHandler
+http\://www.springframework.org/schema/data/mongo=org.springframework.data.mongodb.config.MongoNamespaceHandler

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

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

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

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

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

@@ -34,9 +34,6 @@ import org.springframework.data.mongodb.core.mapping.event.BeforeConvertEvent;
  */
 public class AuditingIntegrationTests {
 
-	/**
-	 * @see DATAMONGO-577, DATAMONGO-800, DATAMONGO-883
-	 */
 	@Test
 	public void enablesAuditingAndSetsPropertiesAccordingly() throws Exception {
 
@@ -61,13 +58,8 @@ public class AuditingIntegrationTests {
 
 	class Entity {
 
-		@Id Long id;
 		@CreatedDate DateTime created;
-		DateTime modified;
-
-		@LastModifiedDate
-		public DateTime getModified() {
-			return modified;
-		}
+		@LastModifiedDate DateTime modified;
+		@Id Long id;
 	}
 }

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AuditingViaJavaConfigRepositoriesTests.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.
@@ -19,8 +19,6 @@ import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
-import java.net.UnknownHostException;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -30,15 +28,16 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.domain.AuditorAware;
 import org.springframework.data.mongodb.core.AuditablePerson;
+import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
 import org.springframework.stereotype.Repository;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.mongodb.Mongo;
 import com.mongodb.MongoClient;
 
 /**
@@ -58,16 +57,16 @@ public class AuditingViaJavaConfigRepositoriesTests {
 	@Configuration
 	@EnableMongoAuditing(auditorAwareRef = "auditorProvider")
 	@EnableMongoRepositories(basePackageClasses = AuditablePersonRepository.class, considerNestedRepositories = true)
-	static class Config extends AbstractMongoConfiguration {
+	static class Config {
 
-		@Override
-		protected String getDatabaseName() {
-			return "database";
+		@Bean
+		public MongoOperations mongoTemplate() throws Exception {
+			return new MongoTemplate(new SimpleMongoDbFactory(new MongoClient(), "database"));
 		}
 
-		@Override
-		public Mongo mongo() throws Exception {
-			return new MongoClient();
+		@Bean
+		public MongoMappingContext mappingContext() {
+			return new MongoMappingContext();
 		}
 
 		@Bean
@@ -83,21 +82,19 @@ public class AuditingViaJavaConfigRepositoriesTests {
 		this.auditor = auditablePersonRepository.save(new AuditablePerson("auditor"));
 	}
 
-	/**
-	 * @see DATAMONGO-792, DATAMONGO-883
-	 */
 	@Test
 	public void basicAuditing() {
 
 		doReturn(this.auditor).when(this.auditorAware).getCurrentAuditor();
 
-		AuditablePerson savedUser = auditablePersonRepository.save(new AuditablePerson("user"));
+		AuditablePerson user = new AuditablePerson("user");
+
+		AuditablePerson savedUser = auditablePersonRepository.save(user);
+		System.out.println(savedUser);
 
 		AuditablePerson createdBy = savedUser.getCreatedBy();
-
 		assertThat(createdBy, is(notNullValue()));
 		assertThat(createdBy.getFirstname(), is(this.auditor.getFirstname()));
-		assertThat(savedUser.getCreatedAt(), is(notNullValue()));
 	}
 
 	/**
@@ -105,40 +102,16 @@ public class AuditingViaJavaConfigRepositoriesTests {
 	 */
 	@Test
 	@SuppressWarnings("resource")
-	public void auditingUsesFallbackMappingContextIfNoneConfiguredWithRepositories() {
-		new AnnotationConfigApplicationContext(SimpleConfigWithRepositories.class);
-	}
-
-	/**
-	 * @see DATAMONGO-843
-	 */
-	@Test
-	@SuppressWarnings("resource")
-	public void auditingUsesFallbackMappingContextIfNoneConfigured() {
-		new AnnotationConfigApplicationContext(SimpleConfig.class);
+	public void defaultsMappingContextIfNoneConfigured() {
+		new AnnotationConfigApplicationContext(SampleConfig.class);
 	}
 
 	@Repository
 	static interface AuditablePersonRepository extends MongoRepository<AuditablePerson, String> {}
 
 	@Configuration
-	@EnableMongoRepositories
 	@EnableMongoAuditing
-	static class SimpleConfigWithRepositories {
+	static class SampleConfig {
 
-		@Bean
-		public MongoTemplate mongoTemplate() throws UnknownHostException {
-			return new MongoTemplate(new SimpleMongoDbFactory(new MongoClient(), "database"));
-		}
-	}
-
-	@Configuration
-	@EnableMongoAuditing
-	static class SimpleConfig {
-
-		@Bean
-		public MongoTemplate mongoTemplate() throws UnknownHostException {
-			return new MongoTemplate(new SimpleMongoDbFactory(new MongoClient(), "database"));
-		}
 	}
 }

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MappingMongoConverterParserIntegrationTests.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.
@@ -25,9 +25,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.BeanReference;
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.convert.TypeDescriptor;
@@ -50,7 +48,6 @@ import com.mongodb.DBObject;
  * @author Oliver Gierke
  * @author Thomas Darimont
  * @author Christoph Strobl
- * @author Ryan Tenney
  */
 public class MappingMongoConverterParserIntegrationTests {
 
@@ -101,7 +98,7 @@ public class MappingMongoConverterParserIntegrationTests {
 	public void activatesAbbreviatingPropertiesCorrectly() {
 
 		loadValidConfiguration();
-		BeanDefinition definition = factory.getBeanDefinition("abbreviatingConverter.mongoMappingContext");
+		BeanDefinition definition = factory.getBeanDefinition("abbreviatingConverter.mappingContext");
 		Object value = definition.getPropertyValues().getPropertyValue("fieldNamingStrategy").getValue();
 
 		assertThat(value, is(instanceOf(BeanDefinition.class)));
@@ -109,21 +106,6 @@ public class MappingMongoConverterParserIntegrationTests {
 		assertThat(strategy.getBeanClassName(), is(CamelCaseAbbreviatingFieldNamingStrategy.class.getName()));
 	}
 
-	/**
-	 * @see DATAMONGO-866
-	 */
-	@Test
-	public void rejectsInvalidFieldNamingStrategyConfiguration() {
-
-		exception.expect(BeanDefinitionParsingException.class);
-		exception.expectMessage("abbreviation");
-		exception.expectMessage("field-naming-strategy-ref");
-
-		BeanDefinitionRegistry factory = new DefaultListableBeanFactory();
-		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(factory);
-		reader.loadBeanDefinitions(new ClassPathResource("namespace/converter-invalid.xml"));
-	}
-
 	/**
 	 * @see DATAMONGO-892
 	 */
@@ -136,22 +118,6 @@ public class MappingMongoConverterParserIntegrationTests {
 		loadNestedBeanConfiguration();
 	}
 
-	/**
-	 * @see DATAMONGO-925, DATAMONGO-928
-	 */
-	@Test
-	public void shouldSupportCustomFieldNamingStrategy() {
-		assertStrategyReferenceSetFor("mappingConverterWithCustomFieldNamingStrategy");
-	}
-
-	/**
-	 * @see DATAMONGO-925, DATAMONGO-928
-	 */
-	@Test
-	public void shouldNotFailLoadingConfigIfAbbreviationIsDisabledAndStrategySet() {
-		assertStrategyReferenceSetFor("mappingConverterWithCustomFieldNamingStrategyAndAbbreviationDisabled");
-	}
-
 	private void loadValidConfiguration() {
 		this.loadConfiguration("namespace/converter.xml");
 	}
@@ -166,19 +132,6 @@ public class MappingMongoConverterParserIntegrationTests {
 		reader.loadBeanDefinitions(new ClassPathResource(configLocation));
 	}
 
-	private static void assertStrategyReferenceSetFor(String beanId) {
-
-		BeanDefinitionRegistry factory = new DefaultListableBeanFactory();
-		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(factory);
-		reader.loadBeanDefinitions(new ClassPathResource("namespace/converter-custom-fieldnamingstrategy.xml"));
-
-		BeanDefinition definition = reader.getRegistry().getBeanDefinition(beanId.concat(".mongoMappingContext"));
-		BeanReference value = (BeanReference) definition.getPropertyValues().getPropertyValue("fieldNamingStrategy")
-				.getValue();
-
-		assertThat(value.getBeanName(), is("customFieldNamingStrategy"));
-	}
-
 	@Component
 	public static class SampleConverter implements Converter<Person, DBObject> {
 		public DBObject convert(Person source) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,6 @@ import org.springframework.core.io.ClassPathResource;
  * @see DATAMONGO-36
  * @author Maciej Walkowiak
  * @author Thomas Darimont
- * @author Oliver Gierke
  */
 public class MappingMongoConverterParserValidationIntegrationTests {
 
@@ -47,43 +46,31 @@ public class MappingMongoConverterParserValidationIntegrationTests {
 		reader = new XmlBeanDefinitionReader(factory);
 	}
 
-	/**
-	 * @see DATAMONGO-36
-	 */
 	@Test
 	public void validatingEventListenerCreatedWithDefaultConfig() {
 
 		reader.loadBeanDefinitions(new ClassPathResource("namespace/converter-default.xml"));
-		assertThat(factory.getBean(BeanNames.VALIDATING_EVENT_LISTENER_BEAN_NAME), is(not(nullValue())));
+		assertThat(factory.getBean(BeanNames.VALIDATING_EVENT_LISTENER), is(not(nullValue())));
 	}
 
-	/**
-	 * @see DATAMONGO-36
-	 */
 	@Test
 	public void validatingEventListenerCreatedWhenValidationEnabled() {
 
 		reader.loadBeanDefinitions(new ClassPathResource("namespace/converter-validation-enabled.xml"));
-		assertThat(factory.getBean(BeanNames.VALIDATING_EVENT_LISTENER_BEAN_NAME), is(not(nullValue())));
+		assertThat(factory.getBean(BeanNames.VALIDATING_EVENT_LISTENER), is(not(nullValue())));
 	}
 
-	/**
-	 * @see DATAMONGO-36
-	 */
 	@Test(expected = NoSuchBeanDefinitionException.class)
 	public void validatingEventListenersIsNotCreatedWhenDisabled() {
 
 		reader.loadBeanDefinitions(new ClassPathResource("namespace/converter-validation-disabled.xml"));
-		factory.getBean(BeanNames.VALIDATING_EVENT_LISTENER_BEAN_NAME);
+		factory.getBean(BeanNames.VALIDATING_EVENT_LISTENER);
 	}
 
-	/**
-	 * @see DATAMONGO-36
-	 */
 	@Test
 	public void validatingEventListenerCreatedWithCustomTypeMapperConfig() {
 
 		reader.loadBeanDefinitions(new ClassPathResource("namespace/converter-custom-typeMapper.xml"));
-		assertThat(factory.getBean(BeanNames.VALIDATING_EVENT_LISTENER_BEAN_NAME), is(not(nullValue())));
+		assertThat(factory.getBean(BeanNames.VALIDATING_EVENT_LISTENER), is(not(nullValue())));
 	}
 }

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

@@ -15,10 +15,7 @@
  */
 package org.springframework.data.mongodb.core;
 
-import java.util.Date;
-
 import org.springframework.data.annotation.CreatedBy;
-import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.DBRef;
 
@@ -29,10 +26,9 @@ import org.springframework.data.mongodb.core.mapping.DBRef;
  */
 public class AuditablePerson {
 
-	private @Id String id;
+	@Id private String id;
 	private String firstname;
-	private @DBRef @CreatedBy AuditablePerson createdBy;
-	private @CreatedDate Date createdAt;
+	@DBRef @CreatedBy private AuditablePerson createdBy;
 
 	public AuditablePerson() {}
 
@@ -63,8 +59,4 @@ public class AuditablePerson {
 	public void setCreatedBy(AuditablePerson createdBy) {
 		this.createdBy = createdBy;
 	}
-
-	public Date getCreatedAt() {
-		return createdAt;
-	}
 }

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

@@ -1,93 +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;
-
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.index.IndexInfo;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.util.ObjectUtils;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBCollection;
-import com.mongodb.DBObject;
-
-/**
- * Integration tests for {@link DefaultIndexOperations}.
- * 
- * @author Christoph Strobl
- * @author Oliver Gierke
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("classpath:infrastructure.xml")
-public class DefaultIndexOperationsIntegrationTests {
-
-	static final DBObject GEO_SPHERE_2D = new BasicDBObject("loaction", "2dsphere");
-
-	@Autowired MongoTemplate template;
-	DefaultIndexOperations indexOps;
-	DBCollection collection;
-
-	@Before
-	public void setUp() {
-
-		String collectionName = this.template.getCollectionName(DefaultIndexOperationsIntegrationTestsSample.class);
-
-		this.collection = this.template.getDb().getCollection(collectionName);
-		this.collection.dropIndexes();
-
-		this.indexOps = new DefaultIndexOperations(template, collectionName);
-	}
-
-	/**
-	 * @see DATAMONGO-1008
-	 */
-	@Test
-	public void getIndexInfoShouldBeAbleToRead2dsphereIndex() {
-
-		collection.createIndex(GEO_SPHERE_2D);
-
-		IndexInfo info = findAndReturnIndexInfo(GEO_SPHERE_2D);
-		assertThat(info.getIndexFields().get(0).isGeo(), is(true));
-	}
-
-	private IndexInfo findAndReturnIndexInfo(DBObject keys) {
-		return findAndReturnIndexInfo(indexOps.getIndexInfo(), keys);
-	}
-
-	@SuppressWarnings("deprecation")
-	private static IndexInfo findAndReturnIndexInfo(Iterable<IndexInfo> candidates, DBObject keys) {
-		return findAndReturnIndexInfo(candidates, DBCollection.genIndexName(keys));
-	}
-
-	private static IndexInfo findAndReturnIndexInfo(Iterable<IndexInfo> candidates, String name) {
-
-		for (IndexInfo info : candidates) {
-			if (ObjectUtils.nullSafeEquals(name, info.getName())) {
-				return info;
-			}
-		}
-		throw new AssertionError(String.format("Index with %s was not found", name));
-	}
-
-	static class DefaultIndexOperationsIntegrationTestsSample {}
-}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoOperationsUnitTests.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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.data.mongodb.core;
 
 import static org.junit.Assert.*;
@@ -26,11 +27,11 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.dao.DataAccessException;
-import org.springframework.data.geo.Point;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.convert.AbstractMongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoTypeMapper;
+import org.springframework.data.mongodb.core.geo.Point;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.core.query.NearQuery;

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

@@ -186,8 +186,6 @@ public class MongoTemplateTests {
 		template.dropCollection(DocumentWithCollectionOfSimpleType.class);
 		template.dropCollection(DocumentWithMultipleCollections.class);
 		template.dropCollection(DocumentWithDBRefCollection.class);
-		template.dropCollection(SomeContent.class);
-		template.dropCollection(SomeTemplate.class);
 	}
 
 	@Test
@@ -2488,60 +2486,6 @@ public class MongoTemplateTests {
 		assertThat(result.get(0).dbRefProperty.field, is(sample.field));
 	}
 
-	/**
-	 * @see DATAMONGO-566
-	 */
-	@Test
-	public void testFindAllAndRemoveFullyReturnsAndRemovesDocuments() {
-
-		Sample spring = new Sample("100", "spring");
-		Sample data = new Sample("200", "data");
-		Sample mongodb = new Sample("300", "mongodb");
-		template.insert(Arrays.asList(spring, data, mongodb), Sample.class);
-
-		Query qry = query(where("field").in("spring", "mongodb"));
-		List<Sample> result = template.findAllAndRemove(qry, Sample.class);
-
-		assertThat(result, hasSize(2));
-
-		assertThat(
-				template.getDb().getCollection("sample")
-						.find(new BasicDBObject("field", new BasicDBObject("$in", Arrays.asList("spring", "mongodb")))).count(),
-				is(0));
-		assertThat(template.getDb().getCollection("sample").find(new BasicDBObject("field", "data")).count(), is(1));
-	}
-
-	/**
-	 * @see DATAMONGO-1001
-	 */
-	@Test
-	public void shouldAllowSavingOfLazyLoadedDbRefs() {
-
-		template.dropCollection(SomeTemplate.class);
-		template.dropCollection(SomeMessage.class);
-		template.dropCollection(SomeContent.class);
-
-		SomeContent content = new SomeContent();
-		content.id = "content-1";
-		content.text = "spring";
-		template.save(content);
-
-		SomeTemplate tmpl = new SomeTemplate();
-		tmpl.id = "template-1";
-		tmpl.content = content; // @DBRef(lazy=true) tmpl.content
-
-		template.save(tmpl);
-
-		SomeTemplate savedTmpl = template.findById(tmpl.id, SomeTemplate.class);
-
-		SomeContent loadedContent = savedTmpl.getContent();
-		loadedContent.setText("data");
-		template.save(loadedContent);
-
-		assertThat(template.findById(content.id, SomeContent.class).getText(), is("data"));
-
-	}
-
 	/**
 	 * @see DATAMONGO-880
 	 */
@@ -2607,25 +2551,6 @@ public class MongoTemplateTests {
 		assertThat(savedTmpl.getContent().getText(), is(nullValue()));
 	}
 
-	/**
-	 * @see DATAMONGO-471
-	 */
-	@Test
-	public void updateMultiShouldAddValuesCorrectlyWhenUsingAddToSetWithEach() {
-
-		DocumentWithCollectionOfSimpleType document = new DocumentWithCollectionOfSimpleType();
-		document.values = Arrays.asList("spring");
-		template.save(document);
-
-		Query query = query(where("id").is(document.id));
-		assumeThat(template.findOne(query, DocumentWithCollectionOfSimpleType.class).values, hasSize(1));
-
-		Update update = new Update().addToSet("values").each("data", "mongodb");
-		template.updateMulti(query, update, DocumentWithCollectionOfSimpleType.class);
-
-		assertThat(template.findOne(query, DocumentWithCollectionOfSimpleType.class).values, hasSize(3));
-	}
-
 	/**
 	 * @see DATAMONGO-888
 	 */
@@ -2668,78 +2593,6 @@ public class MongoTemplateTests {
 		assertThat(template.find(query, DoucmentWithNamedIdField.class), contains(two, one));
 	}
 
-	/**
-	 * @see DATAMONGO-913
-	 */
-	@Test
-	public void shouldRetrieveInitializedValueFromDbRefAssociationAfterLoad() {
-
-		SomeContent content = new SomeContent();
-		content.id = "content-1";
-		content.name = "Content 1";
-		content.text = "Some text";
-
-		template.save(content);
-
-		SomeTemplate tmpl = new SomeTemplate();
-		tmpl.id = "template-1";
-		tmpl.content = content;
-
-		template.save(tmpl);
-
-		SomeTemplate result = template.findOne(query(where("content").is(tmpl.getContent())), SomeTemplate.class);
-
-		assertThat(result, is(notNullValue()));
-		assertThat(result.getContent(), is(notNullValue()));
-		assertThat(result.getContent().getId(), is(notNullValue()));
-		assertThat(result.getContent().getName(), is(notNullValue()));
-		assertThat(result.getContent().getText(), is(content.getText()));
-	}
-
-	/**
-	 * @see DATAMONGO-913
-	 */
-	@Test
-	public void shouldReuseExistingDBRefInQueryFromDbRefAssociationAfterLoad() {
-
-		SomeContent content = new SomeContent();
-		content.id = "content-1";
-		content.name = "Content 1";
-		content.text = "Some text";
-
-		template.save(content);
-
-		SomeTemplate tmpl = new SomeTemplate();
-		tmpl.id = "template-1";
-		tmpl.content = content;
-
-		template.save(tmpl);
-
-		SomeTemplate result = template.findOne(query(where("content").is(tmpl.getContent())), SomeTemplate.class);
-
-		// Use lazy-loading-proxy in query
-		result = template.findOne(query(where("content").is(result.getContent())), SomeTemplate.class);
-
-		assertNotNull(result.getContent().getName());
-		assertThat(result.getContent().getName(), is(content.getName()));
-	}
-
-	/**
-	 * @see DATAMONGO-970
-	 */
-	@Test
-	public void insertsAndRemovesBasicDbObjectCorrectly() {
-
-		BasicDBObject object = new BasicDBObject("key", "value");
-		template.insert(object, "collection");
-
-		assertThat(object.get("_id"), is(notNullValue()));
-		assertThat(template.findAll(DBObject.class, "collection"), hasSize(1));
-
-		template.remove(object, "collection");
-		assertThat(template.findAll(DBObject.class, "collection"), hasSize(0));
-	}
-
 	static class DoucmentWithNamedIdField {
 
 		@Id String someIdKey;
@@ -2981,20 +2834,6 @@ public class MongoTemplateTests {
 
 		String id;
 		String text;
-		String name;
-
-		public String getName() {
-			return name;
-		}
-
-		public void setText(String text) {
-			this.text = text;
-
-		}
-
-		public String getId() {
-			return id;
-		}
 
 		public String getText() {
 			return text;

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

@@ -42,7 +42,6 @@ import org.springframework.dao.DataAccessException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.Version;
-import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.convert.CustomConversions;
 import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
@@ -50,17 +49,13 @@ import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.index.MongoPersistentEntityIndexCreator;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
-import org.springframework.data.mongodb.core.query.BasicQuery;
-import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import com.mongodb.BasicDBObject;
-import com.mongodb.BasicDBObjectBuilder;
 import com.mongodb.DB;
 import com.mongodb.DBCollection;
-import com.mongodb.DBCursor;
 import com.mongodb.DBObject;
 import com.mongodb.Mongo;
 import com.mongodb.MongoException;
@@ -80,7 +75,6 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests {
 	@Mock Mongo mongo;
 	@Mock DB db;
 	@Mock DBCollection collection;
-	@Mock DBCursor cursor;
 
 	MongoExceptionTranslator exceptionTranslator = new MongoExceptionTranslator();
 	MappingMongoConverter converter;
@@ -92,14 +86,11 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests {
 		when(factory.getDb()).thenReturn(db);
 		when(factory.getExceptionTranslator()).thenReturn(exceptionTranslator);
 		when(db.getCollection(Mockito.any(String.class))).thenReturn(collection);
-		when(collection.find(Mockito.any(DBObject.class))).thenReturn(cursor);
-		when(cursor.limit(anyInt())).thenReturn(cursor);
-		when(cursor.sort(Mockito.any(DBObject.class))).thenReturn(cursor);
-		when(cursor.hint(anyString())).thenReturn(cursor);
 
 		this.mappingContext = new MongoMappingContext();
 		this.converter = new MappingMongoConverter(new DefaultDbRefResolver(factory), mappingContext);
 		this.template = new MongoTemplate(factory, converter);
+
 	}
 
 	@Test(expected = IllegalArgumentException.class)
@@ -291,67 +282,6 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests {
 		}));
 	}
 
-	/**
-	 * @see DATAMONGO-566
-	 */
-	@Test
-	public void findAllAndRemoveShouldRetrieveMatchingDocumentsPriorToRemoval() {
-
-		BasicQuery query = new BasicQuery("{'foo':'bar'}");
-		template.findAllAndRemove(query, VersionedEntity.class);
-		verify(collection, times(1)).find(Matchers.eq(query.getQueryObject()));
-	}
-
-	/**
-	 * @see DATAMONGO-566
-	 */
-	@Test
-	public void findAllAndRemoveShouldRemoveDocumentsReturedByFindQuery() {
-
-		Mockito.when(cursor.hasNext()).thenReturn(true).thenReturn(true).thenReturn(false);
-		Mockito.when(cursor.next()).thenReturn(new BasicDBObject("_id", Integer.valueOf(0)))
-				.thenReturn(new BasicDBObject("_id", Integer.valueOf(1)));
-
-		ArgumentCaptor<DBObject> queryCaptor = ArgumentCaptor.forClass(DBObject.class);
-		BasicQuery query = new BasicQuery("{'foo':'bar'}");
-		template.findAllAndRemove(query, VersionedEntity.class);
-
-		verify(collection, times(1)).remove(queryCaptor.capture());
-
-		DBObject idField = DBObjectTestUtils.getAsDBObject(queryCaptor.getValue(), "_id");
-		assertThat((Object[]) idField.get("$in"), is(new Object[] { Integer.valueOf(0), Integer.valueOf(1) }));
-	}
-
-	/**
-	 * @see DATAMONGO-566
-	 */
-	@Test
-	public void findAllAndRemoveShouldNotTriggerRemoveIfFindResultIsEmpty() {
-
-		template.findAllAndRemove(new BasicQuery("{'foo':'bar'}"), VersionedEntity.class);
-		verify(collection, never()).remove(Mockito.any(DBObject.class));
-	}
-
-	/**
-	 * @see DATAMONGO-948
-	 */
-	@Test
-	public void sortShouldBeTakenAsIsWhenExecutingQueryWithoutSpecificTypeInformation() {
-
-		Query query = Query.query(Criteria.where("foo").is("bar")).with(new Sort("foo"));
-		template.executeQuery(query, "collection1", new DocumentCallbackHandler() {
-
-			@Override
-			public void processDocument(DBObject dbObject) throws MongoException, DataAccessException {
-				// nothing to do - just a test
-			}
-		});
-
-		ArgumentCaptor<DBObject> captor = ArgumentCaptor.forClass(DBObject.class);
-		verify(cursor, times(1)).sort(captor.capture());
-		assertThat(captor.getValue(), equalTo(new BasicDBObjectBuilder().add("foo", 1).get()));
-	}
-
 	class AutogenerateableId {
 
 		@Id BigInteger id;

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

@@ -23,7 +23,8 @@ public class PersonWithVersionPropertyOfTypeLong {
 	String firstName;
 	int age;
 
-	@Version Long version;
+	@Version
+	Long version;
 
 	@Override
 	public String toString() {

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

@@ -47,7 +47,6 @@ import org.springframework.data.annotation.Id;
 import org.springframework.data.mapping.model.MappingException;
 import org.springframework.data.mongodb.core.CollectionCallback;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.aggregation.AggregationTests.CarDescriptor.Entry;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.util.Version;
 import org.springframework.test.context.ContextConfiguration;
@@ -823,40 +822,6 @@ public class AggregationTests {
 		assertThat(invoice.getTotalAmount(), is(closeTo(9.877, 000001)));
 	}
 
-	/**
-	 * @see DATAMONGO-924
-	 */
-	@Test
-	public void shouldAllowGroupingByAliasedFieldDefinedInFormerAggregationStage() {
-
-		mongoTemplate.dropCollection(CarPerson.class);
-
-		CarPerson person1 = new CarPerson("first1", "last1", new CarDescriptor.Entry("MAKE1", "MODEL1", 2000),
-				new CarDescriptor.Entry("MAKE1", "MODEL2", 2001), new CarDescriptor.Entry("MAKE2", "MODEL3", 2010),
-				new CarDescriptor.Entry("MAKE3", "MODEL4", 2014));
-
-		CarPerson person2 = new CarPerson("first2", "last2", new CarDescriptor.Entry("MAKE3", "MODEL4", 2014));
-
-		CarPerson person3 = new CarPerson("first3", "last3", new CarDescriptor.Entry("MAKE2", "MODEL5", 2011));
-
-		mongoTemplate.save(person1);
-		mongoTemplate.save(person2);
-		mongoTemplate.save(person3);
-
-		TypedAggregation<CarPerson> agg = Aggregation.newAggregation(CarPerson.class,
-				unwind("descriptors.carDescriptor.entries"), //
-				project() //
-						.and("descriptors.carDescriptor.entries.make").as("make") //
-						.and("descriptors.carDescriptor.entries.model").as("model") //
-						.and("firstName").as("firstName") //
-						.and("lastName").as("lastName"), //
-				group("make"));
-
-		AggregationResults<DBObject> result = mongoTemplate.aggregate(agg, DBObject.class);
-
-		assertThat(result.getMappedResults(), hasSize(3));
-	}
-
 	private void assertLikeStats(LikeStats like, String id, long count) {
 
 		assertThat(like, is(notNullValue()));
@@ -973,52 +938,4 @@ public class AggregationTests {
 			this.createDate = createDate;
 		}
 	}
-
-	@org.springframework.data.mongodb.core.mapping.Document
-	static class CarPerson {
-
-		@Id private String id;
-		private String firstName;
-		private String lastName;
-		private Descriptors descriptors;
-
-		public CarPerson(String firstname, String lastname, Entry... entries) {
-			this.firstName = firstname;
-			this.lastName = lastname;
-
-			this.descriptors = new Descriptors();
-
-			this.descriptors.carDescriptor = new CarDescriptor(entries);
-		}
-	}
-
-	static class Descriptors {
-		private CarDescriptor carDescriptor;
-	}
-
-	static class CarDescriptor {
-
-		private List<Entry> entries = new ArrayList<AggregationTests.CarDescriptor.Entry>();
-
-		public CarDescriptor(Entry... entries) {
-
-			for (Entry entry : entries) {
-				this.entries.add(entry);
-			}
-		}
-
-		static class Entry {
-			private String make;
-			private String model;
-			private int year;
-
-			public Entry() {}
-
-			public Entry(String make, String model, int year) {
-				this.make = make;
-				this.model = model;
-				this.year = year;
-			}
-		}
-	}
 }