DATAMONGO-955 - After release cleanups.

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

Original pull request: #188.

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

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
-
+	
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-mongodb-parent</artifactId>
-	<version>1.6.0.M1</version>
+	<version>1.4.4.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data MongoDB</name>
@@ -15,10 +15,10 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>1.5.0.M1</version>
+		<version>1.3.4.BUILD-SNAPSHOT</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.9.0.M1</springdata.commons>
-		<mongo>2.12.1</mongo>
-		<mongo.osgi>2.12.1</mongo.osgi>
+		<springdata.commons>1.7.4.BUILD-SNAPSHOT</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,18 @@
 			<version>${mongo}</version>
 		</dependency>
 	</dependencies>
-
+	
 	<repositories>
 		<repository>
-			<id>spring-libs-milestone</id>
-			<url>http://repo.spring.io/libs-milestone</url>
+			<id>spring-libs-snapshopt</id>
+			<url>http://repo.spring.io/libs-snapshot</url>
 		</repository>
-	</repositories>
-
+	<repository>
+      <id>spring-libs-snapshot</id>
+      <url>http://repo.spring.io/libs-snapshot</url>
+    </repository>
+  </repositories>
+	
 	<pluginRepositories>
 		<pluginRepository>
 			<id>spring-plugins-release</id>

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

spring-data-mongodb-log4j/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.6.0.M1</version>
+		<version>1.4.4.BUILD-SNAPSHOT</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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,9 +28,6 @@ import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.data.annotation.Persistent;
 import org.springframework.data.authentication.UserCredentials;
 import org.springframework.data.mapping.context.MappingContextIsNewStrategyFactory;
-import org.springframework.data.mapping.model.CamelCaseAbbreviatingFieldNamingStrategy;
-import org.springframework.data.mapping.model.FieldNamingStrategy;
-import org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
@@ -38,6 +35,7 @@ import org.springframework.data.mongodb.core.convert.CustomConversions;
 import org.springframework.data.mongodb.core.convert.DbRefResolver;
 import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.mapping.CamelCaseAbbreviatingFieldNamingStrategy;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.support.CachingIsNewStrategyFactory;
@@ -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;
@@ -52,10 +51,10 @@ import org.springframework.core.type.filter.TypeFilter;
 import org.springframework.data.annotation.Persistent;
 import org.springframework.data.config.BeanComponentDefinitionBuilder;
 import org.springframework.data.mapping.context.MappingContextIsNewStrategyFactory;
-import org.springframework.data.mapping.model.CamelCaseAbbreviatingFieldNamingStrategy;
 import org.springframework.data.mongodb.core.convert.CustomConversions;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.index.MongoPersistentEntityIndexCreator;
+import org.springframework.data.mongodb.core.mapping.CamelCaseAbbreviatingFieldNamingStrategy;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.event.ValidatingMongoEventListener;
@@ -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

@@ -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.
@@ -36,7 +36,6 @@ import com.mongodb.MongoException;
  * @author Mark Pollack
  * @author Oliver Gierke
  * @author Komi Innocent
- * @author Christoph Strobl
  */
 public class DefaultIndexOperations implements IndexOperations {
 
@@ -143,13 +142,6 @@ public class DefaultIndexOperations implements IndexOperations {
 
 						if ("2d".equals(value)) {
 							indexFields.add(IndexField.geo(key));
-						} else if ("text".equals(value)) {
-
-							DBObject weights = (DBObject) ix.get("weights");
-							for (String fieldName : weights.keySet()) {
-								indexFields.add(IndexField.text(fieldName, Float.valueOf(weights.get(fieldName).toString())));
-							}
-
 						} else {
 
 							Double keyValue = new Double(value.toString());
@@ -167,8 +159,8 @@ public class DefaultIndexOperations implements IndexOperations {
 					boolean unique = ix.containsField("unique") ? (Boolean) ix.get("unique") : false;
 					boolean dropDuplicates = ix.containsField("dropDups") ? (Boolean) ix.get("dropDups") : false;
 					boolean sparse = ix.containsField("sparse") ? (Boolean) ix.get("sparse") : false;
-					String language = ix.containsField("default_language") ? (String) ix.get("default_language") : "";
-					indexInfoList.add(new IndexInfo(indexFields, name, unique, dropDuplicates, sparse, language));
+
+					indexInfoList.add(new IndexInfo(indexFields, name, unique, dropDuplicates, sparse));
 				}
 
 				return indexInfoList;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/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) {
 
@@ -1418,32 +1329,17 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		CommandResult commandResult = executeCommand(command);
 		handleCommandError(commandResult, command);
 
-		return new AggregationResults<O>(returnPotentiallyMappedResults(outputType, commandResult), commandResult);
-	}
-
-	/**
-	 * Returns the potentially mapped results of the given {@commandResult} contained some.
-	 * 
-	 * @param outputType
-	 * @param commandResult
-	 * @return
-	 */
-	private <O> List<O> returnPotentiallyMappedResults(Class<O> outputType, CommandResult commandResult) {
-
+		// map results
 		@SuppressWarnings("unchecked")
 		Iterable<DBObject> resultSet = (Iterable<DBObject>) commandResult.get("result");
-		if (resultSet == null) {
-			return Collections.emptyList();
-		}
-
+		List<O> mappedResults = new ArrayList<O>();
 		DbObjectCallback<O> callback = new UnwrapAndReadDbObjectCallback<O>(mongoConverter, outputType);
 
-		List<O> mappedResults = new ArrayList<O>();
 		for (DBObject dbObject : resultSet) {
 			mappedResults.add(callback.doWith(dbObject));
 		}
 
-		return mappedResults;
+		return new AggregationResults<O>(mappedResults, commandResult);
 	}
 
 	protected String replaceWithResourceIfNecessary(String function) {
@@ -1717,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;

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

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

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

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

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

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

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

@@ -30,7 +30,6 @@ import org.springframework.util.StringUtils;
  * Value object to capture a list of {@link Field} instances.
  * 
  * @author Oliver Gierke
- * @author Thomas Darimont
  * @since 1.3
  */
 public final class Fields implements Iterable<Field> {
@@ -187,7 +186,7 @@ public final class Fields implements Iterable<Field> {
 		private final String target;
 
 		/**
-		 * Creates an aggregation field with the given name. As no target is set explicitly, the name will be used as target
+		 * Creates an aggregation fieldwith the given name. As no target is set explicitly, the name will be used as target
 		 * as well.
 		 * 
 		 * @param key
@@ -218,10 +217,6 @@ public final class Fields implements Iterable<Field> {
 				return source;
 			}
 
-			if (Aggregation.SystemVariable.isReferingToSystemVariable(source)) {
-				return source;
-			}
-
 			int dollarIndex = source.lastIndexOf('$');
 			return dollarIndex == -1 ? source : source.substring(dollarIndex + 1);
 		}

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

@@ -364,16 +364,7 @@ public class GroupOperation implements FieldsExposingAggregationOperation {
 		}
 
 		public Object getValue(AggregationOperationContext context) {
-
-			if (reference == null) {
-				return value;
-			}
-
-			if (Aggregation.SystemVariable.isReferingToSystemVariable(reference)) {
-				return reference;
-			}
-
-			return context.getReference(reference).toString();
+			return reference == null ? value : context.getReference(reference).toString();
 		}
 
 		@Override

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

@@ -24,6 +24,7 @@ import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedFi
 import org.springframework.data.mongodb.core.aggregation.ProjectionOperation.ProjectionOperationBuilder.FieldProjection;
 import org.springframework.util.Assert;
 
+import com.mongodb.BasicDBList;
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
 
@@ -234,53 +235,26 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 	}
 
 	/**
-	 * An {@link ProjectionOperationBuilder} that is used for SpEL expression based projections.
-	 * 
 	 * @author Thomas Darimont
 	 */
-	public static class ExpressionProjectionOperationBuilder extends ProjectionOperationBuilder {
+	public static class ExpressionProjectionOperationBuilder extends AbstractProjectionOperationBuilder {
 
 		private final Object[] params;
-		private final String expression;
 
 		/**
 		 * Creates a new {@link ExpressionProjectionOperationBuilder} for the given value, {@link ProjectionOperation} and
 		 * parameters.
 		 * 
-		 * @param expression must not be {@literal null}.
+		 * @param value must not be {@literal null}.
 		 * @param operation must not be {@literal null}.
 		 * @param parameters
 		 */
-		public ExpressionProjectionOperationBuilder(String expression, ProjectionOperation operation, Object[] parameters) {
+		public ExpressionProjectionOperationBuilder(Object value, ProjectionOperation operation, Object[] parameters) {
 
-			super(expression, operation, null);
-			this.expression = expression;
+			super(value, operation);
 			this.params = parameters.clone();
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.ProjectionOperationBuilder#project(java.lang.String, java.lang.Object[])
-		 */
-		@Override
-		public ProjectionOperationBuilder project(String operation, final Object... values) {
-
-			OperationProjection operationProjection = new OperationProjection(Fields.field(value.toString()), operation,
-					values) {
-				@Override
-				protected List<Object> getOperationArguments(AggregationOperationContext context) {
-
-					List<Object> result = new ArrayList<Object>(values.length + 1);
-					result.add(ExpressionProjection.toMongoExpression(context,
-							ExpressionProjectionOperationBuilder.this.expression, ExpressionProjectionOperationBuilder.this.params));
-					result.addAll(Arrays.asList(values));
-
-					return result;
-				}
-			};
-
-			return new ProjectionOperationBuilder(value, this.operation.and(operationProjection), operationProjection);
-		}
-
 		/*
 		 * (non-Javadoc)
 		 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.AbstractProjectionOperationBuilder#as(java.lang.String)
@@ -329,11 +303,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 			 */
 			@Override
 			public DBObject toDBObject(AggregationOperationContext context) {
-				return new BasicDBObject(getExposedField().getName(), toMongoExpression(context, expression, params));
-			}
-
-			protected static Object toMongoExpression(AggregationOperationContext context, String expression, Object[] params) {
-				return TRANSFORMER.transform(expression, context, params);
+				return new BasicDBObject(getExposedField().getName(), TRANSFORMER.transform(expression, context, params));
 			}
 		}
 	}
@@ -350,6 +320,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		private static final String FIELD_REFERENCE_NOT_NULL = "Field reference must not be null!";
 
 		private final String name;
+		private final ProjectionOperation operation;
 		private final OperationProjection previousProjection;
 
 		/**
@@ -364,23 +335,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 			super(name, operation);
 
 			this.name = name;
-			this.previousProjection = previousProjection;
-		}
-
-		/**
-		 * Creates a new {@link ProjectionOperationBuilder} for the field with the given value on top of the given
-		 * {@link ProjectionOperation}.
-		 * 
-		 * @param value
-		 * @param operation
-		 * @param previousProjection
-		 */
-		protected ProjectionOperationBuilder(Object value, ProjectionOperation operation,
-				OperationProjection previousProjection) {
-
-			super(value, operation);
-
-			this.name = null;
+			this.operation = operation;
 			this.previousProjection = previousProjection;
 		}
 
@@ -566,9 +521,8 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		 * @return
 		 */
 		public ProjectionOperationBuilder project(String operation, Object... values) {
-			OperationProjection operationProjection = new OperationProjection(Fields.field(value.toString()), operation,
-					values);
-			return new ProjectionOperationBuilder(value, this.operation.and(operationProjection), operationProjection);
+			OperationProjection projectionOperation = new OperationProjection(Fields.field(name), operation, values);
+			return new ProjectionOperationBuilder(name, this.operation.and(projectionOperation), projectionOperation);
 		}
 
 		/**
@@ -673,10 +627,6 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 				// implicit reference or explicit include?
 				if (value == null || Boolean.TRUE.equals(value)) {
 
-					if (Aggregation.SystemVariable.isReferingToSystemVariable(field.getTarget())) {
-						return field.getTarget();
-					}
-
 					// check whether referenced field exists in the context
 					return context.getReference(field).getReferenceValue();
 
@@ -699,7 +649,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 			/**
 			 * Creates a new {@link OperationProjection} for the given field.
 			 * 
-			 * @param field the name of the field to add the operation projection for, must not be {@literal null} or empty.
+			 * @param name the name of the field to add the operation projection for, must not be {@literal null} or empty.
 			 * @param operation the actual operation key, must not be {@literal null} or empty.
 			 * @param values the values to pass into the operation, must not be {@literal null}.
 			 */
@@ -722,15 +672,18 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 			@Override
 			public DBObject toDBObject(AggregationOperationContext context) {
 
-				DBObject inner = new BasicDBObject("$" + operation, getOperationArguments(context));
+				BasicDBList values = new BasicDBList();
+				values.addAll(buildReferences(context));
 
-				return new BasicDBObject(getField().getName(), inner);
+				DBObject inner = new BasicDBObject("$" + operation, values);
+
+				return new BasicDBObject(this.field.getName(), inner);
 			}
 
-			protected List<Object> getOperationArguments(AggregationOperationContext context) {
+			private List<Object> buildReferences(AggregationOperationContext context) {
 
 				List<Object> result = new ArrayList<Object>(values.size());
-				result.add(context.getReference(getField().getName()).toString());
+				result.add(context.getReference(field.getTarget()).toString());
 
 				for (Object element : values) {
 					result.add(element instanceof Field ? context.getReference((Field) element).toString() : element);
@@ -739,15 +692,6 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 				return result;
 			}
 
-			/**
-			 * Returns the field that holds the {@link OperationProjection}.
-			 * 
-			 * @return
-			 */
-			protected Field getField() {
-				return field;
-			}
-
 			/**
 			 * Creates a new instance of this {@link OperationProjection} with the given alias.
 			 * 
@@ -755,27 +699,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 			 * @return
 			 */
 			public OperationProjection withAlias(String alias) {
-
-				final Field aliasedField = Fields.field(alias, this.field.getName());
-				return new OperationProjection(aliasedField, operation, values.toArray()) {
-
-					/* (non-Javadoc)
-					 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.ProjectionOperationBuilder.OperationProjection#getField()
-					 */
-					@Override
-					protected Field getField() {
-						return aliasedField;
-					}
-
-					@Override
-					protected List<Object> getOperationArguments(AggregationOperationContext context) {
-
-						// We have to make sure that we use the arguments from the "previous" OperationProjection that we replace
-						// with this new instance.
-
-						return OperationProjection.this.getOperationArguments(context);
-					}
-				};
+				return new OperationProjection(Fields.field(alias, this.field.getName()), operation, values.toArray());
 			}
 		}
 
@@ -807,96 +731,6 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 				return new BasicDBObject(name, nestedObject);
 			}
 		}
-
-		/**
-		 * Extracts the minute from a date expression.
-		 * 
-		 * @return
-		 */
-		public ProjectionOperationBuilder extractMinute() {
-			return project("minute");
-		}
-
-		/**
-		 * Extracts the hour from a date expression.
-		 * 
-		 * @return
-		 */
-		public ProjectionOperationBuilder extractHour() {
-			return project("hour");
-		}
-
-		/**
-		 * Extracts the second from a date expression.
-		 * 
-		 * @return
-		 */
-		public ProjectionOperationBuilder extractSecond() {
-			return project("second");
-		}
-
-		/**
-		 * Extracts the millisecond from a date expression.
-		 * 
-		 * @return
-		 */
-		public ProjectionOperationBuilder extractMillisecond() {
-			return project("millisecond");
-		}
-
-		/**
-		 * Extracts the year from a date expression.
-		 * 
-		 * @return
-		 */
-		public ProjectionOperationBuilder extractYear() {
-			return project("year");
-		}
-
-		/**
-		 * Extracts the month from a date expression.
-		 * 
-		 * @return
-		 */
-		public ProjectionOperationBuilder extractMonth() {
-			return project("month");
-		}
-
-		/**
-		 * Extracts the week from a date expression.
-		 * 
-		 * @return
-		 */
-		public ProjectionOperationBuilder extractWeek() {
-			return project("week");
-		}
-
-		/**
-		 * Extracts the dayOfYear from a date expression.
-		 * 
-		 * @return
-		 */
-		public ProjectionOperationBuilder extractDayOfYear() {
-			return project("dayOfYear");
-		}
-
-		/**
-		 * Extracts the dayOfMonth from a date expression.
-		 * 
-		 * @return
-		 */
-		public ProjectionOperationBuilder extractDayOfMonth() {
-			return project("dayOfMonth");
-		}
-
-		/**
-		 * Extracts the dayOfWeek from a date expression.
-		 * 
-		 * @return
-		 */
-		public ProjectionOperationBuilder extractDayOfWeek() {
-			return project("dayOfWeek");
-		}
 	}
 
 	/**
@@ -937,4 +771,5 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		 */
 		public abstract DBObject toDBObject(AggregationOperationContext context);
 	}
+
 }

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

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

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

@@ -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

@@ -25,7 +25,10 @@ import java.lang.reflect.Method;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
+import org.objenesis.Objenesis;
+import org.objenesis.ObjenesisStd;
 import org.springframework.aop.framework.ProxyFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.cglib.proxy.Callback;
 import org.springframework.cglib.proxy.Enhancer;
 import org.springframework.cglib.proxy.Factory;
@@ -36,8 +39,8 @@ import org.springframework.data.mongodb.LazyLoadingException;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.objenesis.ObjenesisStd;
 import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 
@@ -54,9 +57,10 @@ import com.mongodb.DBRef;
  */
 public class DefaultDbRefResolver implements DbRefResolver {
 
+	private static final boolean OBJENESIS_PRESENT = ClassUtils.isPresent("org.objenesis.Objenesis", null);
+
 	private final MongoDbFactory mongoDbFactory;
 	private final PersistenceExceptionTranslator exceptionTranslator;
-	private final ObjenesisStd objenesis;
 
 	/**
 	 * Creates a new {@link DefaultDbRefResolver} with the given {@link MongoDbFactory}.
@@ -69,7 +73,6 @@ public class DefaultDbRefResolver implements DbRefResolver {
 
 		this.mongoDbFactory = mongoDbFactory;
 		this.exceptionTranslator = mongoDbFactory.getExceptionTranslator();
-		this.objenesis = new ObjenesisStd(true);
 	}
 
 	/*
@@ -114,44 +117,32 @@ public class DefaultDbRefResolver implements DbRefResolver {
 	 */
 	private Object createLazyLoadingProxy(MongoPersistentProperty property, DBRef dbref, DbRefResolverCallback callback) {
 
-		Class<?> propertyType = property.getType();
-		LazyLoadingInterceptor interceptor = new LazyLoadingInterceptor(property, dbref, exceptionTranslator, callback);
-
-		if (!propertyType.isInterface()) {
-
-			Factory factory = (Factory) objenesis.newInstance(getEnhancedTypeFor(propertyType));
-			factory.setCallbacks(new Callback[] { interceptor });
-
-			return factory;
-		}
-
 		ProxyFactory proxyFactory = new ProxyFactory();
+		Class<?> propertyType = property.getType();
 
 		for (Class<?> type : propertyType.getInterfaces()) {
 			proxyFactory.addInterface(type);
 		}
 
+		LazyLoadingInterceptor interceptor = new LazyLoadingInterceptor(property, dbref, exceptionTranslator, callback);
+
 		proxyFactory.addInterface(LazyLoadingProxy.class);
-		proxyFactory.addInterface(propertyType);
-		proxyFactory.addAdvice(interceptor);
 
-		return proxyFactory.getProxy();
-	}
+		if (propertyType.isInterface()) {
+			proxyFactory.addInterface(propertyType);
+			proxyFactory.addAdvice(interceptor);
+			return proxyFactory.getProxy();
+		}
 
-	/**
-	 * Returns the CGLib enhanced type for the given source type.
-	 * 
-	 * @param type
-	 * @return
-	 */
-	private Class<?> getEnhancedTypeFor(Class<?> type) {
+		proxyFactory.setProxyTargetClass(true);
+		proxyFactory.setTargetClass(propertyType);
 
-		Enhancer enhancer = new Enhancer();
-		enhancer.setSuperclass(type);
-		enhancer.setCallbackType(org.springframework.cglib.proxy.MethodInterceptor.class);
-		enhancer.setInterfaces(new Class[] { LazyLoadingProxy.class });
+		if (!OBJENESIS_PRESENT) {
+			proxyFactory.addAdvice(interceptor);
+			return proxyFactory.getProxy();
+		}
 
-		return enhancer.createClass();
+		return ObjenesisProxyEnhancer.enhanceAndGet(proxyFactory, propertyType, interceptor);
 	}
 
 	/**
@@ -380,4 +371,109 @@ public class DefaultDbRefResolver implements DbRefResolver {
 			return result;
 		}
 	}
+
+	/**
+	 * Static class to accommodate 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();
+			}
+		}
+
+		public static Object enhanceAndGet(ProxyFactory proxyFactory, Class<?> type,
+				org.springframework.cglib.proxy.MethodInterceptor interceptor) {
+
+			Enhancer enhancer = new Enhancer();
+			enhancer.setSuperclass(type);
+			enhancer.setCallbackType(org.springframework.cglib.proxy.MethodInterceptor.class);
+			enhancer.setInterfaces(new Class[] { LazyLoadingProxy.class });
+
+			Factory factory = (Factory) INSTANCE_CREATOR.newInstance(enhancer.createClass());
+			factory.setCallbacks(new Callback[] { interceptor });
+			return factory;
+		}
+
+		/**
+		 * Strategy for constructing new instances of a given {@link Class}.
+		 * 
+		 * @author Thomas Darimont
+		 */
+		interface InstanceCreatorStrategy {
+			Object newInstance(Class<?> clazz);
+		}
+
+		/**
+		 * An {@link InstanceCreatorStrategy} that uses Objenesis from the classpath.
+		 * 
+		 * @author Thomas Darimont
+		 */
+		private static class DefaultObjenesisInstanceCreatorStrategy implements InstanceCreatorStrategy {
+
+			private static final Objenesis OBJENESIS = new ObjenesisStd(true);
+
+			/*
+			 * (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.convert.DefaultDbRefResolver.ObjenesisProxyEnhancer.InstanceCreatorStrategy#newInstance(java.lang.Class)
+			 */
+			@Override
+			public Object newInstance(Class<?> clazz) {
+				return OBJENESIS.newInstance(clazz);
+			}
+		}
+
+		/**
+		 * An {@link InstanceCreatorStrategy} that uses a repackaged version of Objenesis from Spring 4.
+		 * 
+		 * @author Thomas Darimont
+		 */
+		private static class Spring4ObjenesisInstanceCreatorStrategy implements InstanceCreatorStrategy {
+
+			private static final String SPRING4_OBJENESIS_CLASS_NAME = "org.springframework.objenesis.ObjenesisStd";
+			private static final Object OBJENESIS;
+			private static final Method NEW_INSTANCE_METHOD;
+
+			static {
+
+				try {
+					Class<?> objenesisClass = ClassUtils.forName(SPRING4_OBJENESIS_CLASS_NAME,
+							ObjenesisProxyEnhancer.class.getClassLoader());
+
+					OBJENESIS = BeanUtils.instantiateClass(objenesisClass.getConstructor(boolean.class), true);
+					NEW_INSTANCE_METHOD = objenesisClass.getMethod("newInstance", Class.class);
+
+				} catch (Exception e) {
+					throw new RuntimeException("Could not setup Objenesis infrastructure with Spring 4 ", e);
+				}
+			}
+
+			/*
+			 * (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.convert.DefaultDbRefResolver.ObjenesisProxyEnhancer.InstanceCreatorStrategy#newInstance(java.lang.Class)
+			 */
+			@Override
+			public Object newInstance(Class<?> clazz) {
+
+				try {
+					return NEW_INSTANCE_METHOD.invoke(OBJENESIS, clazz);
+				} catch (Exception e) {
+					throw new RuntimeException("Could not created instance for " + clazz, e);
+				}
+			}
+		}
+	}
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/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;
@@ -82,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;
 
@@ -165,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)
@@ -242,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
@@ -254,7 +268,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 				}
 
 				Object obj = getValueInternal(prop, dbo, evaluator, result);
-				wrapper.setProperty(prop, obj);
+				wrapper.setProperty(prop, obj, useFieldAccessOnly);
 			}
 		});
 
@@ -370,13 +384,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) {}
 		}
@@ -385,11 +401,13 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		entity.doWithProperties(new PropertyHandler<MongoPersistentProperty>() {
 			public void doWithPersistentProperty(MongoPersistentProperty prop) {
 
-				if (prop.equals(idProperty) || !prop.isWritable()) {
+				if (prop.equals(idProperty)) {
 					return;
 				}
 
-				Object propertyObj = wrapper.getProperty(prop);
+				boolean fieldAccessOnly = prop.usePropertyAccess() ? false : useFieldAccessOnly;
+
+				Object propertyObj = wrapper.getProperty(prop, prop.getType(), fieldAccessOnly);
 
 				if (null != propertyObj) {
 
@@ -406,7 +424,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);
 				}
@@ -779,8 +797,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) {
@@ -805,6 +823,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	 * @param sourceValue must not be {@literal null}.
 	 * @return the converted {@link Collection} or array, will never be {@literal null}.
 	 */
+	@SuppressWarnings({ "unchecked", "null" })
 	private Object readCollectionOrArray(TypeInformation<?> targetType, BasicDBList sourceValue, Object parent) {
 
 		Assert.notNull(targetType);
@@ -815,12 +834,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++) {
 
@@ -846,7 +874,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);
@@ -859,10 +887,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;
 			}

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/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()}
@@ -79,15 +78,6 @@ public @interface CompoundIndex {
 	 */
 	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.
@@ -107,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,7 +25,6 @@ import java.lang.annotation.Target;
  * 
  * @author Jon Brisbin
  * @author Laurent Canet
- * @author Thomas Darimont
  */
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
@@ -38,15 +37,6 @@ public @interface GeoSpatialIndexed {
 	 */
 	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/IndexField.java

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,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)
@@ -64,15 +63,6 @@ public @interface Indexed {
 	 */
 	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,670 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.index;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.mapping.PropertyHandler;
-import org.springframework.data.mongodb.core.index.Index.Duplicates;
-import org.springframework.data.mongodb.core.index.MongoPersistentEntityIndexResolver.TextIndexIncludeOptions.IncludeStrategy;
-import org.springframework.data.mongodb.core.index.TextIndexDefinition.TextIndexDefinitionBuilder;
-import org.springframework.data.mongodb.core.index.TextIndexDefinition.TextIndexedFieldSpec;
-import org.springframework.data.mongodb.core.mapping.Document;
-import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.BasicDBObjectBuilder;
-import com.mongodb.DBObject;
-import com.mongodb.util.JSON;
-
-/**
- * {@link IndexResolver} implementation inspecting {@link MongoPersistentEntity} for {@link MongoPersistentEntity} to be
- * indexed. <br />
- * All {@link MongoPersistentProperty} of the {@link MongoPersistentEntity} are inspected for potential indexes by
- * scanning related annotations.
- * 
- * @author Christoph Strobl
- * @since 1.5
- */
-public class MongoPersistentEntityIndexResolver implements IndexResolver {
-
-	private static final Logger LOGGER = LoggerFactory.getLogger(MongoPersistentEntityIndexResolver.class);
-
-	private final MongoMappingContext mappingContext;
-
-	/**
-	 * Create new {@link MongoPersistentEntityIndexResolver}.
-	 * 
-	 * @param mappingContext must not be {@literal null}.
-	 */
-	public MongoPersistentEntityIndexResolver(MongoMappingContext mappingContext) {
-
-		Assert.notNull(mappingContext, "Mapping context must not be null in order to resolve index definitions");
-		this.mappingContext = mappingContext;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.index.IndexResolver#resolveIndexForClass(java.lang.Class)
-	 */
-	@Override
-	public List<IndexDefinitionHolder> resolveIndexForClass(Class<?> type) {
-		return resolveIndexForEntity(mappingContext.getPersistentEntity(type));
-	}
-
-	/**
-	 * Resolve the {@link IndexDefinition}s for given {@literal root} entity by traversing {@link MongoPersistentProperty}
-	 * scanning for index annotations {@link Indexed}, {@link CompoundIndex} and {@link GeospatialIndex}. The given
-	 * {@literal root} has therefore to be annotated with {@link Document}.
-	 * 
-	 * @param root must not be null.
-	 * @return List of {@link IndexDefinitionHolder}. Will never be {@code null}.
-	 * @throws IllegalArgumentException in case of missing {@link Document} annotation marking root entities.
-	 */
-	public List<IndexDefinitionHolder> resolveIndexForEntity(final MongoPersistentEntity<?> root) {
-
-		Assert.notNull(root, "Index cannot be resolved for given 'null' entity.");
-		Document document = root.findAnnotation(Document.class);
-		Assert.notNull(document, "Given entity is not collection root.");
-
-		final List<IndexDefinitionHolder> indexInformation = new ArrayList<MongoPersistentEntityIndexResolver.IndexDefinitionHolder>();
-		indexInformation.addAll(potentiallyCreateCompoundIndexDefinitions("", root.getCollection(), root.getType()));
-		indexInformation.addAll(potentiallyCreateTextIndexDefinition(root));
-
-		final CycleGuard guard = new CycleGuard();
-
-		root.doWithProperties(new PropertyHandler<MongoPersistentProperty>() {
-
-			@Override
-			public void doWithPersistentProperty(MongoPersistentProperty persistentProperty) {
-
-				try {
-					if (persistentProperty.isEntity()) {
-						indexInformation.addAll(resolveIndexForClass(persistentProperty.getActualType(),
-								persistentProperty.getFieldName(), root.getCollection(), guard));
-					}
-
-					IndexDefinitionHolder indexDefinitionHolder = createIndexDefinitionHolderForProperty(
-							persistentProperty.getFieldName(), root.getCollection(), persistentProperty);
-					if (indexDefinitionHolder != null) {
-						indexInformation.add(indexDefinitionHolder);
-					}
-				} catch (CyclicPropertyReferenceException e) {
-					LOGGER.warn(e.getMessage());
-				}
-			}
-		});
-
-		return indexInformation;
-	}
-
-	/**
-	 * Recursively resolve and inspect properties of given {@literal type} for indexes to be created.
-	 * 
-	 * @param type
-	 * @param path The {@literal "dot} path.
-	 * @param collection
-	 * @return List of {@link IndexDefinitionHolder} representing indexes for given type and its referenced property
-	 *         types. Will never be {@code null}.
-	 */
-	private List<IndexDefinitionHolder> resolveIndexForClass(final Class<?> type, final String path,
-			final String collection, final CycleGuard guard) {
-
-		final List<IndexDefinitionHolder> indexInformation = new ArrayList<MongoPersistentEntityIndexResolver.IndexDefinitionHolder>();
-		indexInformation.addAll(potentiallyCreateCompoundIndexDefinitions(path, collection, type));
-
-		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(type);
-		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,
-			Class<?> type) {
-
-		if (AnnotationUtils.findAnnotation(type, CompoundIndexes.class) == null
-				&& AnnotationUtils.findAnnotation(type, CompoundIndex.class) == null) {
-			return Collections.emptyList();
-		}
-
-		return createCompoundIndexDefinitions(dotPath, collection, type);
-	}
-
-	private Collection<? extends IndexDefinitionHolder> potentiallyCreateTextIndexDefinition(MongoPersistentEntity<?> root) {
-
-		TextIndexDefinitionBuilder indexDefinitionBuilder = new TextIndexDefinitionBuilder().named(root.getType()
-				.getSimpleName() + "_TextIndex");
-
-		if (StringUtils.hasText(root.getLanguage())) {
-			indexDefinitionBuilder.withDefaultLanguage(root.getLanguage());
-		}
-
-		try {
-			appendTextIndexInformation("", indexDefinitionBuilder, root,
-					new TextIndexIncludeOptions(IncludeStrategy.DEFAULT), new CycleGuard());
-		} catch (CyclicPropertyReferenceException e) {
-			LOGGER.warn(e.getMessage());
-		}
-
-		TextIndexDefinition indexDefinition = indexDefinitionBuilder.build();
-
-		if (!indexDefinition.hasFieldSpec()) {
-			return Collections.emptyList();
-		}
-
-		IndexDefinitionHolder holder = new IndexDefinitionHolder("", indexDefinition, root.getCollection());
-		return Collections.singletonList(holder);
-
-	}
-
-	private void appendTextIndexInformation(final String dotPath,
-			final TextIndexDefinitionBuilder indexDefinitionBuilder, MongoPersistentEntity<?> entity,
-			final TextIndexIncludeOptions includeOptions, final CycleGuard guard) {
-
-		entity.doWithProperties(new PropertyHandler<MongoPersistentProperty>() {
-
-			@Override
-			public void doWithPersistentProperty(MongoPersistentProperty persistentProperty) {
-
-				guard.protect(persistentProperty, dotPath);
-
-				if (persistentProperty.isLanguageProperty()) {
-					indexDefinitionBuilder.withLanguageOverride(persistentProperty.getFieldName());
-				}
-
-				TextIndexed indexed = persistentProperty.findAnnotation(TextIndexed.class);
-
-				if (includeOptions.isForce() || indexed != null || persistentProperty.isEntity()) {
-
-					String propertyDotPath = (StringUtils.hasText(dotPath) ? dotPath + "." : "")
-							+ persistentProperty.getFieldName();
-
-					Float weight = indexed != null ? indexed.weight()
-							: (includeOptions.getParentFieldSpec() != null ? includeOptions.getParentFieldSpec().getWeight() : 1.0F);
-
-					if (persistentProperty.isEntity()) {
-
-						TextIndexIncludeOptions optionsForNestedType = includeOptions;
-						if (!IncludeStrategy.FORCE.equals(includeOptions.getStrategy()) && indexed != null) {
-							optionsForNestedType = new TextIndexIncludeOptions(IncludeStrategy.FORCE, new TextIndexedFieldSpec(
-									propertyDotPath, weight));
-						}
-
-						try {
-							appendTextIndexInformation(propertyDotPath, indexDefinitionBuilder,
-									mappingContext.getPersistentEntity(persistentProperty.getActualType()), optionsForNestedType, guard);
-						} catch (CyclicPropertyReferenceException e) {
-							LOGGER.warn(e.getMessage(), e);
-						}
-					} else if (includeOptions.isForce() || indexed != null) {
-						indexDefinitionBuilder.onField(propertyDotPath, weight);
-					}
-				}
-
-			}
-		});
-
-	}
-
-	/**
-	 * Create {@link IndexDefinition} wrapped in {@link IndexDefinitionHolder} for {@link CompoundIndexes} of given type.
-	 * 
-	 * @param dotPath The properties {@literal "dot"} path representation from its document root.
-	 * @param fallbackCollection
-	 * @param type
-	 * @return
-	 */
-	protected List<IndexDefinitionHolder> createCompoundIndexDefinitions(String dotPath, String fallbackCollection,
-			Class<?> type) {
-
-		List<IndexDefinitionHolder> indexDefinitions = new ArrayList<MongoPersistentEntityIndexResolver.IndexDefinitionHolder>();
-		CompoundIndexes indexes = AnnotationUtils.findAnnotation(type, CompoundIndexes.class);
-
-		if (indexes != null) {
-			for (CompoundIndex index : indexes.value()) {
-				indexDefinitions.add(createCompoundIndexDefinition(dotPath, fallbackCollection, index));
-			}
-		}
-
-		CompoundIndex index = AnnotationUtils.findAnnotation(type, CompoundIndex.class);
-
-		if (index != null) {
-			indexDefinitions.add(createCompoundIndexDefinition(dotPath, fallbackCollection, index));
-		}
-
-		return indexDefinitions;
-	}
-
-	@SuppressWarnings("deprecation")
-	protected IndexDefinitionHolder createCompoundIndexDefinition(String dotPath, String fallbackCollection,
-			CompoundIndex index) {
-
-		CompoundIndexDefinition indexDefinition = new CompoundIndexDefinition(resolveCompoundIndexKeyFromStringDefinition(
-				dotPath, index.def()));
-
-		if (!index.useGeneratedName()) {
-			indexDefinition.named(index.name());
-		}
-
-		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(StringUtils.hasText(index.name()) ? index.name() : dotPath);
-		}
-
-		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(StringUtils.hasText(index.name()) ? index.name() : persistentProperty.getName());
-		}
-
-		indexDefinition.typed(index.type()).withBucketSize(index.bucketSize()).withAdditionalField(index.additionalField());
-
-		return new IndexDefinitionHolder(dotPath, indexDefinition, collection);
-	}
-
-	/**
-	 * {@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();
-		}
-	}
-
-	/**
-	 * @author Christoph Strobl
-	 * @since 1.6
-	 */
-	static class TextIndexIncludeOptions {
-
-		enum IncludeStrategy {
-			FORCE, DEFAULT;
-		}
-
-		private final IncludeStrategy strategy;
-
-		private final TextIndexedFieldSpec parentFieldSpec;
-
-		public TextIndexIncludeOptions(IncludeStrategy strategy, TextIndexedFieldSpec parentFieldSpec) {
-			this.strategy = strategy;
-			this.parentFieldSpec = parentFieldSpec;
-		}
-
-		public TextIndexIncludeOptions(IncludeStrategy strategy) {
-			this(strategy, null);
-		}
-
-		public IncludeStrategy getStrategy() {
-			return strategy;
-		}
-
-		public TextIndexedFieldSpec getParentFieldSpec() {
-			return parentFieldSpec;
-		}
-
-		public boolean isForce() {
-			return IncludeStrategy.FORCE.equals(strategy);
-		}
-
-	}
-}

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,6 @@ import org.springframework.expression.ParserContext;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -48,14 +47,12 @@ import org.springframework.util.StringUtils;
  * @author Jon Brisbin
  * @author Oliver Gierke
  * @author Thomas Darimont
- * @author Christoph Strobl
  */
 public class BasicMongoPersistentEntity<T> extends BasicPersistentEntity<T, MongoPersistentProperty> implements
 		MongoPersistentEntity<T>, ApplicationContextAware {
 
 	private static final String AMBIGUOUS_FIELD_MAPPING = "Ambiguous field mapping detected! Both %s and %s map to the same field name %s! Disambiguate using @DocumentField annotation!";
 	private final String collection;
-	private final String language;
 	private final SpelExpressionParser parser;
 	private final StandardEvaluationContext context;
 
@@ -78,10 +75,8 @@ public class BasicMongoPersistentEntity<T> extends BasicPersistentEntity<T, Mong
 		if (rawType.isAnnotationPresent(Document.class)) {
 			Document d = rawType.getAnnotation(Document.class);
 			this.collection = StringUtils.hasText(d.collection()) ? d.collection() : fallback;
-			this.language = StringUtils.hasText(d.language()) ? d.language() : "";
 		} else {
 			this.collection = fallback;
-			this.language = "";
 		}
 	}
 
@@ -105,15 +100,6 @@ public class BasicMongoPersistentEntity<T> extends BasicPersistentEntity<T, Mong
 		return expression.getValue(context, String.class);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentEntity#getLanguage()
-	 */
-	@Override
-	public String getLanguage() {
-		return this.language;
-	}
-
 	/* 
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mapping.model.BasicPersistentEntity#verify()
@@ -121,22 +107,12 @@ public class BasicMongoPersistentEntity<T> extends BasicPersistentEntity<T, Mong
 	@Override
 	public void verify() {
 
-		verifyFieldUniqueness();
-		verifyFieldTypes();
-	}
-
-	private void verifyFieldUniqueness() {
-
 		AssertFieldNameUniquenessHandler handler = new AssertFieldNameUniquenessHandler();
 
 		doWithProperties(handler);
 		doWithAssociations(handler);
 	}
 
-	private void verifyFieldTypes() {
-		doWithProperties(new PropertyTypeAssertionHandler());
-	}
-
 	/**
 	 * {@link Comparator} implementation inspecting the {@link MongoPersistentProperty}'s order.
 	 * 
@@ -250,46 +226,4 @@ public class BasicMongoPersistentEntity<T> extends BasicPersistentEntity<T, Mong
 			properties.put(fieldName, property);
 		}
 	}
-
-	/**
-	 * @author Christoph Strobl
-	 * @since 1.6
-	 */
-	private static class PropertyTypeAssertionHandler implements PropertyHandler<MongoPersistentProperty> {
-
-		@Override
-		public void doWithPersistentProperty(MongoPersistentProperty persistentProperty) {
-
-			potentiallyAssertTextScoreType(persistentProperty);
-			potentiallyAssertLanguageType(persistentProperty);
-		}
-
-		private void potentiallyAssertLanguageType(MongoPersistentProperty persistentProperty) {
-
-			if (persistentProperty.isLanguageProperty()) {
-				assertPropertyType(persistentProperty, String.class);
-			}
-		}
-
-		private void potentiallyAssertTextScoreType(MongoPersistentProperty persistentProperty) {
-
-			if (persistentProperty.isTextScoreProperty()) {
-				assertPropertyType(persistentProperty, Float.class, Double.class);
-			}
-		}
-
-		private void assertPropertyType(MongoPersistentProperty persistentProperty, Class<?>... validMatches) {
-
-			for (Class<?> potentialMatch : validMatches) {
-				if (ClassUtils.isAssignable(potentialMatch, persistentProperty.getActualType())) {
-					return;
-				}
-			}
-
-			throw new MappingException(String.format("Missmatching types for %s. Found %s expected one of %s.",
-					persistentProperty.getField(), persistentProperty.getActualType(),
-					StringUtils.arrayToCommaDelimitedString(validMatches)));
-		}
-	}
-
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,10 +27,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mapping.Association;
 import org.springframework.data.mapping.model.AnnotationBasedPersistentProperty;
-import org.springframework.data.mapping.model.FieldNamingStrategy;
 import org.springframework.data.mapping.model.MappingException;
-import org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
+import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 
 import com.mongodb.DBObject;
@@ -41,7 +40,6 @@ import com.mongodb.DBObject;
  * @author Oliver Gierke
  * @author Patryk Wasik
  * @author Thomas Darimont
- * @author Christoph Strobl
  */
 public class BasicMongoPersistentProperty extends AnnotationBasedPersistentProperty<MongoPersistentProperty> implements
 		MongoPersistentProperty {
@@ -49,18 +47,20 @@ public class BasicMongoPersistentProperty extends AnnotationBasedPersistentPrope
 	private static final Logger LOG = LoggerFactory.getLogger(BasicMongoPersistentProperty.class);
 
 	private static final String ID_FIELD_NAME = "_id";
-	private static final String LANGUAGE_FIELD_NAME = "language";
 	private static final Set<Class<?>> SUPPORTED_ID_TYPES = new HashSet<Class<?>>();
 	private static final Set<String> SUPPORTED_ID_PROPERTY_NAMES = new HashSet<String>();
 
-	static {
+	private static final Field CAUSE_FIELD;
 
+	static {
 		SUPPORTED_ID_TYPES.add(ObjectId.class);
 		SUPPORTED_ID_TYPES.add(String.class);
 		SUPPORTED_ID_TYPES.add(BigInteger.class);
 
 		SUPPORTED_ID_PROPERTY_NAMES.add("id");
 		SUPPORTED_ID_PROPERTY_NAMES.add("_id");
+
+		CAUSE_FIELD = ReflectionUtils.findField(Throwable.class, "cause");
 	}
 
 	private final FieldNamingStrategy fieldNamingStrategy;
@@ -86,6 +86,14 @@ public class BasicMongoPersistentProperty extends AnnotationBasedPersistentPrope
 		}
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mapping.FooBasicPersistentProperty#isAssociation()
+	 */
+	@Override
+	public boolean isAssociation() {
+		return field.isAnnotationPresent(DBRef.class) || super.isAssociation();
+	}
+
 	/**
 	 * Also considers fields as id that are of supported id type and name.
 	 * 
@@ -100,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());
 	}
 
 	/*
@@ -155,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;
 	}
 
@@ -173,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);
 	}
 
 	/*
@@ -181,24 +190,14 @@ public class BasicMongoPersistentProperty extends AnnotationBasedPersistentPrope
 	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#getDBRef()
 	 */
 	public DBRef getDBRef() {
-		return findAnnotation(DBRef.class);
+		return getField().getAnnotation(DBRef.class);
 	}
 
-	/*
+	/* 
 	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#isLanguageProperty()
+	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#usePropertyAccess()
 	 */
-	@Override
-	public boolean isLanguageProperty() {
-		return getFieldName().equals(LANGUAGE_FIELD_NAME) || isAnnotationPresent(Language.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#isTextScoreProperty()
-	 */
-	@Override
-	public boolean isTextScoreProperty() {
-		return isAnnotationPresent(TextScore.class);
+	public boolean usePropertyAccess() {
+		return CAUSE_FIELD.equals(getField());
 	}
 }

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

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

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

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

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

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

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

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.mapping;
+
+/**
+ * SPI interface to determine how to name document fields in cases the field name is not manually defined.
+ * 
+ * @see DocumentField
+ * @see PropertyNameFieldNamingStrategy
+ * @see CamelCaseAbbreviatingFieldNamingStrategy
+ * @since 1.3
+ * @author Oliver Gierke
+ */
+public interface FieldNamingStrategy {
+
+	/**
+	 * Returns the field name to be used for the given {@link MongoPersistentProperty}.
+	 * 
+	 * @param property must not be {@literal null} or empty;
+	 * @return
+	 */
+	String getFieldName(MongoPersistentProperty property);
+}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoMappingContext.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,8 +24,6 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.data.mapping.context.AbstractMappingContext;
 import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.mapping.model.FieldNamingStrategy;
-import org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
 import org.springframework.data.util.TypeInformation;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoPersistentEntity.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.
@@ -21,7 +21,6 @@ import org.springframework.data.mapping.PersistentEntity;
  * MongoDB specific {@link PersistentEntity} abstraction.
  * 
  * @author Oliver Gierke
- * @author Christoph Strobl
  */
 public interface MongoPersistentEntity<T> extends PersistentEntity<T, MongoPersistentProperty> {
 
@@ -31,13 +30,4 @@ public interface MongoPersistentEntity<T> extends PersistentEntity<T, MongoPersi
 	 * @return
 	 */
 	String getCollection();
-
-	/**
-	 * Returns the default language to be used for this entity.
-	 * 
-	 * @since 1.6
-	 * @return
-	 */
-	String getLanguage();
-
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoPersistentProperty.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.
@@ -26,7 +26,6 @@ import org.springframework.data.mapping.PersistentProperty;
  * @author Oliver Gierke
  * @author Patryk Wasik
  * @author Thomas Darimont
- * @author Christoph Strobl
  */
 public interface MongoPersistentProperty extends PersistentProperty<MongoPersistentProperty> {
 
@@ -60,24 +59,6 @@ public interface MongoPersistentProperty extends PersistentProperty<MongoPersist
 	 */
 	boolean isExplicitIdProperty();
 
-	/**
-	 * Returns whether the property indicates the documents language either by having a {@link #getFieldName()} equal to
-	 * {@literal language} or being annotated with {@link Language}.
-	 * 
-	 * @return
-	 * @since 1.6
-	 */
-	boolean isLanguageProperty();
-
-	/**
-	 * Returns whether the property holds the documents score calculated by text search. <br/>
-	 * It's marked with {@link TextScore}.
-	 * 
-	 * @return
-	 * @since 1.6
-	 */
-	boolean isTextScoreProperty();
-
 	/**
 	 * Returns the {@link DBRef} if the property is a reference.
 	 * 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 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,21 +15,21 @@
  */
 package org.springframework.data.mongodb.core.mapping;
 
-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;
-
 /**
- * Mark property as language field.
+ * {@link FieldNamingStrategy} simply using the {@link MongoPersistentProperty}'s name.
  * 
- * @author Christoph Strobl
- * @since 1.6
+ * @since 1.3
+ * @author Oliver Gierke
  */
-@Documented
-@Target({ ElementType.FIELD })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Language {
+public enum PropertyNameFieldNamingStrategy implements FieldNamingStrategy {
 
+	INSTANCE;
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.mapping.FieldNamingStrategy#getFieldName(org.springframework.data.mongodb.core.mapping.MongoPersistentProperty)
+	 */
+	public String getFieldName(MongoPersistentProperty property) {
+		return property.getName();
+	}
 }

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

@@ -1,40 +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.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.annotation.ReadOnlyProperty;
-
-/**
- * {@link TextScore} marks the property to be considered as the on server calculated {@literal textScore} when doing
- * full text search. <br />
- * <b>NOTE</b> Property will not be written when saving entity.
- * 
- * @author Christoph Strobl
- * @since 1.6
- */
-@ReadOnlyProperty
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-public @interface TextScore {
-
-}

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/BasicQuery.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.
@@ -24,12 +24,11 @@ import com.mongodb.util.JSON;
  * 
  * @author Thomas Risberg
  * @author Oliver Gierke
- * @author Christoph Strobl
  */
 public class BasicQuery extends Query {
 
 	private final DBObject queryObject;
-	private DBObject fieldsObject;
+	private final DBObject fieldsObject;
 	private DBObject sortObject;
 
 	public BasicQuery(String query) {
@@ -85,12 +84,4 @@ public class BasicQuery extends Query {
 	public void setSortObject(DBObject sortObject) {
 		this.sortObject = sortObject;
 	}
-
-	/**
-	 * @since 1.6
-	 * @param fieldsObject
-	 */
-	protected void setFieldsObject(DBObject fieldsObject) {
-		this.fieldsObject = fieldsObject;
-	}
 }

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
 	 * 
@@ -280,36 +266,7 @@ public class Update {
 		return this;
 	}
 
-	/**
-	 * Update given key to current date using {@literal $currentDate} modifier.
-	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/update/currentDate/
-	 * @param key
-	 * @return
-	 * @since 1.6
-	 */
-	public Update currentDate(String key) {
-
-		addMultiFieldOperation("$currentDate", key, true);
-		return this;
-	}
-
-	/**
-	 * Update given key to current date using {@literal $currentDate : &#123; $type : "timestamp" &#125;} modifier.
-	 * 
-	 * @see http://docs.mongodb.org/manual/reference/operator/update/currentDate/
-	 * @param key
-	 * @return
-	 * @since 1.6
-	 */
-	public Update currentTimestamp(String key) {
-
-		addMultiFieldOperation("$currentDate", key, new BasicDBObject("$type", "timestamp"));
-		return this;
-	}
-
 	public DBObject getUpdateObject() {
-
 		DBObject dbo = new BasicDBObject();
 		for (String k : modifierOps.keySet()) {
 			dbo.put(k, modifierOps.get(k));
@@ -366,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 getUpdateObject().toString();
-	}
-
 	/**
 	 * 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);
@@ -424,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);
-		}
 	}
 
 	/**
@@ -475,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 {
 
@@ -496,7 +387,6 @@ public class Update {
 			}
 
 			Object[] convertedValues = new Object[values.length];
-
 			for (int i = 0; i < values.length; i++) {
 				convertedValues[i] = values[i];
 			}
@@ -504,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 {
 
@@ -587,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/core/query/text/Term.java

@@ -1,102 +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.text;
-
-/**
- * A {@link Term} defines one or multiple words {@link Type#WORD} or phrases {@link Type#PHRASE} to be used in the
- * context of full text search.
- * 
- * @author Christoph Strobl
- * @since 1.6
- */
-public class Term {
-
-	enum Type {
-		WORD, PHRASE;
-	}
-
-	private final Type type;
-	private final String raw;
-	private boolean negated;
-
-	/**
-	 * Creates a new {@link Term} of {@link Type#WORD}.
-	 * 
-	 * @param raw
-	 */
-	public Term(String raw) {
-		this(raw, Type.WORD);
-	}
-
-	/**
-	 * Creates a new {@link Term} of given {@link Type}.
-	 * 
-	 * @param raw
-	 * @param type defaulted to {@link Type#WORD} if {@literal null}.
-	 */
-	public Term(String raw, Type type) {
-		this.raw = raw;
-		this.type = type == null ? Type.WORD : type;
-	}
-
-	/**
-	 * Negates the term.
-	 * 
-	 * @return
-	 */
-	public Term negate() {
-		this.negated = true;
-		return this;
-	}
-
-	/**
-	 * @return return true if term is negated.
-	 */
-	public boolean isNegated() {
-		return negated;
-	}
-
-	/**
-	 * @return type of term. Never {@literal null}.
-	 */
-	public Type getType() {
-		return type;
-	}
-
-	/**
-	 * Get formatted representation of term.
-	 * 
-	 * @return
-	 */
-	public String getFormatted() {
-
-		String formatted = Type.PHRASE.equals(type) ? quotePhrase(raw) : raw;
-		return negated ? negateRaw(formatted) : formatted;
-	}
-
-	@Override
-	public String toString() {
-		return getFormatted();
-	}
-
-	protected String quotePhrase(String raw) {
-		return "\"" + raw + "\"";
-	}
-
-	protected String negateRaw(String raw) {
-		return "-" + raw;
-	}
-}

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

@@ -1,223 +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.text;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.CriteriaDefinition;
-import org.springframework.util.Assert;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.BasicDBObjectBuilder;
-import com.mongodb.DBObject;
-
-/**
- * Implementation of {@link CriteriaDefinition} to be used for full text search .
- * 
- * @author Christoph Strobl
- * @since 1.6
- */
-public class TextCriteria extends Criteria {
-
-	private String language;
-	private List<Term> terms;
-
-	public TextCriteria() {
-		this.terms = new ArrayList<Term>();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.query.CriteriaDefinition#getCriteriaObject()
-	 */
-	@Override
-	public DBObject getCriteriaObject() {
-
-		BasicDBObjectBuilder builder = new BasicDBObjectBuilder();
-
-		if (StringUtils.hasText(language)) {
-			builder.add("$language", language);
-		}
-
-		if (!CollectionUtils.isEmpty(terms)) {
-			builder.add("$search", join(terms.iterator()));
-		}
-
-		return new BasicDBObject("$text", builder.get());
-	}
-
-	/**
-	 * @param words
-	 * @return
-	 */
-	public TextCriteria matchingAny(String... words) {
-
-		for (String word : words) {
-			matching(word);
-		}
-		return this;
-	}
-
-	/**
-	 * Add given {@link Term} to criteria.
-	 * 
-	 * @param term must not be null.
-	 */
-	public void matching(Term term) {
-
-		Assert.notNull(term, "Term to add must not be null.");
-		this.terms.add(term);
-	}
-
-	private void notMatching(Term term) {
-		matching(term.negate());
-	}
-
-	/**
-	 * @param term
-	 * @return
-	 */
-	public TextCriteria matching(String term) {
-
-		if (StringUtils.hasText(term)) {
-			matching(new Term(term));
-		}
-		return this;
-	}
-
-	/**
-	 * @param term
-	 * @return
-	 */
-	public TextCriteria notMatching(String term) {
-
-		if (StringUtils.hasText(term)) {
-			notMatching(new Term(term, Term.Type.WORD));
-		}
-		return this;
-	}
-
-	/**
-	 * @param words
-	 * @return
-	 */
-	public TextCriteria notMatchingAny(String... words) {
-
-		for (String word : words) {
-			notMatching(word);
-		}
-		return this;
-	}
-
-	/**
-	 * Given value will treated as a single phrase.
-	 * 
-	 * @param phrase
-	 * @return
-	 */
-	public TextCriteria notMatchingPhrase(String phrase) {
-
-		if (StringUtils.hasText(phrase)) {
-			notMatching(new Term(phrase, Term.Type.PHRASE));
-		}
-		return this;
-	}
-
-	/**
-	 * Given value will treated as a single phrase.
-	 * 
-	 * @param phrase
-	 * @return
-	 */
-	public TextCriteria matchingPhrase(String phrase) {
-
-		if (StringUtils.hasText(phrase)) {
-			matching(new Term(phrase, Term.Type.PHRASE));
-		}
-		return this;
-	}
-
-	/**
-	 * @return
-	 */
-	public static TextCriteria forDefaultLanguage() {
-		return new TextCriteriaBuilder().build();
-	}
-
-	/**
-	 * For a full list of supported languages see the mongdodb reference manual for <a
-	 * href="http://docs.mongodb.org/manual/reference/text-search-languages/">Text Search Languages</a>.
-	 * 
-	 * @param language
-	 * @return
-	 */
-	public static TextCriteria forLanguage(String language) {
-		return new TextCriteriaBuilder().withLanguage(language).build();
-	}
-
-	private static String join(Iterator<Term> iterator) {
-
-		Term first = iterator.next();
-		if (!iterator.hasNext()) {
-			return first.getFormatted();
-		}
-
-		StringBuilder buf = new StringBuilder(256);
-		if (first != null) {
-			buf.append(first);
-		}
-
-		while (iterator.hasNext()) {
-			buf.append(' ');
-			Term obj = iterator.next();
-			if (obj != null) {
-				buf.append(obj.getFormatted());
-			}
-		}
-
-		return buf.toString();
-	}
-
-	public static class TextCriteriaBuilder {
-
-		private TextCriteria instance;
-
-		public TextCriteriaBuilder() {
-			this.instance = new TextCriteria();
-		}
-
-		public TextCriteriaBuilder withLanguage(String language) {
-			this.instance.language = language;
-			return this;
-		}
-
-		public TextCriteria build() {
-			return this.instance;
-		}
-
-	}
-
-	@Override
-	public String getKey() {
-		return "$text";
-	}
-
-}

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

@@ -1,178 +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.text;
-
-import java.util.Locale;
-
-import org.springframework.data.mongodb.core.query.Query;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-
-/**
- * {@link Query} implementation to be used to for performing full text searches.
- * 
- * @author Christoph Strobl
- * @since 1.6
- */
-public class TextQuery extends Query {
-
-	private final String DEFAULT_SCORE_FIELD_FIELDNAME = "score";
-	private final DBObject META_TEXT_SCORE = new BasicDBObject("$meta", "textScore");
-
-	private String scoreFieldName = DEFAULT_SCORE_FIELD_FIELDNAME;
-	private boolean includeScore = false;
-	private boolean sortByScore = false;
-
-	/**
-	 * Creates new {@link TextQuery} using the the given {@code wordsAndPhrases} with {@link TextCriteria}
-	 * 
-	 * @param wordsAndPhrases
-	 * @see TextCriteria#matching(String)
-	 */
-	public TextQuery(String wordsAndPhrases) {
-		super(TextCriteria.forDefaultLanguage().matching(wordsAndPhrases));
-	}
-
-	/**
-	 * Creates new {@link TextQuery} in {@code language}. <br />
-	 * For a full list of supported languages see the mongdodb reference manual for <a
-	 * href="http://docs.mongodb.org/manual/reference/text-search-languages/">Text Search Languages</a>.
-	 * 
-	 * @param wordsAndPhrases
-	 * @param language
-	 * @see TextCriteria#forLanguage(String)
-	 * @see TextCriteria#matching(String)
-	 */
-	public TextQuery(String wordsAndPhrases, String language) {
-		super(TextCriteria.forLanguage(language).matching(wordsAndPhrases));
-	}
-
-	/**
-	 * Creates new {@link TextQuery} using the {@code locale}s language.<br />
-	 * For a full list of supported languages see the mongdodb reference manual for <a
-	 * href="http://docs.mongodb.org/manual/reference/text-search-languages/">Text Search Languages</a>.
-	 * 
-	 * @param wordsAndPhrases
-	 * @param locale
-	 */
-	public TextQuery(String wordsAndPhrases, Locale locale) {
-		this(wordsAndPhrases, locale != null ? locale.getLanguage() : (String) null);
-	}
-
-	/**
-	 * Creates new {@link TextQuery} for given {@link TextCriteria}.
-	 * 
-	 * @param criteria.
-	 */
-	public TextQuery(TextCriteria criteria) {
-		super(criteria);
-	}
-
-	/**
-	 * Creates new {@link TextQuery} searching for given {@link TextCriteria}.
-	 * 
-	 * @param criteria
-	 * @return
-	 */
-	public static TextQuery queryText(TextCriteria criteria) {
-		return new TextQuery(criteria);
-	}
-
-	/**
-	 * Add sorting by text score. Will also add text score to returned fields.
-	 * 
-	 * @see TextQuery#includeScore()
-	 * @return
-	 */
-	public TextQuery sortByScore() {
-
-		this.includeScore();
-		this.sortByScore = true;
-		return this;
-	}
-
-	/**
-	 * Add field {@literal score} holding the documents textScore to the returned fields.
-	 * 
-	 * @return
-	 */
-	public TextQuery includeScore() {
-
-		this.includeScore = true;
-		return this;
-	}
-
-	/**
-	 * Include text search document score in returned fields using the given fieldname.
-	 * 
-	 * @param fieldname
-	 * @return
-	 */
-	public TextQuery includeScore(String fieldname) {
-
-		setScoreFieldName(fieldname);
-		includeScore();
-		return this;
-	}
-
-	/**
-	 * Set the fieldname used for scoring.
-	 * 
-	 * @param fieldName
-	 */
-	public void setScoreFieldName(String fieldName) {
-		this.scoreFieldName = fieldName;
-	}
-
-	/**
-	 * Get the fieldname used for scoring
-	 * 
-	 * @return
-	 */
-	public String getScoreFieldName() {
-		return scoreFieldName;
-	}
-
-	@Override
-	public DBObject getFieldsObject() {
-
-		if (!this.includeScore) {
-			return super.getFieldsObject();
-		}
-
-		DBObject fields = super.getFieldsObject();
-		if (fields == null) {
-			fields = new BasicDBObject();
-		}
-		fields.put(getScoreFieldName(), META_TEXT_SCORE);
-		return fields;
-	}
-
-	@Override
-	public DBObject getSortObject() {
-
-		DBObject sort = new BasicDBObject();
-		if (this.sortByScore) {
-			sort.put(getScoreFieldName(), META_TEXT_SCORE);
-		}
-		if (super.getSortObject() != null) {
-			sort.putAll(super.getSortObject());
-		}
-		return sort;
-	}
-
-}

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

@@ -15,21 +15,18 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
-import java.util.Collections;
 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;
@@ -37,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 {
 
@@ -87,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()) {
@@ -147,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);
@@ -191,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.
 	 * 
@@ -255,26 +202,10 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 		Object execute(Query query) {
 
 			MongoEntityMetadata<?> metadata = method.getEntityInformation();
-
-			int overallLimit = query.getLimit();
 			long count = operations.count(query, metadata.getCollectionName());
-			count = overallLimit != 0 ? Math.min(count, query.getLimit()) : count;
 
-			boolean pageableOutOfScope = pageable.getOffset() > query.getLimit();
+			List<?> result = operations.find(query.with(pageable), metadata.getJavaType(), metadata.getCollectionName());
 
-			if (pageableOutOfScope) {
-				return new PageImpl<Object>(Collections.emptyList(), pageable, count);
-			}
-
-			// Apply raw pagination
-			query = query.with(pageable);
-
-			// Adjust limit if page would exceed the overall limit
-			if (overallLimit != 0 && pageable.getOffset() + pageable.getPageSize() > overallLimit) {
-				query.limit(overallLimit - pageable.getOffset());
-			}
-
-			List<?> result = operations.find(query, metadata.getJavaType(), metadata.getCollectionName());
 			return new PageImpl(result, pageable, count);
 		}
 	}
@@ -310,7 +241,6 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 	 * 
 	 * @author Oliver Gierke
 	 */
-	@SuppressWarnings("deprecation")
 	final class GeoNearExecution extends Execution {
 
 		private final MongoParameterAccessor accessor;
@@ -342,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);
@@ -367,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() {
@@ -383,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.
@@ -32,7 +32,6 @@ import com.mongodb.util.JSONParseException;
  * {@link RepositoryQuery} implementation for Mongo.
  * 
  * @author Oliver Gierke
- * @author Christoph Strobl
  */
 public class PartTreeMongoQuery extends AbstractMongoQuery {
 
@@ -73,10 +72,6 @@ public class PartTreeMongoQuery extends AbstractMongoQuery {
 		MongoQueryCreator creator = new MongoQueryCreator(tree, accessor, context, isGeoNearQuery);
 		Query query = creator.createQuery();
 
-		if (tree.isLimiting()) {
-			query.limit(tree.getMaxResults());
-		}
-
 		String fieldSpec = this.getQueryMethod().getFieldSpecification();
 
 		if (!StringUtils.hasText(fieldSpec)) {
@@ -112,13 +107,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.
@@ -30,32 +30,18 @@ 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
  */
 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 final String query;
 	private final String fieldSpec;
 	private final boolean isCountQuery;
-	private final boolean isDeleteQuery;
 
 	/**
-	 * 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}.
@@ -67,11 +53,10 @@ public class StringBasedMongoQuery extends AbstractMongoQuery {
 		this.query = query;
 		this.fieldSpec = 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);
 	}
 
 	/*
@@ -110,15 +95,6 @@ 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);

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;
-	}
 }