DATAMONGO-1410 - Release version 1.9.2 (Hopper SR2).

This should result in minor to moderate performance improvement for iteration on Collections/Arrays during DBObject to object mapping.

Original pull request: #368.

.travis.yml

@@ -9,12 +9,12 @@ before_script:
 env:
   matrix:
     - PROFILE=ci
+    - PROFILE=mongo-next
     - PROFILE=mongo3
     - PROFILE=mongo3-next
     - PROFILE=mongo31
     - PROFILE=mongo32
-    - PROFILE=mongo33
-    - PROFILE=mongo34-next
+    - PROFILE=mongo33-next
 
 # Current MongoDB version is 2.4.2 as of 2016-04, see https://github.com/travis-ci/travis-ci/issues/3694
 # apt-get starts a MongoDB instance so it's not started using before_script

README.md

@@ -1,6 +1,3 @@
-[![Spring Data MongoDB](https://spring.io/badges/spring-data-mongodb/ga.svg)](http://projects.spring.io/spring-data-mongodb#quick-start)
-[![Spring Data MongoDB](https://spring.io/badges/spring-data-mongodb/snapshot.svg)](http://projects.spring.io/spring-data-mongodb#quick-start)
-
 # Spring Data MongoDB
 
 The primary goal of the [Spring Data](http://projects.spring.io/spring-data) project is to make it easier to build Spring-powered applications that use new data access technologies such as non-relational databases, map-reduce frameworks, and cloud based data services.
@@ -29,7 +26,7 @@ Add the Maven dependency:
 <dependency>
   <groupId>org.springframework.data</groupId>
   <artifactId>spring-data-mongodb</artifactId>
-  <version>${version}.RELEASE</version>
+  <version>1.5.0.RELEASE</version>
 </dependency>
 ```
 
@@ -39,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>${version}.BUILD-SNAPSHOT</version>
+  <version>1.6.0.BUILD-SNAPSHOT</version>
 </dependency>
 
 <repository>

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-mongodb-parent</artifactId>
-	<version>2.0.0.M1</version>
+	<version>1.9.2.RELEASE</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data MongoDB</name>
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>2.0.0.M1</version>
+		<version>1.8.2.RELEASE</version>
 	</parent>
 
 	<modules>
@@ -28,9 +28,9 @@
 	<properties>
 		<project.type>multi</project.type>
 		<dist.id>spring-data-mongodb</dist.id>
-		<springdata.commons>2.0.0.M1</springdata.commons>
-		<mongo>3.2.2</mongo>
-		<mongo.reactivestreams>1.2.0</mongo.reactivestreams>
+		<springdata.commons>1.12.2.RELEASE</springdata.commons>
+		<mongo>2.14.0</mongo>
+		<mongo.osgi>2.13.0</mongo.osgi>
 	</properties>
 
 	<developers>
@@ -100,20 +100,25 @@
 			</roles>
 			<timezone>+1</timezone>
 		</developer>
-		<developer>
-			<id>mpaluch</id>
-			<name>Mark Paluch</name>
-			<email>mpaluch at pivotal.io</email>
-			<organization>Pivotal</organization>
-			<organizationUrl>http://www.pivotal.io</organizationUrl>
-			<roles>
-				<role>Developer</role>
-			</roles>
-			<timezone>+1</timezone>
-		</developer>
 	</developers>
 
 	<profiles>
+		<profile>
+
+			<id>mongo-next</id>
+			<properties>
+				<mongo>2.15.0-SNAPSHOT</mongo>
+			</properties>
+
+			<repositories>
+				<repository>
+					<id>mongo-snapshots</id>
+					<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+				</repository>
+			</repositories>
+
+		</profile>
+
 		<profile>
 
 			<id>mongo3</id>
@@ -159,25 +164,9 @@
 
 		<profile>
 
-			<id>mongo33</id>
+			<id>mongo33-next</id>
 			<properties>
-				<mongo>3.3.0</mongo>
-			</properties>
-
-			<repositories>
-				<repository>
-					<id>mongo-snapshots</id>
-					<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-				</repository>
-			</repositories>
-
-		</profile>
-
-		<profile>
-
-			<id>mongo34-next</id>
-			<properties>
-				<mongo>3.4.0-SNAPSHOT</mongo>
+				<mongo>3.3.0-SNAPSHOT</mongo>
 			</properties>
 
 			<repositories>
@@ -215,8 +204,8 @@
 
 	<repositories>
 		<repository>
-			<id>spring-libs-milestone</id>
-			<url>https://repo.spring.io/libs-milestone</url>
+			<id>spring-libs-release</id>
+			<url>https://repo.spring.io/libs-release</url>
 		</repository>
 	</repositories>
 

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

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>2.0.0.M1</version>
+		<version>1.9.2.RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -14,8 +14,8 @@
 	<name>Spring Data MongoDB - Cross-Store Support</name>
 
 	<properties>
-		<jpa>2.1.1</jpa>
-		<hibernate>5.2.1.Final</hibernate>
+		<jpa>2.0.0</jpa>
+		<hibernate>3.6.10.Final</hibernate>
 	</properties>
 
 	<dependencies>
@@ -48,15 +48,7 @@
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-mongodb</artifactId>
-			<version>2.0.0.M1</version>
-		</dependency>
-
-		<!-- reactive -->
-		<dependency>
-		 	<groupId>io.projectreactor</groupId>
-			<artifactId>reactor-core</artifactId>
-			<version>${reactor}</version>
-			<optional>true</optional>
+			<version>1.9.2.RELEASE</version>
 		</dependency>
 
 		<dependency>
@@ -89,13 +81,13 @@
 		<dependency>
 			<groupId>javax.validation</groupId>
 			<artifactId>validation-api</artifactId>
-			<version>${validation}</version>
+			<version>1.0.0.GA</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-validator</artifactId>
-			<version>5.2.4.Final</version>
+			<version>4.0.2.GA</version>
 			<scope>test</scope>
 		</dependency>
 

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

@@ -17,7 +17,6 @@ package org.springframework.data.mongodb.crossstore;
 
 import javax.persistence.EntityManagerFactory;
 
-import org.bson.Document;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataAccessException;
@@ -30,10 +29,10 @@ import org.springframework.data.mongodb.core.CollectionCallback;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.util.ClassUtils;
 
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBCollection;
+import com.mongodb.DBObject;
 import com.mongodb.MongoException;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.model.Filters;
-import com.mongodb.client.result.DeleteResult;
 
 /**
  * @author Thomas Risberg
@@ -75,15 +74,15 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 
 		String collName = getCollectionNameForEntity(entityClass);
 
-		final Document dbk = new Document();
+		final DBObject dbk = new BasicDBObject();
 		dbk.put(ENTITY_ID, id);
 		dbk.put(ENTITY_CLASS, entityClass.getName());
 		if (log.isDebugEnabled()) {
 			log.debug("Loading MongoDB data for {}", dbk);
 		}
 		mongoTemplate.execute(collName, new CollectionCallback<Object>() {
-			public Object doInCollection(MongoCollection<Document> collection) throws MongoException, DataAccessException {
-				for (Document dbo : collection.find(dbk)) {
+			public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+				for (DBObject dbo : collection.find(dbk)) {
 					String key = (String) dbo.get(ENTITY_FIELD_NAME);
 					if (log.isDebugEnabled()) {
 						log.debug("Processing key: {}", key);
@@ -144,31 +143,27 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 		for (String key : cs.getValues().keySet()) {
 			if (key != null && !key.startsWith("_") && !key.equals(ChangeSetPersister.ID_KEY)) {
 				Object value = cs.getValues().get(key);
-				final Document dbQuery = new Document();
+				final DBObject dbQuery = new BasicDBObject();
 				dbQuery.put(ENTITY_ID, getPersistentId(entity, cs));
 				dbQuery.put(ENTITY_CLASS, entity.getClass().getName());
 				dbQuery.put(ENTITY_FIELD_NAME, key);
-				final Document dbId = mongoTemplate.execute(collName, new CollectionCallback<Document>() {
-					public Document doInCollection(MongoCollection<Document> collection)
-							throws MongoException, DataAccessException {
-						Document id = collection.find(dbQuery).first();
-						return id;
+				DBObject dbId = mongoTemplate.execute(collName, new CollectionCallback<DBObject>() {
+					public DBObject doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+						return collection.findOne(dbQuery);
 					}
 				});
-
 				if (value == null) {
 					if (log.isDebugEnabled()) {
 						log.debug("Flush: removing: {}", dbQuery);
 					}
 					mongoTemplate.execute(collName, new CollectionCallback<Object>() {
-						public Object doInCollection(MongoCollection<Document> collection)
-								throws MongoException, DataAccessException {
-							DeleteResult dr = collection.deleteMany(dbQuery);
+						public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+							collection.remove(dbQuery);
 							return null;
 						}
 					});
 				} else {
-					final Document dbDoc = new Document();
+					final DBObject dbDoc = new BasicDBObject();
 					dbDoc.putAll(dbQuery);
 					if (log.isDebugEnabled()) {
 						log.debug("Flush: saving: {}", dbQuery);
@@ -179,18 +174,8 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
 						dbDoc.put("_id", dbId.get("_id"));
 					}
 					mongoTemplate.execute(collName, new CollectionCallback<Object>() {
-						public Object doInCollection(MongoCollection<Document> collection)
-								throws MongoException, DataAccessException {
-
-							if (dbId != null) {
-								collection.replaceOne(Filters.eq("_id", dbId.get("_id")), dbDoc);
-							} else {
-
-								if (dbDoc.containsKey("_id") && dbDoc.get("_id") == null) {
-									dbDoc.remove("_id");
-								}
-								collection.insertOne(dbDoc);
-							}
+						public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+							collection.save(dbDoc);
 							return null;
 						}
 					});

spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/CrossStoreMongoTests.java

@@ -18,7 +18,6 @@ package org.springframework.data.mongodb.crossstore;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
-import org.bson.Document;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -37,6 +36,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionCallback;
 import org.springframework.transaction.support.TransactionTemplate;
 
+import com.mongodb.DBObject;
+
 /**
  * Integration tests for MongoDB cross-store persistence (mainly {@link MongoChangeSetPersister}).
  * 
@@ -47,11 +48,14 @@ import org.springframework.transaction.support.TransactionTemplate;
 @ContextConfiguration("classpath:/META-INF/spring/applicationContext.xml")
 public class CrossStoreMongoTests {
 
-	@Autowired MongoTemplate mongoTemplate;
+	@Autowired
+	MongoTemplate mongoTemplate;
 
-	@PersistenceContext EntityManager entityManager;
+	@PersistenceContext
+	EntityManager entityManager;
 
-	@Autowired PlatformTransactionManager transactionManager;
+	@Autowired
+	PlatformTransactionManager transactionManager;
 	TransactionTemplate txTemplate;
 
 	@Before
@@ -183,7 +187,7 @@ public class CrossStoreMongoTests {
 
 		boolean weFound3 = false;
 
-		for (Document dbo : this.mongoTemplate.getCollection(mongoTemplate.getCollectionName(Person.class)).find()) {
+		for (DBObject dbo : this.mongoTemplate.getCollection(mongoTemplate.getCollectionName(Person.class)).find()) {
 			Assert.assertTrue(!dbo.get("_entity_id").equals(2L));
 			if (dbo.get("_entity_id").equals(3L)) {
 				weFound3 = true;

spring-data-mongodb-cross-store/src/test/resources/META-INF/spring/applicationContext.xml

@@ -20,7 +20,7 @@
   <mongo:mapping-converter/>
   
   <!--  Mongo config -->
-  <bean id="mongo" class="org.springframework.data.mongodb.core.MongoClientFactoryBean">
+  <bean id="mongo" class="org.springframework.data.mongodb.core.MongoFactoryBean">
     <property name="host" value="localhost"/>
     <property name="port" value="27017"/>
   </bean>

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

@@ -0,0 +1,18 @@
+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:
+ 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)}",
+ javax.persistence.*;version="${jpa:[=.=.=,+1.0.0)}",
+ org.aspectj.*;version="${aspectj:[1.0.0, 2.0.0)}",
+ org.bson.*;version="0",
+ org.slf4j.*;version="${slf4j:[=.=.=,+1.0.0)}",
+ org.springframework.*;version="${spring:[=.=.=.=,+1.0.0)}",
+ org.springframework.data.*;version="${springdata.commons:[=.=.=.=,+1.0.0)}",
+ org.springframework.data.mongodb.*;version="${project.version:[=.=.=.=,+1.0.0)}",
+ org.w3c.dom.*;version="0"

spring-data-mongodb-distribution/pom.xml

@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>2.0.0.M1</version>
+		<version>1.9.2.RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-mongodb-log4j/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>2.0.0.M1</version>
+		<version>1.9.2.RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-mongodb-log4j/src/main/java/org/springframework/data/mongodb/log4j/MongoLog4jAppender.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,6 @@ import com.mongodb.BasicDBList;
 import com.mongodb.BasicDBObject;
 import com.mongodb.DB;
 import com.mongodb.Mongo;
-import com.mongodb.MongoClient;
 import com.mongodb.WriteConcern;
 
 /**
@@ -38,7 +37,6 @@ import com.mongodb.WriteConcern;
  * 
  * @author Jon Brisbin
  * @author Oliver Gierke
- * @auhtor Christoph Strobl
  */
 public class MongoLog4jAppender extends AppenderSkeleton {
 
@@ -60,8 +58,8 @@ public class MongoLog4jAppender extends AppenderSkeleton {
 	protected String collectionPattern = "%c";
 	protected PatternLayout collectionLayout = new PatternLayout(collectionPattern);
 	protected String applicationId = System.getProperty("APPLICATION_ID", null);
-	protected WriteConcern warnOrHigherWriteConcern = WriteConcern.ACKNOWLEDGED;
-	protected WriteConcern infoOrLowerWriteConcern = WriteConcern.UNACKNOWLEDGED;
+	protected WriteConcern warnOrHigherWriteConcern = WriteConcern.SAFE;
+	protected WriteConcern infoOrLowerWriteConcern = WriteConcern.NORMAL;
 	protected Mongo mongo;
 	protected DB db;
 
@@ -130,7 +128,7 @@ public class MongoLog4jAppender extends AppenderSkeleton {
 	}
 
 	protected void connectToMongo() throws UnknownHostException {
-		this.mongo = new MongoClient(host, port);
+		this.mongo = new Mongo(host, port);
 		this.db = mongo.getDB(database);
 	}
 

spring-data-mongodb-log4j/src/test/java/org/springframework/data/mongodb/log4j/MongoLog4jAppenderIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 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.
@@ -22,44 +22,37 @@ import java.util.Calendar;
 
 import org.apache.log4j.Logger;
 import org.apache.log4j.MDC;
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.mongodb.BasicDBObject;
 import com.mongodb.DB;
 import com.mongodb.DBCursor;
-import com.mongodb.MongoClient;
+import com.mongodb.Mongo;
 
 /**
  * Integration tests for {@link MongoLog4jAppender}.
  * 
  * @author Jon Brisbin
  * @author Oliver Gierke
- * @author Christoph Strobl
  */
 public class MongoLog4jAppenderIntegrationTests {
 
 	static final String NAME = MongoLog4jAppenderIntegrationTests.class.getName();
 
 	private static final Logger log = Logger.getLogger(NAME);
-	MongoClient mongo;
+	Mongo mongo;
 	DB db;
 	String collection;
 
 	@Before
 	public void setUp() throws Exception {
 
-		mongo = new MongoClient("localhost", 27017);
+		mongo = new Mongo("localhost", 27017);
 		db = mongo.getDB("logs");
 
 		Calendar now = Calendar.getInstance();
 		collection = String.valueOf(now.get(Calendar.YEAR)) + String.format("%1$02d", now.get(Calendar.MONTH) + 1);
-	}
-
-	@After
-	public void tearDown() {
-		db.getCollection(collection).remove(new BasicDBObject());
+		db.getCollection(collection).drop();
 	}
 
 	@Test
@@ -71,6 +64,7 @@ public class MongoLog4jAppenderIntegrationTests {
 		log.error("ERROR message");
 
 		DBCursor msgs = db.getCollection(collection).find();
+
 		assertThat(msgs.count(), is(4));
 	}
 

spring-data-mongodb-log4j/template.mf

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

spring-data-mongodb/pom.xml

@@ -11,14 +11,14 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>2.0.0.M1</version>
+		<version>1.9.2.RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<properties>
+		<validation>1.0.0.GA</validation>
 		<objenesis>1.3</objenesis>
 		<equalsverifier>1.5</equalsverifier>
-		<mongo>3.3.0</mongo>
 	</properties>
 
 	<dependencies>
@@ -79,52 +79,6 @@
 			<optional>true</optional>
 		</dependency>
 
-		<!-- reactive -->
-		<dependency>
-		 	<groupId>org.mongodb</groupId>
-			<artifactId>mongodb-driver-reactivestreams</artifactId>
-			<version>${mongo.reactivestreams}</version>
-			<optional>true</optional>
-		</dependency>
-
-		<dependency>
-		 	<groupId>org.mongodb</groupId>
-			<artifactId>mongodb-driver-async</artifactId>
-			<version>${mongo}</version>
-			<optional>true</optional>
-			<exclusions>
-				<exclusion>
-					<groupId>org.mongodb</groupId>
-					<artifactId>mongodb-driver-core</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.mongodb</groupId>
-					<artifactId>bson</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-		 	<groupId>io.projectreactor</groupId>
-			<artifactId>reactor-core</artifactId>
-			<version>${reactor}</version>
-			<optional>true</optional>
-		</dependency>
-
-		<dependency>
-		 	<groupId>io.reactivex</groupId>
-			<artifactId>rxjava</artifactId>
-			<version>${rxjava}</version>
-			<optional>true</optional>
-		</dependency>
-
-		<dependency>
-		 	<groupId>io.reactivex</groupId>
-			<artifactId>rxjava-reactive-streams</artifactId>
-			<version>${rxjava-reactive-streams}</version>
-			<optional>true</optional>
-		</dependency>
-
 		<!-- CDI -->
 		<dependency>
 			<groupId>javax.enterprise</groupId>
@@ -173,7 +127,7 @@
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-validator</artifactId>
-			<version>5.2.4.Final</version>
+			<version>4.2.0.Final</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -259,11 +213,9 @@
 					</includes>
 					<excludes>
 						<exclude>**/PerformanceTests.java</exclude>
-						<exclude>**/ReactivePerformanceTests.java</exclude>
 					</excludes>
 					<systemPropertyVariables>
 						<java.util.logging.config.file>src/test/resources/logging.properties</java.util.logging.config.file>
-						<reactor.trace.cancel>true</reactor.trace.cancel>
 					</systemPropertyVariables>
 					<properties>
 						<property>

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

@@ -20,7 +20,6 @@ import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.mongodb.core.MongoExceptionTranslator;
 
 import com.mongodb.DB;
-import com.mongodb.client.MongoDatabase;
 
 /**
  * Interface for factories creating {@link DB} instances.
@@ -36,7 +35,7 @@ public interface MongoDbFactory {
 	 * @return
 	 * @throws DataAccessException
 	 */
-	MongoDatabase getDb() throws DataAccessException;
+	DB getDb() throws DataAccessException;
 
 	/**
 	 * Creates a {@link DB} instance to access the database with the given name.
@@ -45,7 +44,7 @@ public interface MongoDbFactory {
 	 * @return
 	 * @throws DataAccessException
 	 */
-	MongoDatabase getDb(String dbName) throws DataAccessException;
+	DB getDb(String dbName) throws DataAccessException;
 
 	/**
 	 * Exposes a shared {@link MongoExceptionTranslator}.
@@ -53,6 +52,4 @@ public interface MongoDbFactory {
 	 * @return will never be {@literal null}.
 	 */
 	PersistenceExceptionTranslator getExceptionTranslator();
-
-	DB getLegacyDb();
 }

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

@@ -1,56 +0,0 @@
-/*
- * Copyright 2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.data.mongodb;
-
-import org.springframework.dao.DataAccessException;
-import org.springframework.dao.support.PersistenceExceptionTranslator;
-import org.springframework.data.mongodb.core.MongoExceptionTranslator;
-
-import com.mongodb.reactivestreams.client.MongoDatabase;
-
-/**
- * Interface for factories creating reactive {@link MongoDatabase} instances.
- *
- * @author Mark Paluch
- * @since 2.0
- */
-public interface ReactiveMongoDatabaseFactory {
-
-	/**
-	 * Creates a default {@link MongoDatabase} instance.
-	 *
-	 * @return
-	 * @throws DataAccessException
-	 */
-	MongoDatabase getMongoDatabase() throws DataAccessException;
-
-	/**
-	 * Creates a {@link MongoDatabase} instance to access the database with the given name.
-	 *
-	 * @param dbName must not be {@literal null} or empty.
-	 * @return
-	 * @throws DataAccessException
-	 */
-	MongoDatabase getMongoDatabase(String dbName) throws DataAccessException;
-
-	/**
-	 * Exposes a shared {@link MongoExceptionTranslator}.
-	 *
-	 * @return will never be {@literal null}.
-	 */
-	PersistenceExceptionTranslator getExceptionTranslator();
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,16 +15,35 @@
  */
 package org.springframework.data.mongodb.config;
 
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.core.type.filter.AnnotationTypeFilter;
+import org.springframework.data.annotation.Persistent;
 import org.springframework.data.authentication.UserCredentials;
+import org.springframework.data.mapping.context.MappingContextIsNewStrategyFactory;
+import org.springframework.data.mapping.model.CamelCaseAbbreviatingFieldNamingStrategy;
+import org.springframework.data.mapping.model.FieldNamingStrategy;
+import org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
+import org.springframework.data.mongodb.core.convert.CustomConversions;
 import org.springframework.data.mongodb.core.convert.DbRefResolver;
 import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.support.CachingIsNewStrategyFactory;
+import org.springframework.data.support.IsNewStrategyFactory;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.StringUtils;
 
 import com.mongodb.Mongo;
 import com.mongodb.MongoClient;
@@ -37,11 +56,16 @@ import com.mongodb.MongoClient;
  * @author Thomas Darimont
  * @author Ryan Tenney
  * @author Christoph Strobl
- * @author Mark Paluch
- * @see MongoConfigurationSupport
  */
 @Configuration
-public abstract class AbstractMongoConfiguration extends MongoConfigurationSupport {
+public abstract class AbstractMongoConfiguration {
+
+	/**
+	 * Return the name of the database to connect to.
+	 * 
+	 * @return must not be {@literal null}.
+	 */
+	protected abstract String getDatabaseName();
 
 	/**
 	 * Return the name of the authentication database to use. Defaults to {@literal null} and will turn into the value
@@ -94,13 +118,11 @@ public abstract class AbstractMongoConfiguration extends MongoConfigurationSuppo
 	 * Return the base package to scan for mapped {@link Document}s. Will return the package name of the configuration
 	 * class' (the concrete class, not this one here) by default. So if you have a {@code com.acme.AppConfig} extending
 	 * {@link AbstractMongoConfiguration} the base package will be considered {@code com.acme} unless the method is
-	 * overridden to implement alternate behavior.
-	 *
+	 * overriden to implement alternate behaviour.
+	 * 
 	 * @return the base package to scan for mapped {@link Document} classes or {@literal null} to not enable scanning for
 	 *         entities.
-	 * @deprecated use {@link #getMappingBasePackages()} instead.
 	 */
-	@Deprecated
 	protected String getMappingBasePackage() {
 
 		Package mappingBasePackage = getClass().getPackage();
@@ -120,6 +142,47 @@ public abstract class AbstractMongoConfiguration extends MongoConfigurationSuppo
 		return null;
 	}
 
+	/**
+	 * Creates a {@link MongoMappingContext} equipped with entity classes scanned from the mapping base package.
+	 * 
+	 * @see #getMappingBasePackage()
+	 * @return
+	 * @throws ClassNotFoundException
+	 */
+	@Bean
+	public MongoMappingContext mongoMappingContext() throws ClassNotFoundException {
+
+		MongoMappingContext mappingContext = new MongoMappingContext();
+		mappingContext.setInitialEntitySet(getInitialEntitySet());
+		mappingContext.setSimpleTypeHolder(customConversions().getSimpleTypeHolder());
+		mappingContext.setFieldNamingStrategy(fieldNamingStrategy());
+
+		return mappingContext;
+	}
+
+	/**
+	 * Returns a {@link MappingContextIsNewStrategyFactory} wrapped into a {@link CachingIsNewStrategyFactory}.
+	 * 
+	 * @return
+	 * @throws ClassNotFoundException
+	 */
+	@Bean
+	public IsNewStrategyFactory isNewStrategyFactory() throws ClassNotFoundException {
+		return new CachingIsNewStrategyFactory(new MappingContextIsNewStrategyFactory(mongoMappingContext()));
+	}
+
+	/**
+	 * Register custom {@link Converter}s in a {@link CustomConversions} object if required. These
+	 * {@link CustomConversions} will be registered with the {@link #mappingMongoConverter()} and
+	 * {@link #mongoMappingContext()}. Returns an empty {@link CustomConversions} instance by default.
+	 * 
+	 * @return must not be {@literal null}.
+	 */
+	@Bean
+	public CustomConversions customConversions() {
+		return new CustomConversions(Collections.emptyList());
+	}
+
 	/**
 	 * Creates a {@link MappingMongoConverter} using the configured {@link #mongoDbFactory()} and
 	 * {@link #mongoMappingContext()}. Will get {@link #customConversions()} applied.
@@ -139,4 +202,53 @@ public abstract class AbstractMongoConfiguration extends MongoConfigurationSuppo
 
 		return converter;
 	}
+
+	/**
+	 * Scans the mapping base package for classes annotated with {@link Document}.
+	 * 
+	 * @see #getMappingBasePackage()
+	 * @return
+	 * @throws ClassNotFoundException
+	 */
+	protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
+
+		String basePackage = getMappingBasePackage();
+		Set<Class<?>> initialEntitySet = new HashSet<Class<?>>();
+
+		if (StringUtils.hasText(basePackage)) {
+			ClassPathScanningCandidateComponentProvider componentProvider = new ClassPathScanningCandidateComponentProvider(
+					false);
+			componentProvider.addIncludeFilter(new AnnotationTypeFilter(Document.class));
+			componentProvider.addIncludeFilter(new AnnotationTypeFilter(Persistent.class));
+
+			for (BeanDefinition candidate : componentProvider.findCandidateComponents(basePackage)) {
+				initialEntitySet.add(ClassUtils.forName(candidate.getBeanClassName(),
+						AbstractMongoConfiguration.class.getClassLoader()));
+			}
+		}
+
+		return initialEntitySet;
+	}
+
+	/**
+	 * Configures whether to abbreviate field names for domain objects by configuring a
+	 * {@link CamelCaseAbbreviatingFieldNamingStrategy} on the {@link MongoMappingContext} instance created. For advanced
+	 * customization needs, consider overriding {@link #mappingMongoConverter()}.
+	 * 
+	 * @return
+	 */
+	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/AbstractReactiveMongoConfiguration.java

@@ -1,92 +0,0 @@
-/*
- * Copyright 2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.data.mongodb.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.ReactiveMongoOperations;
-import org.springframework.data.mongodb.core.SimpleReactiveMongoDatabaseFactory;
-import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
-import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
-import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
-
-import com.mongodb.reactivestreams.client.MongoClient;
-
-/**
- * Base class for reactive Spring Data MongoDB configuration using JavaConfig.
- *
- * @author Mark Paluch
- * @since 2.0
- * @see MongoConfigurationSupport
- */
-@Configuration
-public abstract class AbstractReactiveMongoConfiguration extends MongoConfigurationSupport {
-
-	/**
-	 * Return the {@link MongoClient} instance to connect to. Annotate with {@link Bean} in case you want to expose a
-	 * {@link MongoClient} instance to the {@link org.springframework.context.ApplicationContext}.
-	 *
-	 * @return
-	 */
-	public abstract MongoClient mongoClient();
-
-	/**
-	 * Creates a {@link ReactiveMongoTemplate}.
-	 *
-	 * @return
-	 */
-	@Bean
-	public ReactiveMongoOperations reactiveMongoTemplate() throws Exception {
-		return new ReactiveMongoTemplate(mongoDbFactory(), mappingMongoConverter());
-	}
-
-	/**
-	 * Creates a {@link SimpleMongoDbFactory} to be used by the {@link MongoTemplate}. Will use the {@link Mongo} instance
-	 * configured in {@link #mongoClient()}.
-	 *
-	 * @see #mongoClient()
-	 * @see #reactiveMongoTemplate()
-	 * @return
-	 * @throws Exception
-	 */
-	@Bean
-	public ReactiveMongoDatabaseFactory mongoDbFactory() {
-		return new SimpleReactiveMongoDatabaseFactory(mongoClient(), getDatabaseName());
-	}
-
-	/**
-	 * Creates a {@link MappingMongoConverter} using the configured {@link #mongoDbFactory()} and
-	 * {@link #mongoMappingContext()}. Will get {@link #customConversions()} applied.
-	 *
-	 * @see #customConversions()
-	 * @see #mongoMappingContext()
-	 * @see #mongoDbFactory()
-	 * @return
-	 * @throws Exception
-	 */
-	@Bean
-	public MappingMongoConverter mappingMongoConverter() throws Exception {
-
-		MappingMongoConverter converter = new MappingMongoConverter(ReactiveMongoTemplate.NO_OP_REF_RESOLVER,
-				mongoMappingContext());
-		converter.setCustomConversions(customConversions());
-
-		return converter;
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,13 +67,12 @@ import org.w3c.dom.Element;
 
 /**
  * Bean definition parser for the {@code mapping-converter} element.
- *
+ * 
  * @author Jon Brisbin
  * @author Oliver Gierke
  * @author Maciej Walkowiak
  * @author Thomas Darimont
  * @author Christoph Strobl
- * @author Mark Paluch
  */
 public class MappingMongoConverterParser implements BeanDefinitionParser {
 
@@ -121,21 +120,16 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 			converterBuilder.addPropertyValue("customConversions", conversionsDefinition);
 		}
 
-		if(!registry.containsBeanDefinition("indexOperationsProvider")){
-
-			BeanDefinitionBuilder indexOperationsProviderBuilder = BeanDefinitionBuilder.genericBeanDefinition("org.springframework.data.mongodb.core.DefaultIndexOperationsProvider");
-			indexOperationsProviderBuilder.addConstructorArgReference(dbFactoryRef);
-			parserContext.registerBeanComponent(new BeanComponentDefinition(indexOperationsProviderBuilder.getBeanDefinition(), "indexOperationsProvider"));
-		}
-
 		try {
 			registry.getBeanDefinition(INDEX_HELPER_BEAN_NAME);
 		} catch (NoSuchBeanDefinitionException ignored) {
-
+			if (!StringUtils.hasText(dbFactoryRef)) {
+				dbFactoryRef = DB_FACTORY_BEAN_NAME;
+			}
 			BeanDefinitionBuilder indexHelperBuilder = BeanDefinitionBuilder
 					.genericBeanDefinition(MongoPersistentEntityIndexCreator.class);
 			indexHelperBuilder.addConstructorArgReference(ctxRef);
-			indexHelperBuilder.addConstructorArgReference("indexOperationsProvider");
+			indexHelperBuilder.addConstructorArgReference(dbFactoryRef);
 			indexHelperBuilder.addDependsOn(ctxRef);
 
 			parserContext.registerBeanComponent(new BeanComponentDefinition(indexHelperBuilder.getBeanDefinition(),
@@ -354,7 +348,7 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 
 	/**
 	 * {@link TypeFilter} that returns {@literal false} in case any of the given delegates matches.
-	 *
+	 * 
 	 * @author Oliver Gierke
 	 */
 	private static class NegatingFilter implements TypeFilter {
@@ -363,7 +357,7 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 
 		/**
 		 * Creates a new {@link NegatingFilter} with the given delegates.
-		 *
+		 * 
 		 * @param filters
 		 */
 		public NegatingFilter(TypeFilter... filters) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,24 +15,24 @@
  */
 package org.springframework.data.mongodb.config;
 
+import static org.springframework.beans.factory.config.BeanDefinition.*;
+import static org.springframework.data.mongodb.config.BeanNames.*;
+
 import java.lang.annotation.Annotation;
 
-import org.springframework.beans.factory.FactoryBean;
 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.AuditingBeanDefinitionRegistrarSupport;
 import org.springframework.data.auditing.config.AuditingConfiguration;
 import org.springframework.data.config.ParsingUtils;
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.event.AuditingEventListener;
+import org.springframework.data.support.IsNewStrategyFactory;
 import org.springframework.util.Assert;
 
 /**
@@ -71,6 +71,7 @@ class MongoAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
 		Assert.notNull(annotationMetadata, "AnnotationMetadata must not be null!");
 		Assert.notNull(registry, "BeanDefinitionRegistry must not be null!");
 
+		defaultDependenciesIfNecessary(registry, annotationMetadata);
 		super.registerBeanDefinitions(annotationMetadata, registry);
 	}
 
@@ -84,11 +85,7 @@ class MongoAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
 		Assert.notNull(configuration, "AuditingConfiguration must not be null!");
 
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(IsNewAwareAuditingHandler.class);
-
-		BeanDefinitionBuilder definition = BeanDefinitionBuilder.genericBeanDefinition(MongoMappingContextLookup.class);
-		definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_CONSTRUCTOR);
-
-		builder.addConstructorArgValue(definition.getBeanDefinition());
+		builder.addConstructorArgReference(MAPPING_CONTEXT_BEAN_NAME);
 		return configureDefaultAuditHandlerAttributes(configuration, builder);
 	}
 
@@ -105,58 +102,29 @@ class MongoAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
 
 		BeanDefinitionBuilder listenerBeanDefinitionBuilder = BeanDefinitionBuilder
 				.rootBeanDefinition(AuditingEventListener.class);
-		listenerBeanDefinitionBuilder
-				.addConstructorArgValue(ParsingUtils.getObjectFactoryBeanDefinition(getAuditingHandlerBeanName(), registry));
+		listenerBeanDefinitionBuilder.addConstructorArgValue(ParsingUtils.getObjectFactoryBeanDefinition(
+				getAuditingHandlerBeanName(), registry));
 
 		registerInfrastructureBeanWithId(listenerBeanDefinitionBuilder.getBeanDefinition(),
 				AuditingEventListener.class.getName(), registry);
 	}
 
 	/**
-	 * Simple helper to be able to wire the {@link MappingContext} from a {@link MappingMongoConverter} bean available in
-	 * the application context.
-	 *
-	 * @author Oliver Gierke
+	 * Register default bean definitions for a {@link MongoMappingContext} and an {@link IsNewStrategyFactory} in case we
+	 * don't find beans with the assumed names in the registry.
+	 * 
+	 * @param registry the {@link BeanDefinitionRegistry} to use to register the components into.
+	 * @param source the source which the registered components shall be registered with
 	 */
-	static class MongoMappingContextLookup
-			implements FactoryBean<MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty>> {
+	private void defaultDependenciesIfNecessary(BeanDefinitionRegistry registry, Object source) {
 
-		private final MappingMongoConverter converter;
+		if (!registry.containsBeanDefinition(MAPPING_CONTEXT_BEAN_NAME)) {
 
-		/**
-		 * Creates a new {@link MongoMappingContextLookup} for the given {@link MappingMongoConverter}.
-		 * 
-		 * @param converter must not be {@literal null}.
-		 */
-		public MongoMappingContextLookup(MappingMongoConverter converter) {
-			this.converter = converter;
-		}
+			RootBeanDefinition definition = new RootBeanDefinition(MongoMappingContext.class);
+			definition.setRole(ROLE_INFRASTRUCTURE);
+			definition.setSource(source);
 
-		/* 
-		 * (non-Javadoc)
-		 * @see org.springframework.beans.factory.FactoryBean#getObject()
-		 */
-		@Override
-		public MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> getObject() throws Exception {
-			return converter.getMappingContext();
-		}
-
-		/* 
-		 * (non-Javadoc)
-		 * @see org.springframework.beans.factory.FactoryBean#getObjectType()
-		 */
-		@Override
-		public Class<?> getObjectType() {
-			return MappingContext.class;
-		}
-
-		/* 
-		 * (non-Javadoc)
-		 * @see org.springframework.beans.factory.FactoryBean#isSingleton()
-		 */
-		@Override
-		public boolean isSingleton() {
-			return true;
+			registry.registerBeanDefinition(MAPPING_CONTEXT_BEAN_NAME, definition);
 		}
 	}
 }

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

@@ -1,203 +0,0 @@
-/*
- * Copyright 2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.data.mongodb.config;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
-import org.springframework.core.convert.converter.Converter;
-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.MappingContext;
-import org.springframework.data.mapping.context.MappingContextIsNewStrategyFactory;
-import org.springframework.data.mapping.context.PersistentEntities;
-import org.springframework.data.mapping.model.CamelCaseAbbreviatingFieldNamingStrategy;
-import org.springframework.data.mapping.model.FieldNamingStrategy;
-import org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy;
-import org.springframework.data.mongodb.MongoDbFactory;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
-import org.springframework.data.mongodb.core.convert.CustomConversions;
-import org.springframework.data.mongodb.core.convert.DbRefResolver;
-import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
-import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
-import org.springframework.data.mongodb.core.mapping.Document;
-import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
-import org.springframework.data.support.CachingIsNewStrategyFactory;
-import org.springframework.data.support.IsNewStrategyFactory;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.StringUtils;
-
-import com.mongodb.Mongo;
-import com.mongodb.MongoClient;
-
-/**
- * Base class for Spring Data MongoDB to be extended for JavaConfiguration usage.
- *
- * @author Mark Paluch
- * @since 2.0
- */
-public abstract class MongoConfigurationSupport {
-
-	/**
-	 * Return the name of the database to connect to.
-	 * 
-	 * @return must not be {@literal null}.
-	 */
-	protected abstract String getDatabaseName();
-
-	/**
-	 * Returns the base packages to scan for MongoDB mapped entities at startup. Will return the package name of the
-	 * configuration class' (the concrete class, not this one here) by default. So if you have a
-	 * {@code com.acme.AppConfig} extending {@link MongoConfigurationSupport} the base package will be considered
-	 * {@code com.acme} unless the method is overridden to implement alternate behavior.
-	 * 
-	 * @return the base packages to scan for mapped {@link Document} classes or an empty collection to not enable scanning
-	 *         for entities.
-	 * @since 1.10
-	 */
-	protected Collection<String> getMappingBasePackages() {
-
-		Package mappingBasePackage = getClass().getPackage();
-		return Collections.singleton(mappingBasePackage == null ? null : mappingBasePackage.getName());
-	}
-
-	/**
-	 * Creates a {@link MongoMappingContext} equipped with entity classes scanned from the mapping base package.
-	 * 
-	 * @see #getMappingBasePackage()
-	 * @return
-	 * @throws ClassNotFoundException
-	 */
-	@Bean
-	public MongoMappingContext mongoMappingContext() throws ClassNotFoundException {
-
-		MongoMappingContext mappingContext = new MongoMappingContext();
-		mappingContext.setInitialEntitySet(getInitialEntitySet());
-		mappingContext.setSimpleTypeHolder(customConversions().getSimpleTypeHolder());
-		mappingContext.setFieldNamingStrategy(fieldNamingStrategy());
-
-		return mappingContext;
-	}
-
-	/**
-	 * Returns a {@link MappingContextIsNewStrategyFactory} wrapped into a {@link CachingIsNewStrategyFactory}.
-	 *
-	 * @return
-	 * @throws ClassNotFoundException
-	 */
-	@Bean
-	public IsNewStrategyFactory isNewStrategyFactory() throws ClassNotFoundException {
-
-		return new CachingIsNewStrategyFactory(new MappingContextIsNewStrategyFactory(
-				new PersistentEntities(Arrays.<MappingContext<?, ?>> asList(new MappingContext[] { mongoMappingContext() }))));
-	}
-
-	/**
-	 * Register custom {@link Converter}s in a {@link CustomConversions} object if required. These
-	 * {@link CustomConversions} will be registered with the {@link #mappingMongoConverter()} and
-	 * {@link #mongoMappingContext()}. Returns an empty {@link CustomConversions} instance by default.
-	 *
-	 * @return must not be {@literal null}.
-	 */
-	@Bean
-	public CustomConversions customConversions() {
-		return new CustomConversions(Collections.emptyList());
-	}
-
-	/**
-	 * Scans the mapping base package for classes annotated with {@link Document}. By default, it scans for entities in
-	 * all packages returned by {@link #getMappingBasePackages()}.
-	 *
-	 * @see #getMappingBasePackages()
-	 * @return
-	 * @throws ClassNotFoundException
-	 */
-	protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
-
-		Set<Class<?>> initialEntitySet = new HashSet<Class<?>>();
-
-		for (String basePackage : getMappingBasePackages()) {
-			initialEntitySet.addAll(scanForEntities(basePackage));
-		}
-
-		return initialEntitySet;
-	}
-
-	/**
-	 * Scans the given base package for entities, i.e. MongoDB specific types annotated with {@link Document} and
-	 * {@link Persistent}.
-	 *
-	 * @param basePackage must not be {@literal null}.
-	 * @return
-	 * @throws ClassNotFoundException
-	 * @since 1.10
-	 */
-	protected Set<Class<?>> scanForEntities(String basePackage) throws ClassNotFoundException {
-
-		if (!StringUtils.hasText(basePackage)) {
-			return Collections.emptySet();
-		}
-
-		Set<Class<?>> initialEntitySet = new HashSet<Class<?>>();
-
-		if (StringUtils.hasText(basePackage)) {
-
-			ClassPathScanningCandidateComponentProvider componentProvider = new ClassPathScanningCandidateComponentProvider(
-					false);
-			componentProvider.addIncludeFilter(new AnnotationTypeFilter(Document.class));
-			componentProvider.addIncludeFilter(new AnnotationTypeFilter(Persistent.class));
-
-			for (BeanDefinition candidate : componentProvider.findCandidateComponents(basePackage)) {
-
-				initialEntitySet
-						.add(ClassUtils.forName(candidate.getBeanClassName(), MongoConfigurationSupport.class.getClassLoader()));
-			}
-		}
-
-		return initialEntitySet;
-	}
-
-	/**
-	 * Configures whether to abbreviate field names for domain objects by configuring a
-	 * {@link CamelCaseAbbreviatingFieldNamingStrategy} on the {@link MongoMappingContext} instance created. For advanced
-	 * customization needs, consider overriding {@link #mappingMongoConverter()}.
-	 *
-	 * @return
-	 */
-	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/MongoDbFactoryParser.java

@@ -32,7 +32,7 @@ import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.data.authentication.UserCredentials;
 import org.springframework.data.config.BeanComponentDefinitionBuilder;
-import org.springframework.data.mongodb.core.MongoClientFactoryBean;
+import org.springframework.data.mongodb.core.MongoFactoryBean;
 import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
 import org.springframework.util.StringUtils;
 import org.w3c.dom.Element;
@@ -131,7 +131,7 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 	 */
 	private BeanDefinition registerMongoBeanDefinition(Element element, ParserContext parserContext) {
 
-		BeanDefinitionBuilder mongoBuilder = BeanDefinitionBuilder.genericBeanDefinition(MongoClientFactoryBean.class);
+		BeanDefinitionBuilder mongoBuilder = BeanDefinitionBuilder.genericBeanDefinition(MongoFactoryBean.class);
 		setPropertyValue(mongoBuilder, element, "host");
 		setPropertyValue(mongoBuilder, element, "port");
 

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

@@ -21,7 +21,7 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.data.util.Pair;
 
-import com.mongodb.bulk.BulkWriteResult;
+import com.mongodb.BulkWriteResult;
 
 /**
  * Bulk operations for insert/update/remove actions on a collection. These bulks operation are available since MongoDB
@@ -38,7 +38,7 @@ public interface BulkOperations {
 	/**
 	 * Mode for bulk operation.
 	 **/
-	enum BulkMode {
+	public enum BulkMode {
 
 		/** Perform bulk operations in sequence. The first error will cancel processing. */
 		ORDERED,

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2016 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,30 +15,12 @@
  */
 package org.springframework.data.mongodb.core;
 
-import org.bson.Document;
+import com.mongodb.DBCollection;
+import com.mongodb.MongoException;
 import org.springframework.dao.DataAccessException;
 
-import com.mongodb.MongoException;
-import com.mongodb.client.MongoCollection;
-
-/**
- * Callback interface for executing actions against a {@link MongoCollection}
- *
- * @author Mark Pollak
- * @author Grame Rocher
- * @author Oliver Gierke
- * @author John Brisbin
- * @auhtor Christoph Strobl
- * @since 1.0
- */
 public interface CollectionCallback<T> {
 
-	/**
-	 * @param collection never {@literal null}.
-	 * @return
-	 * @throws MongoException
-	 * @throws DataAccessException
-	 */
-	T doInCollection(MongoCollection<Document> collection) throws MongoException, DataAccessException;
+	T doInCollection(DBCollection collection) throws MongoException, DataAccessException;
 
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2010 the original author 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,15 +15,12 @@
  */
 package org.springframework.data.mongodb.core;
 
-import org.bson.Document;
-
-import com.mongodb.client.FindIterable;
+import com.mongodb.DBCursor;
 
 /**
- * Simple callback interface to allow customization of a {@link FindIterable}.
+ * Simple callback interface to allow customization of a {@link DBCursor}.
  * 
  * @author Oliver Gierke
- * @author Christoph Strobl
  */
 interface CursorPreparer {
 
@@ -32,5 +29,5 @@ interface CursorPreparer {
 	 * 
 	 * @param cursor
 	 */
-	FindIterable<Document> prepare(FindIterable<Document> cursor);
+	DBCursor prepare(DBCursor cursor);
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2016 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,16 +15,11 @@
  */
 package org.springframework.data.mongodb.core;
 
+import com.mongodb.DB;
+import com.mongodb.MongoException;
 import org.springframework.dao.DataAccessException;
 
-import com.mongodb.MongoException;
-import com.mongodb.client.MongoDatabase;
-
-/**
- *
- * @param <T>
- */
 public interface DbCallback<T> {
 
-	T doInDB(MongoDatabase db) throws MongoException, DataAccessException;
+	T doInDB(DB db) throws MongoException, DataAccessException;
 }

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

@@ -15,11 +15,9 @@
  */
 package org.springframework.data.mongodb.core;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.bson.Document;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.mongodb.core.query.Query;
@@ -28,22 +26,18 @@ import org.springframework.data.util.Pair;
 import org.springframework.util.Assert;
 
 import com.mongodb.BulkWriteException;
+import com.mongodb.BulkWriteOperation;
+import com.mongodb.BulkWriteRequestBuilder;
+import com.mongodb.BulkWriteResult;
+import com.mongodb.DBCollection;
+import com.mongodb.DBObject;
 import com.mongodb.WriteConcern;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.model.BulkWriteOptions;
-import com.mongodb.client.model.DeleteManyModel;
-import com.mongodb.client.model.InsertOneModel;
-import com.mongodb.client.model.UpdateManyModel;
-import com.mongodb.client.model.UpdateOneModel;
-import com.mongodb.client.model.UpdateOptions;
-import com.mongodb.client.model.WriteModel;
 
 /**
  * Default implementation for {@link BulkOperations}.
  * 
  * @author Tobias Trelle
  * @author Oliver Gierke
- * @author Christoph Strobl
  * @since 1.9
  */
 class DefaultBulkOperations implements BulkOperations {
@@ -51,14 +45,13 @@ class DefaultBulkOperations implements BulkOperations {
 	private final MongoOperations mongoOperations;
 	private final BulkMode bulkMode;
 	private final String collectionName;
+	private final Class<?> entityType;
 
 	private PersistenceExceptionTranslator exceptionTranslator;
 	private WriteConcernResolver writeConcernResolver;
 	private WriteConcern defaultWriteConcern;
 
-	private BulkWriteOptions bulkOptions;
-
-	List<WriteModel<Document>> models = new ArrayList<WriteModel<Document>>();
+	private BulkWriteOperation bulk;
 
 	/**
 	 * Creates a new {@link DefaultBulkOperations} for the given {@link MongoOperations}, {@link BulkMode}, collection
@@ -79,11 +72,12 @@ class DefaultBulkOperations implements BulkOperations {
 		this.mongoOperations = mongoOperations;
 		this.bulkMode = bulkMode;
 		this.collectionName = collectionName;
+		this.entityType = entityType;
 
 		this.exceptionTranslator = new MongoExceptionTranslator();
 		this.writeConcernResolver = DefaultWriteConcernResolver.INSTANCE;
 
-		this.bulkOptions = initBulkOperation();
+		this.bulk = initBulkOperation();
 	}
 
 	/**
@@ -123,7 +117,7 @@ class DefaultBulkOperations implements BulkOperations {
 
 		Assert.notNull(document, "Document must not be null!");
 
-		models.add(new InsertOneModel<Document>((Document) mongoOperations.getConverter().convertToMongoType(document)));
+		bulk.insert((DBObject) mongoOperations.getConverter().convertToMongoType(document));
 		return this;
 	}
 
@@ -235,7 +229,8 @@ class DefaultBulkOperations implements BulkOperations {
 
 		Assert.notNull(query, "Query must not be null!");
 
-		models.add(new DeleteManyModel<Document>(query.getQueryObject()));
+		bulk.find(query.getQueryObject()).remove();
+
 		return this;
 	}
 
@@ -260,16 +255,15 @@ class DefaultBulkOperations implements BulkOperations {
 	 * @see org.springframework.data.mongodb.core.BulkOperations#executeBulk()
 	 */
 	@Override
-	public com.mongodb.bulk.BulkWriteResult execute() {
+	public BulkWriteResult execute() {
+
+		MongoAction action = new MongoAction(defaultWriteConcern, MongoActionOperation.BULK, collectionName, entityType,
+				null, null);
+		WriteConcern writeConcern = writeConcernResolver.resolve(action);
 
 		try {
 
-			MongoCollection<Document> collection = mongoOperations.getCollection(collectionName);
-			if (defaultWriteConcern != null) {
-				collection = collection.withWriteConcern(defaultWriteConcern);
-			}
-
-			return collection.bulkWrite(models, bulkOptions);
+			return writeConcern == null ? bulk.execute() : bulk.execute(writeConcern);
 
 		} catch (BulkWriteException o_O) {
 
@@ -277,7 +271,7 @@ class DefaultBulkOperations implements BulkOperations {
 			throw toThrow == null ? o_O : toThrow;
 
 		} finally {
-			this.bulkOptions = initBulkOperation();
+			this.bulk = initBulkOperation();
 		}
 	}
 
@@ -295,26 +289,39 @@ class DefaultBulkOperations implements BulkOperations {
 		Assert.notNull(query, "Query must not be null!");
 		Assert.notNull(update, "Update must not be null!");
 
-		UpdateOptions options = new UpdateOptions();
-		options.upsert(upsert);
+		BulkWriteRequestBuilder builder = bulk.find(query.getQueryObject());
+
+		if (upsert) {
+
+			if (multi) {
+				builder.upsert().update(update.getUpdateObject());
+			} else {
+				builder.upsert().updateOne(update.getUpdateObject());
+			}
 
-		if (multi) {
-			models.add(new UpdateManyModel<Document>(query.getQueryObject(), update.getUpdateObject(), options));
 		} else {
-			models.add(new UpdateOneModel<Document>(query.getQueryObject(), update.getUpdateObject(), options));
+
+			if (multi) {
+				builder.update(update.getUpdateObject());
+			} else {
+				builder.updateOne(update.getUpdateObject());
+			}
 		}
+
 		return this;
 	}
 
-	private final BulkWriteOptions initBulkOperation() {
+	private final BulkWriteOperation initBulkOperation() {
+
+		DBCollection collection = mongoOperations.getCollection(collectionName);
 
-		BulkWriteOptions options = new BulkWriteOptions();
 		switch (bulkMode) {
 			case ORDERED:
-				return options.ordered(true);
+				return collection.initializeOrderedBulkOperation();
 			case UNORDERED:
-				return options.ordered(false);
+				return collection.initializeUnorderedBulkOperation();
 		}
+
 		throw new IllegalStateException("BulkMode was null!");
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2015 the original author 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,22 +15,22 @@
  */
 package org.springframework.data.mongodb.core;
 
-import static org.springframework.data.mongodb.core.MongoTemplate.*;
+import static org.springframework.data.domain.Sort.Direction.*;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 
-import org.bson.Document;
 import org.springframework.dao.DataAccessException;
-import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.index.IndexDefinition;
+import org.springframework.data.mongodb.core.index.IndexField;
 import org.springframework.data.mongodb.core.index.IndexInfo;
 import org.springframework.util.Assert;
 
+import com.mongodb.DBCollection;
+import com.mongodb.DBObject;
 import com.mongodb.MongoException;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.MongoCursor;
-import com.mongodb.client.model.IndexOptions;
 
 /**
  * Default implementation of {@link IndexOperations}.
@@ -39,25 +39,28 @@ import com.mongodb.client.model.IndexOptions;
  * @author Oliver Gierke
  * @author Komi Innocent
  * @author Christoph Strobl
- * @author Mark Paluch
  */
 public class DefaultIndexOperations implements IndexOperations {
 
-	private final MongoDbFactory mongoDbFactory;
+	private static final Double ONE = Double.valueOf(1);
+	private static final Double MINUS_ONE = Double.valueOf(-1);
+	private static final Collection<String> TWO_D_IDENTIFIERS = Arrays.asList("2d", "2dsphere");
+
+	private final MongoOperations mongoOperations;
 	private final String collectionName;
 
 	/**
 	 * Creates a new {@link DefaultIndexOperations}.
 	 * 
-	 * @param mongoDbFactory must not be {@literal null}.
+	 * @param mongoOperations must not be {@literal null}.
 	 * @param collectionName must not be {@literal null}.
 	 */
-	public DefaultIndexOperations(MongoDbFactory mongoDbFactory, String collectionName) {
+	public DefaultIndexOperations(MongoOperations mongoOperations, String collectionName) {
 
-		Assert.notNull(mongoDbFactory, "MongoDbFactory must not be null!");
+		Assert.notNull(mongoOperations, "MongoOperations must not be null!");
 		Assert.notNull(collectionName, "Collection name can not be null!");
 
-		this.mongoDbFactory = mongoDbFactory;
+		this.mongoOperations = mongoOperations;
 		this.collectionName = collectionName;
 	}
 
@@ -65,18 +68,17 @@ public class DefaultIndexOperations implements IndexOperations {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.IndexOperations#ensureIndex(org.springframework.data.mongodb.core.index.IndexDefinition)
 	 */
-	public String ensureIndex(final IndexDefinition indexDefinition) {
-
-		return execute(collection -> {
-
-			Document indexOptions = indexDefinition.getIndexOptions();
-
-			if (indexOptions != null) {
-
-				IndexOptions ops = IndexConverters.indexDefinitionToIndexOptionsConverter().convert(indexDefinition);
-				return collection.createIndex(indexDefinition.getIndexKeys(), ops);
+	public void ensureIndex(final IndexDefinition indexDefinition) {
+		mongoOperations.execute(collectionName, new CollectionCallback<Object>() {
+			public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+				DBObject indexOptions = indexDefinition.getIndexOptions();
+				if (indexOptions != null) {
+					collection.createIndex(indexDefinition.getIndexKeys(), indexOptions);
+				} else {
+					collection.createIndex(indexDefinition.getIndexKeys());
+				}
+				return null;
 			}
-			return collection.createIndex(indexDefinition.getIndexKeys());
 		});
 	}
 
@@ -85,10 +87,11 @@ public class DefaultIndexOperations implements IndexOperations {
 	 * @see org.springframework.data.mongodb.core.IndexOperations#dropIndex(java.lang.String)
 	 */
 	public void dropIndex(final String name) {
-
-		execute(collection -> {
-			collection.dropIndex(name);
-			return null;
+		mongoOperations.execute(collectionName, new CollectionCallback<Void>() {
+			public Void doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+				collection.dropIndex(name);
+				return null;
+			}
 		});
 
 	}
@@ -101,46 +104,80 @@ public class DefaultIndexOperations implements IndexOperations {
 		dropIndex("*");
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.IndexOperations#resetIndexCache()
+	 */
+	@Deprecated
+	public void resetIndexCache() {
+		mongoOperations.execute(collectionName, new CollectionCallback<Void>() {
+			public Void doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+
+				ReflectiveDBCollectionInvoker.resetIndexCache(collection);
+				return null;
+			}
+		});
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.IndexOperations#getIndexInfo()
 	 */
 	public List<IndexInfo> getIndexInfo() {
 
-		return execute(new CollectionCallback<List<IndexInfo>>() {
-
-			public List<IndexInfo> doInCollection(MongoCollection<Document> collection)
-					throws MongoException, DataAccessException {
-
-				MongoCursor<Document> cursor = collection.listIndexes(Document.class).iterator();
-				return getIndexData(cursor);
+		return mongoOperations.execute(collectionName, new CollectionCallback<List<IndexInfo>>() {
+			public List<IndexInfo> doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+				List<DBObject> dbObjectList = collection.getIndexInfo();
+				return getIndexData(dbObjectList);
 			}
 
-			private List<IndexInfo> getIndexData(MongoCursor<Document> cursor) {
+			private List<IndexInfo> getIndexData(List<DBObject> dbObjectList) {
 
 				List<IndexInfo> indexInfoList = new ArrayList<IndexInfo>();
 
-				while (cursor.hasNext()) {
+				for (DBObject ix : dbObjectList) {
 
-					Document ix = cursor.next();
-					IndexInfo indexInfo = IndexConverters.documentToIndexInfoConverter().convert(ix);
-					indexInfoList.add(indexInfo);
+					DBObject keyDbObject = (DBObject) ix.get("key");
+					int numberOfElements = keyDbObject.keySet().size();
+
+					List<IndexField> indexFields = new ArrayList<IndexField>(numberOfElements);
+
+					for (String key : keyDbObject.keySet()) {
+
+						Object value = keyDbObject.get(key);
+
+						if (TWO_D_IDENTIFIERS.contains(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());
+
+							if (ONE.equals(keyValue)) {
+								indexFields.add(IndexField.create(key, ASC));
+							} else if (MINUS_ONE.equals(keyValue)) {
+								indexFields.add(IndexField.create(key, DESC));
+							}
+						}
+					}
+
+					String name = ix.get("name").toString();
+
+					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));
 				}
 
 				return indexInfoList;
 			}
 		});
 	}
-
-	public <T> T execute(CollectionCallback<T> callback) {
-
-		Assert.notNull(callback);
-
-		try {
-			MongoCollection<Document> collection = mongoDbFactory.getDb().getCollection(collectionName);
-			return callback.doInCollection(collection);
-		} catch (RuntimeException e) {
-			throw potentiallyConvertRuntimeException(e, mongoDbFactory.getExceptionTranslator());
-		}
-	}
 }

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

@@ -1,45 +0,0 @@
-/*
- * Copyright 2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import org.springframework.data.mongodb.MongoDbFactory;
-
-/**
- * {@link IndexOperationsProvider} to obtain {@link IndexOperations} from a given {@link MongoDbFactory}. TODO: Review
- * me
- *
- * @author Mark Paluch
- * @since 2.0
- */
-class DefaultIndexOperationsProvider implements IndexOperationsProvider {
-
-	private final MongoDbFactory mongoDbFactory;
-
-	/**
-	 * @param mongoDbFactory must not be {@literal null}.
-	 */
-	DefaultIndexOperationsProvider(MongoDbFactory mongoDbFactory) {
-		this.mongoDbFactory = mongoDbFactory;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.IndexOperationsProvider#reactiveIndexOps(java.lang.String)
-	 */
-	@Override
-	public IndexOperations indexOps(String collectionName) {
-		return new DefaultIndexOperations(mongoDbFactory, collectionName);
-	}
-}

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

@@ -1,102 +0,0 @@
-/*
- * Copyright 2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import org.bson.Document;
-import org.springframework.data.mongodb.core.index.IndexDefinition;
-import org.springframework.data.mongodb.core.index.IndexInfo;
-import org.springframework.util.Assert;
-
-import com.mongodb.reactivestreams.client.ListIndexesPublisher;
-
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-/**
- * Default implementation of {@link IndexOperations}.
- *
- * @author Mark Paluch
- * @since 1.11
- */
-public class DefaultReactiveIndexOperations implements ReactiveIndexOperations {
-
-	private final ReactiveMongoOperations mongoOperations;
-	private final String collectionName;
-
-	/**
-	 * Creates a new {@link DefaultReactiveIndexOperations}.
-	 *
-	 * @param mongoOperations must not be {@literal null}.
-	 * @param collectionName must not be {@literal null}.
-	 */
-	public DefaultReactiveIndexOperations(ReactiveMongoOperations mongoOperations, String collectionName) {
-
-		Assert.notNull(mongoOperations, "ReactiveMongoOperations must not be null!");
-		Assert.notNull(collectionName, "Collection must not be null!");
-
-		this.mongoOperations = mongoOperations;
-		this.collectionName = collectionName;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveIndexOperations#ensureIndex(org.springframework.data.mongodb.core.index.IndexDefinition)
-	 */
-	public Mono<String> ensureIndex(final IndexDefinition indexDefinition) {
-
-		return mongoOperations.execute(collectionName, (ReactiveCollectionCallback<String>) collection -> {
-
-			Document indexOptions = indexDefinition.getIndexOptions();
-
-			if (indexOptions != null) {
-				return collection.createIndex(indexDefinition.getIndexKeys(),
-						IndexConverters.indexDefinitionToIndexOptionsConverter().convert(indexDefinition));
-			}
-
-			return collection.createIndex(indexDefinition.getIndexKeys());
-		}).next();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveIndexOperations#dropIndex(java.lang.String)
-	 */
-	public Mono<Void> dropIndex(final String name) {
-
-		return mongoOperations.execute(collectionName, collection -> {
-
-			return Mono.from(collection.dropIndex(name));
-		}).flatMap(success -> Mono.<Void>empty()).next();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveIndexOperations#dropAllIndexes()
-	 */
-	public Mono<Void> dropAllIndexes() {
-		return dropIndex("*");
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveIndexOperations#getIndexInfo()
-	 */
-	public Flux<IndexInfo> getIndexInfo() {
-
-		return mongoOperations.execute(collectionName, collection -> {
-
-			ListIndexesPublisher<Document> indexesPublisher = collection.listIndexes(Document.class);
-
-			return Flux.from(indexesPublisher).map(IndexConverters.documentToIndexInfoConverter()::convert);
-		});
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2015 the original author 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,11 @@ import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.bson.Document;
 import org.bson.types.ObjectId;
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.mongodb.core.script.ExecutableMongoScript;
@@ -36,9 +34,8 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
-import com.mongodb.BasicDBList;
+import com.mongodb.DB;
 import com.mongodb.MongoException;
-import com.mongodb.client.MongoDatabase;
 
 /**
  * Default implementation of {@link ScriptOperations} capable of saving and executing {@link ServerSideJavaScript}.
@@ -100,13 +97,8 @@ class DefaultScriptOperations implements ScriptOperations {
 		return mongoOperations.execute(new DbCallback<Object>() {
 
 			@Override
-			public Object doInDB(MongoDatabase db) throws MongoException, DataAccessException {
-
-				Document command = new Document("$eval", script.getCode());
-				BasicDBList commandArgs = new BasicDBList();
-				commandArgs.addAll(Arrays.asList(convertScriptArgs(false, args)));
-				command.append("args", commandArgs);
-				return db.runCommand(command).get("retval");
+			public Object doInDB(DB db) throws MongoException, DataAccessException {
+				return db.eval(script.getCode(), convertScriptArgs(args));
 			}
 		});
 	}
@@ -123,10 +115,8 @@ class DefaultScriptOperations implements ScriptOperations {
 		return mongoOperations.execute(new DbCallback<Object>() {
 
 			@Override
-			public Object doInDB(MongoDatabase db) throws MongoException, DataAccessException {
-
-				return db.runCommand(new Document("eval", String.format("%s(%s)", scriptName, convertAndJoinScriptArgs(args))))
-						.get("retval");
+			public Object doInDB(DB db) throws MongoException, DataAccessException {
+				return db.eval(String.format("%s(%s)", scriptName, convertAndJoinScriptArgs(args)));
 			}
 		});
 	}
@@ -165,7 +155,7 @@ class DefaultScriptOperations implements ScriptOperations {
 		return scriptNames;
 	}
 
-	private Object[] convertScriptArgs(boolean quote, Object... args) {
+	private Object[] convertScriptArgs(Object... args) {
 
 		if (ObjectUtils.isEmpty(args)) {
 			return args;
@@ -174,15 +164,15 @@ class DefaultScriptOperations implements ScriptOperations {
 		List<Object> convertedValues = new ArrayList<Object>(args.length);
 
 		for (Object arg : args) {
-			convertedValues.add(arg instanceof String && quote ? String.format("'%s'", arg)
-					: this.mongoOperations.getConverter().convertToMongoType(arg));
+			convertedValues.add(arg instanceof String ? String.format("'%s'", arg) : this.mongoOperations.getConverter()
+					.convertToMongoType(arg));
 		}
 
 		return convertedValues.toArray();
 	}
 
 	private String convertAndJoinScriptArgs(Object... args) {
-		return ObjectUtils.isEmpty(args) ? "" : StringUtils.arrayToCommaDelimitedString(convertScriptArgs(true, args));
+		return ObjectUtils.isEmpty(args) ? "" : StringUtils.arrayToCommaDelimitedString(convertScriptArgs(args));
 	}
 
 	/**

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2016 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,26 +15,24 @@
  */
 package org.springframework.data.mongodb.core;
 
-import org.bson.Document;
 import org.springframework.dao.DataAccessException;
 
+import com.mongodb.DBObject;
 import com.mongodb.MongoException;
 
 /**
  * An interface used by {@link MongoTemplate} for processing documents returned from a MongoDB query on a per-document
  * basis. Implementations of this interface perform the actual work of prcoessing each document but don't need to worry
- * about exception handling. {@MongoException}s will be caught and translated by the calling MongoTemplate An
- * DocumentCallbackHandler is typically stateful: It keeps the result state within the object, to be available later for
- * later inspection.
+ * about exception handling. {@MongoException}s will be caught and translated by the calling
+ * MongoTemplate
+ * 
+ * An DocumentCallbackHandler is typically stateful: It keeps the result state within the object, to be available later
+ * for later inspection.
  * 
  * @author Mark Pollack
- * @author Grame Rocher
- * @author Oliver Gierke
- * @author John Brisbin
- * @author Christoph Strobl
- * @since 1.0
+ * 
  */
 public interface DocumentCallbackHandler {
 
-	void processDocument(Document document) throws MongoException, DataAccessException;
+	void processDocument(DBObject dbObject) throws MongoException, DataAccessException;
 }

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

@@ -1,34 +0,0 @@
-/*
- * Copyright 2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import com.mongodb.DBCursor;
-import com.mongodb.reactivestreams.client.FindPublisher;
-
-/**
- * Simple callback interface to allow customization of a {@link FindPublisher}.
- *
- * @author Mark Paluch
- */
-interface FindPublisherPreparer {
-
-	/**
-	 * Prepare the given cursor (apply limits, skips and so on). Returns the prepared cursor.
-	 *
-	 * @param cursor
-	 */
-	<T> FindPublisher<T> prepare(FindPublisher<T> findPublisher);
-}

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

@@ -15,29 +15,29 @@
  */
 package org.springframework.data.mongodb.core;
 
-import org.bson.Document;
 import org.springframework.util.Assert;
 
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
 /**
  * Value object to mitigate different representations of geo command execution results in MongoDB.
  * 
  * @author Oliver Gierke
- * @author Christoph Strobl
  * @soundtrack Fruitcake - Jeff Coffin (The Inside of the Outside)
- * @since 1.9
  */
 class GeoCommandStatistics {
 
-	private static final GeoCommandStatistics NONE = new GeoCommandStatistics(new Document());
+	private static final GeoCommandStatistics NONE = new GeoCommandStatistics(new BasicDBObject());
 
-	private final Document source;
+	private final DBObject source;
 
 	/**
 	 * Creates a new {@link GeoCommandStatistics} instance with the given source document.
 	 * 
 	 * @param source must not be {@literal null}.
 	 */
-	private GeoCommandStatistics(Document source) {
+	private GeoCommandStatistics(DBObject source) {
 
 		Assert.notNull(source, "Source document must not be null!");
 		this.source = source;
@@ -49,12 +49,12 @@ class GeoCommandStatistics {
 	 * @param commandResult must not be {@literal null}.
 	 * @return
 	 */
-	public static GeoCommandStatistics from(Document commandResult) {
+	public static GeoCommandStatistics from(DBObject commandResult) {
 
 		Assert.notNull(commandResult, "Command result must not be null!");
 
 		Object stats = commandResult.get("stats");
-		return stats == null ? NONE : new GeoCommandStatistics((Document) stats);
+		return stats == null ? NONE : new GeoCommandStatistics((DBObject) stats);
 	}
 
 	/**

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

@@ -1,166 +0,0 @@
-/*
- * Copyright 2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.data.mongodb.core;
-
-import static org.springframework.data.domain.Sort.Direction.*;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import org.bson.Document;
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.data.mongodb.core.index.IndexDefinition;
-import org.springframework.data.mongodb.core.index.IndexField;
-import org.springframework.data.mongodb.core.index.IndexInfo;
-import org.springframework.util.ObjectUtils;
-
-import com.mongodb.client.model.IndexOptions;
-
-/**
- * {@link Converter Converters} for index-related MongoDB documents/types.
- *
- * @author Mark Paluch
- * @author Christoph Strobl
- * @since 2.0
- */
-abstract class IndexConverters {
-
-	private static final Converter<IndexDefinition, IndexOptions> DEFINITION_TO_MONGO_INDEX_OPTIONS;
-	private static final Converter<Document, IndexInfo> DOCUMENT_INDEX_INFO;
-
-	private static final Double ONE = Double.valueOf(1);
-	private static final Double MINUS_ONE = Double.valueOf(-1);
-	private static final Collection<String> TWO_D_IDENTIFIERS = Arrays.asList("2d", "2dsphere");
-
-	static {
-
-		DEFINITION_TO_MONGO_INDEX_OPTIONS = getIndexDefinitionIndexOptionsConverter();
-		DOCUMENT_INDEX_INFO = getDocumentIndexInfoConverter();
-	}
-
-	private IndexConverters() {
-
-	}
-
-	static Converter<IndexDefinition, IndexOptions> indexDefinitionToIndexOptionsConverter() {
-		return DEFINITION_TO_MONGO_INDEX_OPTIONS;
-	}
-
-	static Converter<Document, IndexInfo> documentToIndexInfoConverter() {
-		return DOCUMENT_INDEX_INFO;
-	}
-
-	private static Converter<IndexDefinition, IndexOptions> getIndexDefinitionIndexOptionsConverter() {
-
-		return indexDefinition -> {
-
-			Document indexOptions = indexDefinition.getIndexOptions();
-			IndexOptions ops = new IndexOptions();
-
-			if (indexOptions.containsKey("name")) {
-				ops = ops.name(indexOptions.get("name").toString());
-			}
-			if (indexOptions.containsKey("unique")) {
-				ops = ops.unique((Boolean) indexOptions.get("unique"));
-			}
-			if (indexOptions.containsKey("sparse")) {
-				ops = ops.sparse((Boolean) indexOptions.get("sparse"));
-			}
-			if (indexOptions.containsKey("background")) {
-				ops = ops.background((Boolean) indexOptions.get("background"));
-			}
-			if (indexOptions.containsKey("expireAfterSeconds")) {
-				ops = ops.expireAfter((Long) indexOptions.get("expireAfterSeconds"), TimeUnit.SECONDS);
-			}
-			if (indexOptions.containsKey("min")) {
-				ops = ops.min(((Number) indexOptions.get("min")).doubleValue());
-			}
-			if (indexOptions.containsKey("max")) {
-				ops = ops.max(((Number) indexOptions.get("max")).doubleValue());
-			}
-			if (indexOptions.containsKey("bits")) {
-				ops = ops.bits((Integer) indexOptions.get("bits"));
-			}
-			if (indexOptions.containsKey("bucketSize")) {
-				ops = ops.bucketSize(((Number) indexOptions.get("bucketSize")).doubleValue());
-			}
-			if (indexOptions.containsKey("default_language")) {
-				ops = ops.defaultLanguage(indexOptions.get("default_language").toString());
-			}
-			if (indexOptions.containsKey("language_override")) {
-				ops = ops.languageOverride(indexOptions.get("language_override").toString());
-			}
-			if (indexOptions.containsKey("weights")) {
-				ops = ops.weights((org.bson.Document) indexOptions.get("weights"));
-			}
-
-			for (String key : indexOptions.keySet()) {
-				if (ObjectUtils.nullSafeEquals("2dsphere", indexOptions.get(key))) {
-					ops = ops.sphereVersion(2);
-				}
-			}
-
-			return ops;
-		};
-	}
-
-	private static Converter<Document, IndexInfo> getDocumentIndexInfoConverter() {
-
-		return ix -> {
-			Document keyDocument = (Document) ix.get("key");
-			int numberOfElements = keyDocument.keySet().size();
-
-			List<IndexField> indexFields = new ArrayList<IndexField>(numberOfElements);
-
-			for (String key : keyDocument.keySet()) {
-
-				Object value = keyDocument.get(key);
-
-				if (TWO_D_IDENTIFIERS.contains(value)) {
-					indexFields.add(IndexField.geo(key));
-				} else if ("text".equals(value)) {
-
-					Document weights = (Document) 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());
-
-					if (ONE.equals(keyValue)) {
-						indexFields.add(IndexField.create(key, ASC));
-					} else if (MINUS_ONE.equals(keyValue)) {
-						indexFields.add(IndexField.create(key, DESC));
-					}
-				}
-			}
-
-			String name = ix.get("name").toString();
-
-			boolean unique = ix.containsKey("unique") ? (Boolean) ix.get("unique") : false;
-			boolean sparse = ix.containsKey("sparse") ? (Boolean) ix.get("sparse") : false;
-
-			String language = ix.containsKey("default_language") ? (String) ix.get("default_language") : "";
-			return new IndexInfo(indexFields, name, unique, sparse, language);
-		};
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2015 the original author 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,7 @@ public interface IndexOperations {
 	 * 
 	 * @param indexDefinition must not be {@literal null}.
 	 */
-	String ensureIndex(IndexDefinition indexDefinition);
+	void ensureIndex(IndexDefinition indexDefinition);
 
 	/**
 	 * Drops an index from this collection.
@@ -49,6 +49,15 @@ public interface IndexOperations {
 	 */
 	void dropAllIndexes();
 
+	/**
+	 * Clears all indices that have not yet been applied to this collection.
+	 * 
+	 * @deprecated since 1.7. The MongoDB Java driver version 3.0 does no longer support reseting the index cache.
+	 * @throws {@link UnsupportedOperationException} when used with MongoDB Java driver version 3.0.
+	 */
+	@Deprecated
+	void resetIndexCache();
+
 	/**
 	 * Returns the index information on the collection.
 	 * 

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

@@ -1,66 +0,0 @@
-/*
- * Copyright 2016. the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.data.mongodb.core;
-
-import java.util.List;
-
-import org.springframework.data.mongodb.core.index.IndexDefinition;
-import org.springframework.data.mongodb.core.index.IndexInfo;
-import org.springframework.util.Assert;
-
-/**
- * Adapter for creating synchronous {@link IndexOperations}.
- *
- * @author Christoph Strobl
- * @since 2.0
- */
-public interface IndexOperationsAdapter extends IndexOperations {
-
-	/**
-	 * Obtain a blocking variant of {@link IndexOperations} wrapping {@link ReactiveIndexOperations}.
-	 *
-	 * @param reactiveIndexOperations must not be {@literal null}.
-	 * @return never {@literal null}
-	 */
-	static IndexOperationsAdapter blocking(ReactiveIndexOperations reactiveIndexOperations) {
-
-		Assert.notNull(reactiveIndexOperations, "ReactiveIndexOperations must not be null!");
-
-		return new IndexOperationsAdapter() {
-
-			@Override
-			public String ensureIndex(IndexDefinition indexDefinition) {
-				return reactiveIndexOperations.ensureIndex(indexDefinition).block();
-			}
-
-			@Override
-			public void dropIndex(String name) {
-				reactiveIndexOperations.dropIndex(name).block();
-			}
-
-			@Override
-			public void dropAllIndexes() {
-				reactiveIndexOperations.dropAllIndexes().block();
-			}
-
-			@Override
-			public List<IndexInfo> getIndexInfo() {
-				return reactiveIndexOperations.getIndexInfo().collectList().block();
-			}
-		};
-	}
-}

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

@@ -1,32 +0,0 @@
-/*
- * Copyright 2016 the original author 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;
-
-/**
- * TODO: Revisit for a better pattern.
- * @author Mark Paluch
- * @since 2.0
- */
-public interface IndexOperationsProvider {
-
-	/**
-	 * Returns the operations that can be performed on indexes
-	 *
-	 * @return index operations on the named collection
-	 */
-	IndexOperations indexOps(String collectionName);
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 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.
@@ -15,9 +15,9 @@
  */
 package org.springframework.data.mongodb.core;
 
-import org.bson.Document;
 import org.springframework.util.Assert;
 
+import com.mongodb.DBObject;
 import com.mongodb.WriteConcern;
 
 /**
@@ -31,7 +31,6 @@ import com.mongodb.WriteConcern;
  * 
  * @author Mark Pollack
  * @author Oliver Gierke
- * @author Christoph Strobl
  */
 public class MongoAction {
 
@@ -39,8 +38,8 @@ public class MongoAction {
 	private final WriteConcern defaultWriteConcern;
 	private final Class<?> entityType;
 	private final MongoActionOperation mongoActionOperation;
-	private final Document query;
-	private final Document document;
+	private final DBObject query;
+	private final DBObject document;
 
 	/**
 	 * Create an instance of a {@link MongoAction}.
@@ -49,11 +48,11 @@ public class MongoAction {
 	 * @param mongoActionOperation action being taken against the collection
 	 * @param collectionName the collection name, must not be {@literal null} or empty.
 	 * @param entityType the POJO that is being operated against
-	 * @param document the converted Document from the POJO or Spring Update object
-	 * @param query the converted Document from the Spring Query object
+	 * @param document the converted DBObject from the POJO or Spring Update object
+	 * @param query the converted DBObject from the Spring Query object
 	 */
-	public MongoAction(WriteConcern defaultWriteConcern, MongoActionOperation mongoActionOperation, String collectionName,
-			Class<?> entityType, Document document, Document query) {
+	public MongoAction(WriteConcern defaultWriteConcern, MongoActionOperation mongoActionOperation,
+			String collectionName, Class<?> entityType, DBObject document, DBObject query) {
 
 		Assert.hasText(collectionName, "Collection name must not be null or empty!");
 
@@ -73,6 +72,14 @@ public class MongoAction {
 		return defaultWriteConcern;
 	}
 
+	/**
+	 * @deprecated use {@link #getEntityType()} instead.
+	 */
+	@Deprecated
+	public Class<?> getEntityClass() {
+		return entityType;
+	}
+
 	public Class<?> getEntityType() {
 		return entityType;
 	}
@@ -81,11 +88,11 @@ public class MongoAction {
 		return mongoActionOperation;
 	}
 
-	public Document getQuery() {
+	public DBObject getQuery() {
 		return query;
 	}
 
-	public Document getDocument() {
+	public DBObject getDocument() {
 		return document;
 	}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2016 the original author or authors.
+ * Copyright 2010-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.bson.BsonInvalidOperationException;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.dao.DataIntegrityViolationException;
@@ -34,10 +33,7 @@ import org.springframework.data.mongodb.util.MongoDbErrorCodes;
 import org.springframework.util.ClassUtils;
 
 import com.mongodb.BulkWriteException;
-import com.mongodb.MongoBulkWriteException;
 import com.mongodb.MongoException;
-import com.mongodb.MongoServerException;
-import com.mongodb.bulk.BulkWriteError;
 
 /**
  * Simple {@link PersistenceExceptionTranslator} for Mongo. Convert the given runtime exception to an appropriate
@@ -61,7 +57,7 @@ public class MongoExceptionTranslator implements PersistenceExceptionTranslator
 			Arrays.asList("MongoInternalException"));
 
 	private static final Set<String> DATA_INTEGRETY_EXCEPTIONS = new HashSet<String>(
-			Arrays.asList("WriteConcernException", "MongoWriteException", "MongoBulkWriteException"));
+			Arrays.asList("WriteConcernException"));
 
 	/*
 	 * (non-Javadoc)
@@ -71,10 +67,6 @@ public class MongoExceptionTranslator implements PersistenceExceptionTranslator
 
 		// Check for well-known MongoException subclasses.
 
-		if (ex instanceof BsonInvalidOperationException) {
-			throw new InvalidDataAccessApiUsageException(ex.getMessage(), ex);
-		}
-
 		String exception = ClassUtils.getShortName(ClassUtils.getUserClass(ex.getClass()));
 
 		if (DULICATE_KEY_EXCEPTIONS.contains(exception)) {
@@ -90,20 +82,6 @@ public class MongoExceptionTranslator implements PersistenceExceptionTranslator
 		}
 
 		if (DATA_INTEGRETY_EXCEPTIONS.contains(exception)) {
-
-			if (ex instanceof MongoServerException) {
-				if (((MongoServerException) ex).getCode() == 11000) {
-					return new DuplicateKeyException(ex.getMessage(), ex);
-				}
-				if (ex instanceof MongoBulkWriteException) {
-					for (BulkWriteError x : ((MongoBulkWriteException) ex).getWriteErrors()) {
-						if (x.getCode() == 11000) {
-							return new DuplicateKeyException(ex.getMessage(), ex);
-						}
-					}
-				}
-			}
-
 			return new DataIntegrityViolationException(ex.getMessage(), ex);
 		}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2015 the original author or authors.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 
-import org.bson.Document;
 import org.springframework.data.geo.GeoResults;
 import org.springframework.data.mongodb.core.BulkOperations.BulkMode;
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
@@ -37,12 +36,13 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.data.util.CloseableIterator;
 
+import com.mongodb.CommandResult;
 import com.mongodb.Cursor;
 import com.mongodb.DB;
+import com.mongodb.DBCollection;
+import com.mongodb.DBObject;
 import com.mongodb.ReadPreference;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.result.DeleteResult;
-import com.mongodb.client.result.UpdateResult;
+import com.mongodb.WriteResult;
 
 /**
  * Interface that specifies a basic set of MongoDB operations. Implemented by {@link MongoTemplate}. Not often used but
@@ -69,12 +69,12 @@ public interface MongoOperations {
 
 	/**
 	 * Execute the a MongoDB command expressed as a JSON string. This will call the method JSON.parse that is part of the
-	 * MongoDB driver to convert the JSON string to a Document. Any errors that result from executing this command will be
+	 * MongoDB driver to convert the JSON string to a DBObject. Any errors that result from executing this command will be
 	 * converted into Spring's DAO exception hierarchy.
 	 * 
 	 * @param jsonCommand a MongoDB command expressed as a JSON string.
 	 */
-	Document executeCommand(String jsonCommand);
+	CommandResult executeCommand(String jsonCommand);
 
 	/**
 	 * Execute a MongoDB command. Any errors that result from executing this command will be converted into Spring's DAO
@@ -82,7 +82,19 @@ public interface MongoOperations {
 	 * 
 	 * @param command a MongoDB command
 	 */
-	Document executeCommand(Document command);
+	CommandResult executeCommand(DBObject command);
+
+	/**
+	 * Execute a MongoDB command. Any errors that result from executing this command will be converted into Spring's DAO
+	 * exception hierarchy.
+	 * 
+	 * @param command a MongoDB command
+	 * @param options query options to use
+	 * @deprecated since 1.7. Please use {@link #executeCommand(DBObject, ReadPreference)}, as the MongoDB Java driver
+	 *             version 3 no longer supports this operation.
+	 */
+	@Deprecated
+	CommandResult executeCommand(DBObject command, int options);
 
 	/**
 	 * Execute a MongoDB command. Any errors that result from executing this command will be converted into Spring's data
@@ -93,7 +105,7 @@ public interface MongoOperations {
 	 * @return
 	 * @since 1.7
 	 */
-	Document executeCommand(Document command, ReadPreference readPreference);
+	CommandResult executeCommand(DBObject command, ReadPreference readPreference);
 
 	/**
 	 * Execute a MongoDB query and iterate over the query results on a per-document basis with a DocumentCallbackHandler.
@@ -140,6 +152,22 @@ public interface MongoOperations {
 	 */
 	<T> T execute(String collectionName, CollectionCallback<T> action);
 
+	/**
+	 * Executes the given {@link DbCallback} within the same connection to the database so as to ensure consistency in a
+	 * write heavy environment where you may read the data that you wrote. See the comments on {@see <a
+	 * href=http://www.mongodb.org/display/DOCS/Java+Driver+Concurrency>Java Driver Concurrency</a>}
+	 * <p/>
+	 * Allows for returning a result object, that is a domain object or a collection of domain objects.
+	 * 
+	 * @param <T> return type
+	 * @param action callback that specified the MongoDB actions to perform on the DB instance
+	 * @return a result object returned by the action or <tt>null</tt>
+	 * @deprecated since 1.7 as the MongoDB Java driver version 3 does not longer support request boundaries via
+	 *             {@link DB#requestStart()} and {@link DB#requestDone()}.
+	 */
+	@Deprecated
+	<T> T executeInSession(DbCallback<T> action);
+
 	/**
 	 * Executes the given {@link Query} on the entity collection of the specified {@code entityType} backed by a Mongo DB
 	 * {@link Cursor}.
@@ -147,35 +175,20 @@ public interface MongoOperations {
 	 * Returns a {@link CloseableIterator} that wraps the a Mongo DB {@link Cursor} that needs to be closed.
 	 * 
 	 * @param <T> element return type
-	 * @param query must not be {@literal null}.
-	 * @param entityType must not be {@literal null}.
-	 * @return will never be {@literal null}.
+	 * @param query
+	 * @param entityType
+	 * @return
 	 * @since 1.7
 	 */
 	<T> CloseableIterator<T> stream(Query query, Class<T> entityType);
 
-	/**
-	 * Executes the given {@link Query} on the entity collection of the specified {@code entityType} and collection backed
-	 * by a Mongo DB {@link Cursor}.
-	 * <p>
-	 * Returns a {@link CloseableIterator} that wraps the a Mongo DB {@link Cursor} that needs to be closed.
-	 * 
-	 * @param <T> element return type
-	 * @param query must not be {@literal null}.
-	 * @param entityType must not be {@literal null}.
-	 * @param collectionName must not be {@literal null} or empty.
-	 * @return will never be {@literal null}.
-	 * @since 1.10
-	 */
-	<T> CloseableIterator<T> stream(Query query, Class<T> entityType, String collectionName);
-
 	/**
 	 * Create an uncapped collection with a name based on the provided entity class.
 	 * 
 	 * @param entityClass class that determines the collection to create
 	 * @return the created collection
 	 */
-	<T> MongoCollection<Document> createCollection(Class<T> entityClass);
+	<T> DBCollection createCollection(Class<T> entityClass);
 
 	/**
 	 * Create a collection with a name based on the provided entity class using the options.
@@ -184,7 +197,7 @@ public interface MongoOperations {
 	 * @param collectionOptions options to use when creating the collection.
 	 * @return the created collection
 	 */
-	<T> MongoCollection<Document> createCollection(Class<T> entityClass, CollectionOptions collectionOptions);
+	<T> DBCollection createCollection(Class<T> entityClass, CollectionOptions collectionOptions);
 
 	/**
 	 * Create an uncapped collection with the provided name.
@@ -192,7 +205,7 @@ public interface MongoOperations {
 	 * @param collectionName name of the collection
 	 * @return the created collection
 	 */
-	MongoCollection<Document> createCollection(String collectionName);
+	DBCollection createCollection(String collectionName);
 
 	/**
 	 * Create a collection with the provided name and options.
@@ -201,7 +214,7 @@ public interface MongoOperations {
 	 * @param collectionOptions options to use when creating the collection.
 	 * @return the created collection
 	 */
-	MongoCollection<Document> createCollection(String collectionName, CollectionOptions collectionOptions);
+	DBCollection createCollection(String collectionName, CollectionOptions collectionOptions);
 
 	/**
 	 * A set of collection names.
@@ -218,7 +231,7 @@ public interface MongoOperations {
 	 * @param collectionName name of the collection
 	 * @return an existing collection or a newly created one.
 	 */
-	MongoCollection<Document> getCollection(String collectionName);
+	DBCollection getCollection(String collectionName);
 
 	/**
 	 * Check to see if a collection with a name indicated by the entity class exists.
@@ -836,7 +849,7 @@ public interface MongoOperations {
 	 * @param entityClass class that determines the collection to use
 	 * @return the WriteResult which lets you access the results of the previous write.
 	 */
-	UpdateResult upsert(Query query, Update update, Class<?> entityClass);
+	WriteResult upsert(Query query, Update update, Class<?> entityClass);
 
 	/**
 	 * Performs an upsert. If no document is found that matches the query, a new document is created and inserted by
@@ -848,7 +861,7 @@ public interface MongoOperations {
 	 * @param collectionName name of the collection to update the object in
 	 * @return the WriteResult which lets you access the results of the previous write.
 	 */
-	UpdateResult upsert(Query query, Update update, String collectionName);
+	WriteResult upsert(Query query, Update update, String collectionName);
 
 	/**
 	 * Performs an upsert. If no document is found that matches the query, a new document is created and inserted by
@@ -860,7 +873,7 @@ public interface MongoOperations {
 	 * @param collectionName name of the collection to update the object in
 	 * @return the WriteResult which lets you access the results of the previous write.
 	 */
-	UpdateResult upsert(Query query, Update update, Class<?> entityClass, String collectionName);
+	WriteResult upsert(Query query, Update update, Class<?> entityClass, String collectionName);
 
 	/**
 	 * Updates the first object that is found in the collection of the entity class that matches the query document with
@@ -872,7 +885,7 @@ public interface MongoOperations {
 	 * @param entityClass class that determines the collection to use
 	 * @return the WriteResult which lets you access the results of the previous write.
 	 */
-	UpdateResult updateFirst(Query query, Update update, Class<?> entityClass);
+	WriteResult updateFirst(Query query, Update update, Class<?> entityClass);
 
 	/**
 	 * Updates the first object that is found in the specified collection that matches the query document criteria with
@@ -884,7 +897,7 @@ public interface MongoOperations {
 	 * @param collectionName name of the collection to update the object in
 	 * @return the WriteResult which lets you access the results of the previous write.
 	 */
-	UpdateResult updateFirst(Query query, Update update, String collectionName);
+	WriteResult updateFirst(Query query, Update update, String collectionName);
 
 	/**
 	 * Updates the first object that is found in the specified collection that matches the query document criteria with
@@ -897,7 +910,7 @@ public interface MongoOperations {
 	 * @param collectionName name of the collection to update the object in
 	 * @return the WriteResult which lets you access the results of the previous write.
 	 */
-	UpdateResult updateFirst(Query query, Update update, Class<?> entityClass, String collectionName);
+	WriteResult updateFirst(Query query, Update update, Class<?> entityClass, String collectionName);
 
 	/**
 	 * Updates all objects that are found in the collection for the entity class that matches the query document criteria
@@ -909,7 +922,7 @@ public interface MongoOperations {
 	 * @param entityClass class that determines the collection to use
 	 * @return the WriteResult which lets you access the results of the previous write.
 	 */
-	UpdateResult updateMulti(Query query, Update update, Class<?> entityClass);
+	WriteResult updateMulti(Query query, Update update, Class<?> entityClass);
 
 	/**
 	 * Updates all objects that are found in the specified collection that matches the query document criteria with the
@@ -921,7 +934,7 @@ public interface MongoOperations {
 	 * @param collectionName name of the collection to update the object in
 	 * @return the WriteResult which lets you access the results of the previous write.
 	 */
-	UpdateResult updateMulti(Query query, Update update, String collectionName);
+	WriteResult updateMulti(Query query, Update update, String collectionName);
 
 	/**
 	 * Updates all objects that are found in the collection for the entity class that matches the query document criteria
@@ -934,14 +947,14 @@ public interface MongoOperations {
 	 * @param collectionName name of the collection to update the object in
 	 * @return the WriteResult which lets you access the results of the previous write.
 	 */
-	UpdateResult updateMulti(final Query query, final Update update, Class<?> entityClass, String collectionName);
+	WriteResult updateMulti(final Query query, final Update update, Class<?> entityClass, String collectionName);
 
 	/**
 	 * Remove the given object from the collection by id.
 	 * 
 	 * @param object
 	 */
-	DeleteResult remove(Object object);
+	WriteResult remove(Object object);
 
 	/**
 	 * Removes the given object from the given collection.
@@ -949,7 +962,7 @@ public interface MongoOperations {
 	 * @param object
 	 * @param collection must not be {@literal null} or empty.
 	 */
-	DeleteResult remove(Object object, String collection);
+	WriteResult remove(Object object, String collection);
 
 	/**
 	 * Remove all documents that match the provided query document criteria from the the collection used to store the
@@ -958,7 +971,7 @@ public interface MongoOperations {
 	 * @param query
 	 * @param entityClass
 	 */
-	DeleteResult remove(Query query, Class<?> entityClass);
+	WriteResult remove(Query query, Class<?> entityClass);
 
 	/**
 	 * Remove all documents that match the provided query document criteria from the the collection used to store the
@@ -968,7 +981,7 @@ public interface MongoOperations {
 	 * @param entityClass
 	 * @param collectionName
 	 */
-	DeleteResult remove(Query query, Class<?> entityClass, String collectionName);
+	WriteResult remove(Query query, Class<?> entityClass, String collectionName);
 
 	/**
 	 * Remove all documents from the specified collection that match the provided query document criteria. There is no
@@ -977,7 +990,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
 	 */
-	DeleteResult remove(Query query, String collectionName);
+	WriteResult remove(Query query, String collectionName);
 
 	/**
 	 * Returns and removes all documents form the specified collection that match the provided query.
@@ -1018,4 +1031,5 @@ public interface MongoOperations {
 	 * @return
 	 */
 	MongoConverter getConverter();
+
 }

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

@@ -1,34 +0,0 @@
-/*
- * Copyright 2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import org.springframework.dao.DataAccessException;
-
-import com.mongodb.MongoException;
-import com.mongodb.reactivestreams.client.MongoCollection;
-import org.bson.Document;
-import org.reactivestreams.Publisher;
-
-/**
- * @author Mark Paluch
- * @param <T>
- * @since 2.0
- */
-public interface ReactiveCollectionCallback<T> {
-
-	Publisher<T> doInCollection(MongoCollection<Document> collection) throws MongoException, DataAccessException;
-
-}

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

@@ -1,32 +0,0 @@
-/*
- * Copyright 2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import org.springframework.dao.DataAccessException;
-
-import com.mongodb.MongoException;
-import com.mongodb.reactivestreams.client.MongoDatabase;
-import org.reactivestreams.Publisher;
-
-/**
- * @author Mark Paluch
- * @param <T>
- * @since 2.0
- */
-public interface ReactiveDatabaseCallback<T> {
-
-	Publisher<T> doInDB(MongoDatabase db) throws MongoException, DataAccessException;
-}

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

@@ -1,62 +0,0 @@
-/*
- * Copyright 2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import java.util.List;
-
-import org.springframework.data.mongodb.core.index.IndexDefinition;
-import org.springframework.data.mongodb.core.index.IndexInfo;
-
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-/**
- * Index operations on a collection.
- *
- * @author Mark Paluch
- * @author Christoph Strobl
- * @since 2.0
- */
-public interface ReactiveIndexOperations {
-
-	/**
-	 * Ensure that an index for the provided {@link IndexDefinition} exists for the collection indicated by the entity
-	 * class. If not it will be created.
-	 *
-	 * @param indexDefinition must not be {@literal null}.
-	 */
-	Mono<String> ensureIndex(IndexDefinition indexDefinition);
-
-	/**
-	 * Drops an index from this collection.
-	 *
-	 * @param name name of index to drop
-	 */
-	Mono<Void> dropIndex(String name);
-
-	/**
-	 * Drops all indices from this collection.
-	 */
-	Mono<Void> dropAllIndexes();
-
-	/**
-	 * Returns the index information on the collection.
-	 *
-	 * @return index information on the collection
-	 */
-	Flux<IndexInfo> getIndexInfo();
-
-}

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

@@ -1,129 +0,0 @@
-/*
- * Copyright 2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.data.mongodb.core;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.springframework.dao.DataAccessException;
-import org.springframework.dao.support.PersistenceExceptionTranslator;
-import org.springframework.util.StringUtils;
-
-import com.mongodb.async.client.MongoClientSettings;
-import com.mongodb.reactivestreams.client.MongoClient;
-import com.mongodb.reactivestreams.client.MongoClients;
-
-/**
- * Convenient factory for configuring a reactive streams {@link MongoClient}.
- *
- * @author Mark Paluch
- * @author Christoph Strobl
- * @since 2.0
- */
-public class ReactiveMongoClientFactoryBean extends AbstractFactoryBean<MongoClient>
-		implements PersistenceExceptionTranslator {
-
-	private static final PersistenceExceptionTranslator DEFAULT_EXCEPTION_TRANSLATOR = new MongoExceptionTranslator();
-
-	private String connectionString;
-	private String host;
-	private Integer port;
-	private MongoClientSettings mongoClientSettings;
-	private PersistenceExceptionTranslator exceptionTranslator = DEFAULT_EXCEPTION_TRANSLATOR;
-
-	/**
-	 * Configures the host to connect to.
-	 *
-	 * @param host
-	 */
-	public void setHost(String host) {
-		this.host = host;
-	}
-
-	/**
-	 * Configures the port to connect to.
-	 *
-	 * @param port
-	 */
-	public void setPort(int port) {
-		this.port = port;
-	}
-
-	/**
-	 * Configures the connection string.
-	 *
-	 * @param connectionString
-	 */
-	public void setConnectionString(String connectionString) {
-		this.connectionString = connectionString;
-	}
-
-	/**
-	 * Configures the mongo client settings.
-	 *
-	 * @param mongoClientSettings
-	 */
-	public void setMongoClientSettings(MongoClientSettings mongoClientSettings) {
-		this.mongoClientSettings = mongoClientSettings;
-	}
-
-	/**
-	 * Configures the {@link PersistenceExceptionTranslator} to use.
-	 *
-	 * @param exceptionTranslator
-	 */
-	public void setExceptionTranslator(PersistenceExceptionTranslator exceptionTranslator) {
-		this.exceptionTranslator = exceptionTranslator == null ? DEFAULT_EXCEPTION_TRANSLATOR : exceptionTranslator;
-	}
-
-	@Override
-	public Class<?> getObjectType() {
-		return MongoClient.class;
-	}
-
-	@Override
-	protected MongoClient createInstance() throws Exception {
-
-		if (mongoClientSettings != null) {
-			return MongoClients.create(mongoClientSettings);
-		}
-
-		if (StringUtils.hasText(connectionString)) {
-			return MongoClients.create(connectionString);
-		}
-
-		if (StringUtils.hasText(host)) {
-
-			if (port != null) {
-				return MongoClients.create(String.format("mongodb://%s:%d", host, port));
-			}
-
-			return MongoClients.create(String.format("mongodb://%s", host));
-		}
-
-		throw new IllegalStateException(
-				"Cannot create MongoClients. One of the following is required: mongoClientSettings, connectionString or host/port");
-	}
-
-	@Override
-	protected void destroyInstance(MongoClient instance) throws Exception {
-		instance.close();
-	}
-
-	@Override
-	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
-		return exceptionTranslator.translateExceptionIfPossible(ex);
-	}
-}

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

@@ -1,206 +0,0 @@
-/*
- * Copyright 2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bson.codecs.configuration.CodecRegistry;
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.springframework.util.Assert;
-
-import com.mongodb.MongoCredential;
-import com.mongodb.ReadConcern;
-import com.mongodb.ReadPreference;
-import com.mongodb.WriteConcern;
-import com.mongodb.async.client.MongoClientSettings;
-import com.mongodb.connection.ClusterSettings;
-import com.mongodb.connection.ConnectionPoolSettings;
-import com.mongodb.connection.ServerSettings;
-import com.mongodb.connection.SocketSettings;
-import com.mongodb.connection.SslSettings;
-import com.mongodb.connection.StreamFactoryFactory;
-
-/**
- * A factory bean for construction of a {@link MongoClientSettings} instance to be used with the async MongoDB driver.
- *
- * @author Mark Paluch
- * @since 2.0
- */
-public class ReactiveMongoClientSettingsFactoryBean extends AbstractFactoryBean<MongoClientSettings> {
-
-	private static final MongoClientSettings DEFAULT_MONGO_SETTINGS = MongoClientSettings.builder().build();
-
-	private ReadPreference readPreference = DEFAULT_MONGO_SETTINGS.getReadPreference();
-	private WriteConcern writeConcern = DEFAULT_MONGO_SETTINGS.getWriteConcern();
-	private ReadConcern readConcern = DEFAULT_MONGO_SETTINGS.getReadConcern();
-	private List<MongoCredential> credentialList = new ArrayList<>();
-	private StreamFactoryFactory streamFactoryFactory = DEFAULT_MONGO_SETTINGS.getStreamFactoryFactory();
-	private CodecRegistry codecRegistry = DEFAULT_MONGO_SETTINGS.getCodecRegistry();
-	private ClusterSettings clusterSettings = DEFAULT_MONGO_SETTINGS.getClusterSettings();
-	private SocketSettings socketSettings = DEFAULT_MONGO_SETTINGS.getSocketSettings();
-	private SocketSettings heartbeatSocketSettings = DEFAULT_MONGO_SETTINGS.getHeartbeatSocketSettings();
-	private ConnectionPoolSettings connectionPoolSettings = DEFAULT_MONGO_SETTINGS.getConnectionPoolSettings();
-	private ServerSettings serverSettings = DEFAULT_MONGO_SETTINGS.getServerSettings();
-	private SslSettings sslSettings = DEFAULT_MONGO_SETTINGS.getSslSettings();
-
-	/**
-	 * Set the {@link ReadPreference}.
-	 *
-	 * @param readPreference
-	 */
-	public void setReadPreference(ReadPreference readPreference) {
-		this.readPreference = readPreference;
-	}
-
-	/**
-	 * Set the {@link WriteConcern}.
-	 *
-	 * @param writeConcern
-	 */
-	public void setWriteConcern(WriteConcern writeConcern) {
-		this.writeConcern = writeConcern;
-	}
-
-	/**
-	 * Set the {@link ReadConcern}.
-	 *
-	 * @param readConcern
-	 */
-	public void setReadConcern(ReadConcern readConcern) {
-		this.readConcern = readConcern;
-	}
-
-	/**
-	 * Set the List of {@link MongoCredential}s.
-	 *
-	 * @param credentialList must not be {@literal null}.
-	 */
-	public void setCredentialList(List<MongoCredential> credentialList) {
-
-		Assert.notNull(credentialList, "CredendialList must not be null!");
-
-		this.credentialList.addAll(credentialList);
-	}
-
-	/**
-	 * Adds the {@link MongoCredential} to the list of credentials.
-	 *
-	 * @param mongoCredential must not be {@literal null}.
-	 */
-	public void addMongoCredential(MongoCredential mongoCredential) {
-
-		Assert.notNull(mongoCredential, "MongoCredential must not be null!");
-
-		this.credentialList.add(mongoCredential);
-	}
-
-	/**
-	 * Set the {@link StreamFactoryFactory}.
-	 *
-	 * @param streamFactoryFactory
-	 */
-	public void setStreamFactoryFactory(StreamFactoryFactory streamFactoryFactory) {
-		this.streamFactoryFactory = streamFactoryFactory;
-	}
-
-	/**
-	 * Set the {@link CodecRegistry}.
-	 *
-	 * @param codecRegistry
-	 */
-	public void setCodecRegistry(CodecRegistry codecRegistry) {
-		this.codecRegistry = codecRegistry;
-	}
-
-	/**
-	 * Set the {@link ClusterSettings}.
-	 *
-	 * @param clusterSettings
-	 */
-	public void setClusterSettings(ClusterSettings clusterSettings) {
-		this.clusterSettings = clusterSettings;
-	}
-
-	/**
-	 * Set the {@link SocketSettings}.
-	 *
-	 * @param socketSettings
-	 */
-	public void setSocketSettings(SocketSettings socketSettings) {
-		this.socketSettings = socketSettings;
-	}
-
-	/**
-	 * Set the heartbeat {@link SocketSettings}.
-	 *
-	 * @param heartbeatSocketSettings
-	 */
-	public void setHeartbeatSocketSettings(SocketSettings heartbeatSocketSettings) {
-		this.heartbeatSocketSettings = heartbeatSocketSettings;
-	}
-
-	/**
-	 * Set the {@link ConnectionPoolSettings}.
-	 *
-	 * @param connectionPoolSettings
-	 */
-	public void setConnectionPoolSettings(ConnectionPoolSettings connectionPoolSettings) {
-		this.connectionPoolSettings = connectionPoolSettings;
-	}
-
-	/**
-	 * Set the {@link ServerSettings}.
-	 *
-	 * @param serverSettings
-	 */
-	public void setServerSettings(ServerSettings serverSettings) {
-		this.serverSettings = serverSettings;
-	}
-
-	/**
-	 * Set the {@link SslSettings}.
-	 *
-	 * @param sslSettings
-	 */
-	public void setSslSettings(SslSettings sslSettings) {
-		this.sslSettings = sslSettings;
-	}
-
-	@Override
-	public Class<?> getObjectType() {
-		return MongoClientSettings.class;
-	}
-
-	@Override
-	protected MongoClientSettings createInstance() throws Exception {
-
-		return MongoClientSettings.builder() //
-				.readPreference(readPreference) //
-				.writeConcern(writeConcern) //
-				.readConcern(readConcern) //
-				.credentialList(credentialList) //
-				.streamFactoryFactory(streamFactoryFactory) //
-				.codecRegistry(codecRegistry) //
-				.clusterSettings(clusterSettings) //
-				.socketSettings(socketSettings) //
-				.heartbeatSocketSettings(heartbeatSocketSettings) //
-				.connectionPoolSettings(connectionPoolSettings) //
-				.serverSettings(serverSettings) //
-				.sslSettings(sslSettings) //
-				.build();
-	}
-}

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

@@ -1,51 +0,0 @@
-/*
- * Copyright 2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import com.mongodb.reactivestreams.client.MongoClient;
-import com.mongodb.reactivestreams.client.MongoDatabase;
-
-/**
- * Helper class featuring helper methods for internal MongoDb classes. Mainly intended for internal use within the
- * framework.
- *
- * @author Mark Paluch
- * @author Christoph Strobl
- * @since 2.0
- */
-public abstract class ReactiveMongoDbUtils {
-
-	/**
-	 * Private constructor to prevent instantiation.
-	 */
-	private ReactiveMongoDbUtils() {}
-
-	/**
-	 * Obtains a {@link MongoDatabase} connection for the given {@link MongoClient} instance and database name
-	 *
-	 * @param mongo the {@link MongoClient} instance, must not be {@literal null}.
-	 * @param databaseName the database name, must not be {@literal null} or empty.
-	 * @return the {@link MongoDatabase} connection
-	 */
-	public static MongoDatabase getMongoDatabase(MongoClient mongo, String databaseName) {
-		return doGetMongoDatabase(mongo, databaseName, true);
-	}
-
-	private static MongoDatabase doGetMongoDatabase(MongoClient mongo, String databaseName, boolean allowCreate) {
-		return mongo.getDatabase(databaseName);
-	}
-
-}

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

@@ -1,945 +0,0 @@
-/*
- * Copyright 2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import java.util.Collection;
-
-import org.bson.Document;
-import org.reactivestreams.Publisher;
-import org.reactivestreams.Subscription;
-import org.springframework.data.geo.GeoResult;
-import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
-import org.springframework.data.mongodb.core.convert.MongoConverter;
-import org.springframework.data.mongodb.core.query.BasicQuery;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.NearQuery;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.mongodb.core.query.Update;
-
-import com.mongodb.ReadPreference;
-import com.mongodb.client.result.DeleteResult;
-import com.mongodb.client.result.UpdateResult;
-import com.mongodb.reactivestreams.client.MongoCollection;
-
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-/**
- * Interface that specifies a basic set of MongoDB operations executed in a reactive way.
- * <p>
- * Implemented by {@link ReactiveMongoTemplate}. Not often used but a useful option for extensibility and testability
- * (as it can be easily mocked, stubbed, or be the target of a JDK proxy). Command execution using
- * {@link ReactiveMongoOperations} is deferred until subscriber subscribes to the {@link Publisher}.
- *
- * @author Mark Paluch
- * @author Christoph Strobl
- * @see Flux
- * @see Mono
- * @see http://projectreactor.io/docs/
- * @since 2.0
- */
-public interface ReactiveMongoOperations {
-
-	/**
-	 * Returns the reactive operations that can be performed on indexes
-	 *
-	 * @return index operations on the named collection
-	 */
-	ReactiveIndexOperations indexOps(String collectionName);
-
-	/**
-	 * Returns the reactive operations that can be performed on indexes
-	 *
-	 * @return index operations on the named collection associated with the given entity class
-	 */
-	ReactiveIndexOperations indexOps(Class<?> entityClass);
-
-	/**
-	 * Execute the a MongoDB command expressed as a JSON string. This will call the method JSON.parse that is part of the
-	 * MongoDB driver to convert the JSON string to a DBObject. Any errors that result from executing this command will be
-	 * converted into Spring's DAO exception hierarchy.
-	 *
-	 * @param jsonCommand a MongoDB command expressed as a JSON string.
-	 * @return a result object returned by the action
-	 */
-	Mono<Document> executeCommand(String jsonCommand);
-
-	/**
-	 * Execute a MongoDB command. Any errors that result from executing this command will be converted into Spring's DAO
-	 * exception hierarchy.
-	 *
-	 * @param command a MongoDB command
-	 * @return a result object returned by the action
-	 */
-	Mono<Document> executeCommand(Document command);
-
-	/**
-	 * Execute a MongoDB command. Any errors that result from executing this command will be converted into Spring's data
-	 * access exception hierarchy.
-	 *
-	 * @param command a MongoDB command, must not be {@literal null}.
-	 * @param readPreference read preferences to use, can be {@literal null}.
-	 * @return a result object returned by the action
-	 */
-	Mono<Document> executeCommand(Document command, ReadPreference readPreference);
-
-	/**
-	 * Executes a {@link ReactiveDatabaseCallback} translating any exceptions as necessary.
-	 * <p/>
-	 * Allows for returning a result object, that is a domain object or a collection of domain objects.
-	 *
-	 * @param <T> return type
-	 * @param action callback object that specifies the MongoDB actions to perform on the passed in DB instance.
-	 * @return a result object returned by the action
-	 */
-	<T> Flux<T> execute(ReactiveDatabaseCallback<T> action);
-
-	/**
-	 * Executes the given {@link ReactiveCollectionCallback} on the entity collection of the specified class.
-	 * <p/>
-	 * Allows for returning a result object, that is a domain object or a collection of domain objects.
-	 *
-	 * @param entityClass class that determines the collection to use
-	 * @param <T> return type
-	 * @param action callback object that specifies the MongoDB action
-	 * @return a result object returned by the action or <tt>null</tt>
-	 */
-	<T> Flux<T> execute(Class<?> entityClass, ReactiveCollectionCallback<T> action);
-
-	/**
-	 * Executes the given {@link ReactiveCollectionCallback} on the collection of the given name.
-	 * <p/>
-	 * Allows for returning a result object, that is a domain object or a collection of domain objects.
-	 *
-	 * @param <T> return type
-	 * @param collectionName the name of the collection that specifies which DBCollection instance will be passed into
-	 * @param action callback object that specifies the MongoDB action the callback action.
-	 * @return a result object returned by the action or <tt>null</tt>
-	 */
-	<T> Flux<T> execute(String collectionName, ReactiveCollectionCallback<T> action);
-
-	/**
-	 * Create an uncapped collection with a name based on the provided entity class.
-	 *
-	 * @param entityClass class that determines the collection to create
-	 * @return the created collection
-	 */
-	<T> Mono<MongoCollection<Document>> createCollection(Class<T> entityClass);
-
-	/**
-	 * Create a collection with a name based on the provided entity class using the options.
-	 *
-	 * @param entityClass class that determines the collection to create
-	 * @param collectionOptions options to use when creating the collection.
-	 * @return the created collection
-	 */
-	<T> Mono<MongoCollection<Document>> createCollection(Class<T> entityClass, CollectionOptions collectionOptions);
-
-	/**
-	 * Create an uncapped collection with the provided name.
-	 *
-	 * @param collectionName name of the collection
-	 * @return the created collection
-	 */
-	Mono<MongoCollection<Document>> createCollection(String collectionName);
-
-	/**
-	 * Create a collection with the provided name and options.
-	 *
-	 * @param collectionName name of the collection
-	 * @param collectionOptions options to use when creating the collection.
-	 * @return the created collection
-	 */
-	Mono<MongoCollection<Document>> createCollection(String collectionName, CollectionOptions collectionOptions);
-
-	/**
-	 * A set of collection names.
-	 *
-	 * @return Flux of collection names
-	 */
-	Flux<String> getCollectionNames();
-
-	/**
-	 * Get a collection by name, creating it if it doesn't exist.
-	 * <p/>
-	 * Translate any exceptions as necessary.
-	 *
-	 * @param collectionName name of the collection
-	 * @return an existing collection or a newly created one.
-	 */
-	MongoCollection<Document> getCollection(String collectionName);
-
-	/**
-	 * Check to see if a collection with a name indicated by the entity class exists.
-	 * <p/>
-	 * Translate any exceptions as necessary.
-	 *
-	 * @param entityClass class that determines the name of the collection
-	 * @return true if a collection with the given name is found, false otherwise.
-	 */
-	<T> Mono<Boolean> collectionExists(Class<T> entityClass);
-
-	/**
-	 * Check to see if a collection with a given name exists.
-	 * <p/>
-	 * Translate any exceptions as necessary.
-	 *
-	 * @param collectionName name of the collection
-	 * @return true if a collection with the given name is found, false otherwise.
-	 */
-	Mono<Boolean> collectionExists(String collectionName);
-
-	/**
-	 * Drop the collection with the name indicated by the entity class.
-	 * <p/>
-	 * Translate any exceptions as necessary.
-	 *
-	 * @param entityClass class that determines the collection to drop/delete.
-	 */
-	<T> Mono<Void> dropCollection(Class<T> entityClass);
-
-	/**
-	 * Drop the collection with the given name.
-	 * <p/>
-	 * Translate any exceptions as necessary.
-	 *
-	 * @param collectionName name of the collection to drop/delete.
-	 */
-	Mono<Void> dropCollection(String collectionName);
-
-	/**
-	 * Query for a {@link Flux} of objects of type T from the collection used by the entity class.
-	 * <p/>
-	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
-	 * If your collection does not contain a homogeneous collection of types, this operation will not be an efficient way
-	 * to map objects since the test for class type is done in the client and not on the server.
-	 * @param entityClass the parametrized type of the returned {@link Flux}.
-	 *
-	 * @return the converted collection
-	 */
-	<T> Flux<T> findAll(Class<T> entityClass);
-
-	/**
-	 * Query for a {@link Flux} of objects of type T from the specified collection.
-	 * <p/>
-	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
-	 * If your collection does not contain a homogeneous collection of types, this operation will not be an efficient way
-	 * to map objects since the test for class type is done in the client and not on the server.
-	 *
-	 * @param entityClass the parametrized type of the returned {@link Flux}.
-	 * @param collectionName name of the collection to retrieve the objects from
-	 * @return the converted collection
-	 */
-	<T> Flux<T> findAll(Class<T> entityClass, String collectionName);
-
-	/**
-	 * Map the results of an ad-hoc query on the collection for the entity class to a single instance of an object of the
-	 * specified type.
-	 * <p/>
-	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
-	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
-	 * feature rich {@link Query}.
-	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
-	 *          specification
-	 * @param entityClass the parametrized type of the returned {@link Mono}.
-	 * @return the converted object
-	 */
-	<T> Mono<T> findOne(Query query, Class<T> entityClass);
-
-	/**
-	 * Map the results of an ad-hoc query on the specified collection to a single instance of an object of the specified
-	 * type.
-	 * <p/>
-	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
-	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
-	 * feature rich {@link Query}.
-	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
-	 *          specification
-	 * @param entityClass the parametrized type of the returned {@link Mono}.
-	 * @param collectionName name of the collection to retrieve the objects from
-	 * @return the converted object
-	 */
-	<T> Mono<T> findOne(Query query, Class<T> entityClass, String collectionName);
-
-	/**
-	 * Determine result of given {@link Query} contains at least one element.
-	 *
-	 * @param query the {@link Query} class that specifies the criteria used to find a record.
-	 * @param collectionName name of the collection to check for objects.
-	 * @return
-	 */
-	Mono<Boolean> exists(Query query, String collectionName);
-
-	/**
-	 * Determine result of given {@link Query} contains at least one element.
-	 *
-	 * @param query the {@link Query} class that specifies the criteria used to find a record.
-	 * @param entityClass the parametrized type.
-	 * @return
-	 */
-	Mono<Boolean> exists(Query query, Class<?> entityClass);
-
-	/**
-	 * Determine result of given {@link Query} contains at least one element.
-	 *
-	 * @param query the {@link Query} class that specifies the criteria used to find a record.
-	 * @param entityClass the parametrized type.
-	 * @param collectionName name of the collection to check for objects.
-	 * @return
-	 */
-	Mono<Boolean> exists(Query query, Class<?> entityClass, String collectionName);
-
-	/**
-	 * Map the results of an ad-hoc query on the collection for the entity class to a {@link Flux} of the specified type.
-	 * <p/>
-	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
-	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
-	 * feature rich {@link Query}.
-	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
-	 *          specification
-	 * @param entityClass the parametrized type of the returned {@link Flux}.
-	 * @return the {@link Flux} of converted objects
-	 */
-	<T> Flux<T> find(Query query, Class<T> entityClass);
-
-	/**
-	 * Map the results of an ad-hoc query on the specified collection to a {@link Flux} of the specified type.
-	 * <p/>
-	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
-	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
-	 * feature rich {@link Query}.
-	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
-	 *          specification
-	 * @param entityClass the parametrized type of the returned {@link Flux}.
-	 * @param collectionName name of the collection to retrieve the objects from
-	 * @return the {@link Flux} of converted objects
-	 */
-	<T> Flux<T> find(Query query, Class<T> entityClass, String collectionName);
-
-	/**
-	 * Returns a document with the given id mapped onto the given class. The collection the query is ran against will be
-	 * derived from the given target class as well.
-	 *
-	 * @param <T>
-	 * @param id the id of the document to return.
-	 * @param entityClass the type the document shall be converted into.
-	 * @return the document with the given id mapped onto the given target class.
-	 */
-	<T> Mono<T> findById(Object id, Class<T> entityClass);
-
-	/**
-	 * Returns the document with the given id from the given collection mapped onto the given target class.
-	 *
-	 * @param id the id of the document to return
-	 * @param entityClass the type to convert the document to
-	 * @param collectionName the collection to query for the document
-	 * @param <T>
-	 * @return
-	 */
-	<T> Mono<T> findById(Object id, Class<T> entityClass, String collectionName);
-
-	/**
-	 * Returns {@link Flux} of {@link GeoResult} for all entities matching the given {@link NearQuery}. Will consider entity mapping
-	 * information to determine the collection the query is ran against. Note, that MongoDB limits the number of results
-	 * by default. Make sure to add an explicit limit to the {@link NearQuery} if you expect a particular number of
-	 * results.
-	 *
-	 * @param near must not be {@literal null}.
-	 * @param entityClass must not be {@literal null}.
-	 * @return
-	 */
-	<T> Flux<GeoResult<T>> geoNear(NearQuery near, Class<T> entityClass);
-
-	/**
-	 * Returns {@link Flux} of {@link GeoResult} for all entities matching the given {@link NearQuery}. Note, that MongoDB limits the
-	 * number of results by default. Make sure to add an explicit limit to the {@link NearQuery} if you expect a
-	 * particular number of results.
-	 *
-	 * @param near must not be {@literal null}.
-	 * @param entityClass must not be {@literal null}.
-	 * @param collectionName the collection to trigger the query against. If no collection name is given the entity class
-	 *          will be inspected.
-	 * @return
-	 */
-	<T> Flux<GeoResult<T>> geoNear(NearQuery near, Class<T> entityClass, String collectionName);
-
-	/**
-	 * Triggers <a href="http://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify <a/>
-	 * to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query}.
-	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification.
-	 * @param update the {@link Update} to apply on matching documents.
-	 * @param entityClass the parametrized type.
-	 * @return
-	 */
-	<T> Mono<T> findAndModify(Query query, Update update, Class<T> entityClass);
-
-	/**
-	 * Triggers <a href="http://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify <a/>
-	 * to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query}.
-	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification.
-	 * @param update the {@link Update} to apply on matching documents.
-	 * @param entityClass the parametrized type.
-	 * @param collectionName the collection to query.
-	 * @return
-	 */
-	<T> Mono<T> findAndModify(Query query, Update update, Class<T> entityClass, String collectionName);
-
-	/**
-	 * Triggers <a href="http://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify <a/>
-	 * to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query} taking
-	 * {@link FindAndModifyOptions} into account.
-	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification.
-	 * @param update the {@link Update} to apply on matching documents.
-	 * @param options the {@link FindAndModifyOptions} holding additional information.
-	 * @param entityClass the parametrized type.
-	 * @return
-	 */
-	<T> Mono<T> findAndModify(Query query, Update update, FindAndModifyOptions options, Class<T> entityClass);
-
-	/**
-	 * Triggers <a href="http://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify <a/>
-	 * to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query} taking
-	 * {@link FindAndModifyOptions} into account.
-	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification.
-	 * @param update the {@link Update} to apply on matching documents.
-	 * @param options the {@link FindAndModifyOptions} holding additional information.
-	 * @param entityClass the parametrized type.
-	 * @param collectionName the collection to query.
-	 * @return
-	 */
-	<T> Mono<T> findAndModify(Query query, Update update, FindAndModifyOptions options, Class<T> entityClass,
-			String collectionName);
-
-	/**
-	 * Map the results of an ad-hoc query on the collection for the entity type to a single instance of an object of the
-	 * specified type. The first document that matches the query is returned and also removed from the collection in the
-	 * database.
-	 * <p/>
-	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}.
-	 * <p/>
-	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
-	 * feature rich {@link Query}.
-	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
-	 *          specification
-	 * @param entityClass the parametrized type of the returned {@link Mono}.
-	 * @return the converted object
-	 */
-	<T> Mono<T> findAndRemove(Query query, Class<T> entityClass);
-
-	/**
-	 * Map the results of an ad-hoc query on the specified collection to a single instance of an object of the specified
-	 * type. The first document that matches the query is returned and also removed from the collection in the database.
-	 * <p/>
-	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
-	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
-	 * feature rich {@link Query}.
-	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
-	 *          specification
-	 * @param entityClass the parametrized type of the returned {@link Mono}.
-	 * @param collectionName name of the collection to retrieve the objects from.
-	 * @return the converted object
-	 */
-	<T> Mono<T> findAndRemove(Query query, Class<T> entityClass, String collectionName);
-
-	/**
-	 * Returns the number of documents for the given {@link Query} by querying the collection of the given entity class.
-	 *
-	 * @param query
-	 * @param entityClass must not be {@literal null}.
-	 * @return
-	 */
-	Mono<Long> count(Query query, Class<?> entityClass);
-
-	/**
-	 * Returns the number of documents for the given {@link Query} querying the given collection. The given {@link Query}
-	 * must solely consist of document field references as we lack type information to map potential property references
-	 * onto document fields. TO make sure the query gets mapped, use {@link #count(Query, Class, String)}.
-	 *
-	 * @param query
-	 * @param collectionName must not be {@literal null} or empty.
-	 * @return
-	 * @see #count(Query, Class, String)
-	 */
-	Mono<Long> count(Query query, String collectionName);
-
-	/**
-	 * Returns the number of documents for the given {@link Query} by querying the given collection using the given entity
-	 * class to map the given {@link Query}.
-	 *
-	 * @param query
-	 * @param entityClass must not be {@literal null}.
-	 * @param collectionName must not be {@literal null} or empty.
-	 * @return
-	 */
-	Mono<Long> count(Query query, Class<?> entityClass, String collectionName);
-
-	/**
-	 * Insert the object into the collection for the entity type of the object to save.
-	 * <p/>
-	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}.
-	 * <p/>
-	 * If you object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
-	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
-	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See
-	 * <a href="http://docs.spring.io/spring/docs/current/spring-framework-reference/html/validation.html#core-convert" >
-	 * Spring's Type Conversion"</a> for more details.
-	 * <p/>
-	 * <p/>
-	 * Insert is used to initially store the object into the database. To update an existing object use the save method.
-	 *
-	 * @param objectToSave the object to store in the collection.
-	 * @return
-	 */
-	<T> Mono<T> insert(T objectToSave);
-
-	/**
-	 * Insert the object into the specified collection.
-	 * <p/>
-	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
-	 * Insert is used to initially store the object into the database. To update an existing object use the save method.
-	 *
-	 * @param objectToSave the object to store in the collection
-	 * @param collectionName name of the collection to store the object in
-	 * @return
-	 */
-	<T> Mono<T> insert(T objectToSave, String collectionName);
-
-	/**
-	 * Insert a Collection of objects into a collection in a single batch write to the database.
-	 *
-	 * @param batchToSave the batch of objects to save.
-	 * @param entityClass class that determines the collection to use
-	 * @return
-	 */
-	<T> Flux<T> insert(Collection<? extends T> batchToSave, Class<?> entityClass);
-
-	/**
-	 * Insert a batch of objects into the specified collection in a single batch write to the database.
-	 *
-	 * @param batchToSave the list of objects to save.
-	 * @param collectionName name of the collection to store the object in
-	 * @return
-	 */
-	<T> Flux<T> insert(Collection<? extends T> batchToSave, String collectionName);
-
-	/**
-	 * Insert a mixed Collection of objects into a database collection determining the collection name to use based on the
-	 * class.
-	 *
-	 * @param objectsToSave the list of objects to save.
-	 * @return
-	 */
-	<T> Flux<T> insertAll(Collection<? extends T> objectsToSave);
-
-	/**
-	 * Insert the object into the collection for the entity type of the object to save.
-	 * <p/>
-	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}.
-	 * <p/>
-	 * If you object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
-	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
-	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See
-	 * <a href="http://docs.spring.io/spring/docs/current/spring-framework-reference/html/validation.html#core-convert" >
-	 * Spring's Type Conversion"</a> for more details.
-	 * <p/>
-	 * <p/>
-	 * Insert is used to initially store the object into the database. To update an existing object use the save method.
-	 *
-	 * @param objectToSave the object to store in the collection.
-	 * @return
-	 */
-	<T> Mono<T> insert(Mono<? extends T> objectToSave);
-
-	/**
-	 * Insert a Collection of objects into a collection in a single batch write to the database.
-	 *
-	 * @param batchToSave the publisher which provides objects to save.
-	 * @param entityClass class that determines the collection to use
-	 * @return
-	 */
-	<T> Flux<T> insertAll(Mono<? extends Collection<? extends T>> batchToSave, Class<?> entityClass);
-
-	/**
-	 * Insert objects into the specified collection in a single batch write to the database.
-	 *
-	 * @param batchToSave the publisher which provides objects to save.
-	 * @param collectionName name of the collection to store the object in
-	 * @return
-	 */
-	<T> Flux<T> insertAll(Mono<? extends Collection<? extends T>> batchToSave, String collectionName);
-
-	/**
-	 * Insert a mixed Collection of objects into a database collection determining the collection name to use based on the
-	 * class.
-	 *
-	 * @param objectsToSave the publisher which provides objects to save.
-	 * @return
-	 */
-	<T> Flux<T> insertAll(Mono<? extends Collection<? extends T>> objectsToSave);
-
-	/**
-	 * Save the object to the collection for the entity type of the object to save. This will perform an insert if the
-	 * object is not already present, that is an 'upsert'.
-	 * <p/>
-	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
-	 * If you object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
-	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
-	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See
-	 * <a href="http://docs.spring.io/spring/docs/current/spring-framework-reference/html/validation.html#core-convert" >
-	 * Spring's Type Conversion"</a> for more details.
-	 *
-	 * @param objectToSave the object to store in the collection
-	 * @return
-	 */
-	<T> Mono<T> save(T objectToSave);
-
-	/**
-	 * Save the object to the specified collection. This will perform an insert if the object is not already present, that
-	 * is an 'upsert'.
-	 * <p/>
-	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
-	 * If you object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
-	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
-	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See <a
-	 * http://docs.spring.io/spring/docs/current/spring-framework-reference/html/validation.html#core-convert">Spring's
-	 * Type Conversion"</a> for more details.
-	 *
-	 * @param objectToSave the object to store in the collection
-	 * @param collectionName name of the collection to store the object in
-	 * @return
-	 */
-	<T> Mono<T> save(T objectToSave, String collectionName);
-
-	/**
-	 * Save the object to the collection for the entity type of the object to save. This will perform an insert if the
-	 * object is not already present, that is an 'upsert'.
-	 * <p/>
-	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
-	 * If you object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
-	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
-	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See
-	 * <a href="http://docs.spring.io/spring/docs/current/spring-framework-reference/html/validation.html#core-convert" >
-	 * Spring's Type Conversion"</a> for more details.
-	 *
-	 * @param objectToSave the object to store in the collection
-	 * @return
-	 */
-	<T> Mono<T> save(Mono<? extends T> objectToSave);
-
-	/**
-	 * Save the object to the specified collection. This will perform an insert if the object is not already present, that
-	 * is an 'upsert'.
-	 * <p/>
-	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
-	 * If you object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
-	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
-	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See <a
-	 * http://docs.spring.io/spring/docs/current/spring-framework-reference/html/validation.html#core-convert">Spring's
-	 * Type Conversion"</a> for more details.
-	 *
-	 * @param objectToSave the object to store in the collection
-	 * @param collectionName name of the collection to store the object in
-	 * @return
-	 */
-	<T> Mono<T> save(Mono<? extends T> objectToSave, String collectionName);
-
-	/**
-	 * Performs an upsert. If no document is found that matches the query, a new document is created and inserted by
-	 * combining the query document and the update document.
-	 *
-	 * @param query the query document that specifies the criteria used to select a record to be upserted
-	 * @param update the update document that contains the updated object or $ operators to manipulate the existing object
-	 * @param entityClass class that determines the collection to use
-	 * @return the WriteResult which lets you access the results of the previous write.
-	 */
-	Mono<UpdateResult> upsert(Query query, Update update, Class<?> entityClass);
-
-	/**
-	 * Performs an upsert. If no document is found that matches the query, a new document is created and inserted by
-	 * combining the query document and the update document.
-	 *
-	 * @param query the query document that specifies the criteria used to select a record to be updated
-	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
-	 *          object.
-	 * @param collectionName name of the collection to update the object in
-	 * @return the WriteResult which lets you access the results of the previous write.
-	 */
-	Mono<UpdateResult> upsert(Query query, Update update, String collectionName);
-
-	/**
-	 * Performs an upsert. If no document is found that matches the query, a new document is created and inserted by
-	 * combining the query document and the update document.
-	 *
-	 * @param query the query document that specifies the criteria used to select a record to be upserted
-	 * @param update the update document that contains the updated object or $ operators to manipulate the existing object
-	 * @param entityClass class of the pojo to be operated on
-	 * @param collectionName name of the collection to update the object in
-	 * @return the WriteResult which lets you access the results of the previous write.
-	 */
-	Mono<UpdateResult> upsert(Query query, Update update, Class<?> entityClass, String collectionName);
-
-	/**
-	 * Updates the first object that is found in the collection of the entity class that matches the query document with
-	 * the provided update document.
-	 *
-	 * @param query the query document that specifies the criteria used to select a record to be updated
-	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
-	 *          object.
-	 * @param entityClass class that determines the collection to use
-	 * @return the WriteResult which lets you access the results of the previous write.
-	 */
-	Mono<UpdateResult> updateFirst(Query query, Update update, Class<?> entityClass);
-
-	/**
-	 * Updates the first object that is found in the specified collection that matches the query document criteria with
-	 * the provided updated document.
-	 *
-	 * @param query the query document that specifies the criteria used to select a record to be updated
-	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
-	 *          object.
-	 * @param collectionName name of the collection to update the object in
-	 * @return the WriteResult which lets you access the results of the previous write.
-	 */
-	Mono<UpdateResult> updateFirst(Query query, Update update, String collectionName);
-
-	/**
-	 * Updates the first object that is found in the specified collection that matches the query document criteria with
-	 * the provided updated document.
-	 *
-	 * @param query the query document that specifies the criteria used to select a record to be updated
-	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
-	 *          object.
-	 * @param entityClass class of the pojo to be operated on
-	 * @param collectionName name of the collection to update the object in
-	 * @return the WriteResult which lets you access the results of the previous write.
-	 */
-	Mono<UpdateResult> updateFirst(Query query, Update update, Class<?> entityClass, String collectionName);
-
-	/**
-	 * Updates all objects that are found in the collection for the entity class that matches the query document criteria
-	 * with the provided updated document.
-	 *
-	 * @param query the query document that specifies the criteria used to select a record to be updated
-	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
-	 *          object.
-	 * @param entityClass class that determines the collection to use
-	 * @return the WriteResult which lets you access the results of the previous write.
-	 */
-	Mono<UpdateResult> updateMulti(Query query, Update update, Class<?> entityClass);
-
-	/**
-	 * Updates all objects that are found in the specified collection that matches the query document criteria with the
-	 * provided updated document.
-	 *
-	 * @param query the query document that specifies the criteria used to select a record to be updated
-	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
-	 *          object.
-	 * @param collectionName name of the collection to update the object in
-	 * @return the WriteResult which lets you access the results of the previous write.
-	 */
-	Mono<UpdateResult> updateMulti(Query query, Update update, String collectionName);
-
-	/**
-	 * Updates all objects that are found in the collection for the entity class that matches the query document criteria
-	 * with the provided updated document.
-	 *
-	 * @param query the query document that specifies the criteria used to select a record to be updated
-	 * @param update the update document that contains the updated object or $ operators to manipulate the existing
-	 *          object.
-	 * @param entityClass class of the pojo to be operated on
-	 * @param collectionName name of the collection to update the object in
-	 * @return the WriteResult which lets you access the results of the previous write.
-	 */
-	Mono<UpdateResult> updateMulti(final Query query, final Update update, Class<?> entityClass, String collectionName);
-
-	/**
-	 * Remove the given object from the collection by id.
-	 *
-	 * @param object
-	 * @return
-	 */
-	Mono<DeleteResult> remove(Object object);
-
-	/**
-	 * Removes the given object from the given collection.
-	 *
-	 * @param object
-	 * @param collection must not be {@literal null} or empty.
-	 */
-	Mono<DeleteResult> remove(Object object, String collection);
-
-	/**
-	 * Remove the given object from the collection by id.
-	 *
-	 * @param objectToRemove
-	 * @return
-	 */
-	Mono<DeleteResult> remove(Mono<? extends Object> objectToRemove);
-
-	/**
-	 * Removes the given object from the given collection.
-	 *
-	 * @param objectToRemove
-	 * @param collection must not be {@literal null} or empty.
-	 * @return
-	 */
-	Mono<DeleteResult> remove(Mono<? extends Object> objectToRemove, String collection);
-
-	/**
-	 * Remove all documents that match the provided query document criteria from the the collection used to store the
-	 * entityClass. The Class parameter is also used to help convert the Id of the object if it is present in the query.
-	 *
-	 * @param query
-	 * @param entityClass
-	 * @return
-	 */
-	Mono<DeleteResult> remove(Query query, Class<?> entityClass);
-
-	/**
-	 * Remove all documents that match the provided query document criteria from the the collection used to store the
-	 * entityClass. The Class parameter is also used to help convert the Id of the object if it is present in the query.
-	 *
-	 * @param query
-	 * @param entityClass
-	 * @param collectionName
-	 * @return
-	 */
-	Mono<DeleteResult> remove(Query query, Class<?> entityClass, String collectionName);
-
-	/**
-	 * Remove all documents from the specified collection that match the provided query document criteria. There is no
-	 * conversion/mapping done for any criteria using the id field.
-	 *
-	 * @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
-	 */
-	Mono<DeleteResult> remove(Query query, String collectionName);
-
-	/**
-	 * Returns and removes all documents form the specified collection that match the provided query.
-	 *
-	 * @param query
-	 * @param collectionName
-	 * @return
-	 */
-	<T> Flux<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
-	 */
-	<T> Flux<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
-	 */
-	<T> Flux<T> findAllAndRemove(Query query, Class<T> entityClass, String collectionName);
-
-	/**
-	 * Map the results of an ad-hoc query on the collection for the entity class to a stream of objects of the specified
-	 * type. The stream uses a {@link com.mongodb.CursorType#TailableAwait tailable} cursor that may be an infinite
-	 * stream. The stream will not be completed unless the {@link org.reactivestreams.Subscription} is
-	 * {@link Subscription#cancel() canceled}.
-	 * <p/>
-	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
-	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
-	 * feature rich {@link Query}.
-	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
-	 *          specification
-	 * @param entityClass the parametrized type of the returned {@link Flux}.
-	 * @return the {@link Flux} of converted objects
-	 */
-	<T> Flux<T> tail(Query query, Class<T> entityClass);
-
-	/**
-	 * Map the results of an ad-hoc query on the collection for the entity class to a stream of objects of the specified
-	 * type. The stream uses a {@link com.mongodb.CursorType#TailableAwait tailable} cursor that may be an infinite
-	 * stream. The stream will not be completed unless the {@link org.reactivestreams.Subscription} is
-	 * {@link Subscription#cancel() canceled}.
-	 * <p/>
-	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
-	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
-	 * feature rich {@link Query}.
-	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
-	 *          specification
-	 * @param entityClass the parametrized type of the returned {@link Flux}.
-	 * @param collectionName name of the collection to retrieve the objects from
-	 * @return the {@link Flux} of converted objects
-	 */
-	<T> Flux<T> tail(Query query, Class<T> entityClass, String collectionName);
-
-	/**
-	 * Returns the underlying {@link MongoConverter}.
-	 *
-	 * @return
-	 */
-	MongoConverter getConverter();
-
-}

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

@@ -20,10 +20,10 @@ import static org.springframework.util.ReflectionUtils.*;
 
 import java.lang.reflect.Method;
 
-import org.bson.Document;
 import org.springframework.data.mongodb.util.MongoClientVersion;
 
 import com.mongodb.DBCollection;
+import com.mongodb.DBObject;
 
 /**
  * {@link ReflectiveDBCollectionInvoker} provides reflective access to {@link DBCollection} API that is not consistently
@@ -40,7 +40,7 @@ class ReflectiveDBCollectionInvoker {
 
 	static {
 
-		GEN_INDEX_NAME_METHOD = findMethod(DBCollection.class, "genIndexName", Document.class);
+		GEN_INDEX_NAME_METHOD = findMethod(DBCollection.class, "genIndexName", DBObject.class);
 		RESET_INDEX_CHACHE_METHOD = findMethod(DBCollection.class, "resetIndexCache");
 	}
 
@@ -53,7 +53,7 @@ class ReflectiveDBCollectionInvoker {
 	 * @param keys the names of the fields used in this index
 	 * @return
 	 */
-	public static String generateIndexName(Document keys) {
+	public static String generateIndexName(DBObject keys) {
 
 		if (isMongo3Driver()) {
 			return genIndexName(keys);
@@ -79,14 +79,14 @@ class ReflectiveDBCollectionInvoker {
 	}
 
 	/**
-	 * Borrowed from MongoDB Java driver version 2. See
-	 * <a href="http://github.com/mongodb/mongo-java-driver/blob/r2.13.0/src/main/com/mongodb/DBCollection.java#L754" >
-	 * http://github.com/mongodb/mongo-java-driver/blob/r2.13.0/src/main/com/mongodb/DBCollection.java#L754</a>
+	 * Borrowed from MongoDB Java driver version 2. See <a
+	 * href="http://github.com/mongodb/mongo-java-driver/blob/r2.13.0/src/main/com/mongodb/DBCollection.java#L754"
+	 * >http://github.com/mongodb/mongo-java-driver/blob/r2.13.0/src/main/com/mongodb/DBCollection.java#L754</a>
 	 * 
 	 * @param keys
 	 * @return
 	 */
-	private static String genIndexName(Document keys) {
+	private static String genIndexName(DBObject keys) {
 
 		StringBuilder name = new StringBuilder();
 

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

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

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

@@ -22,7 +22,6 @@ import java.lang.reflect.Method;
 
 import com.mongodb.MongoException;
 import com.mongodb.WriteResult;
-import com.mongodb.client.result.UpdateResult;
 
 /**
  * {@link ReflectiveWriteResultInvoker} provides reflective access to {@link WriteResult} API that is not consistently
@@ -36,7 +35,6 @@ final class ReflectiveWriteResultInvoker {
 
 	private static final Method GET_ERROR_METHOD;
 	private static final Method WAS_ACKNOWLEDGED_METHOD;
-	private static final Method WAS_ACKNOWLEDGED_METHOD_UR;
 
 	private ReflectiveWriteResultInvoker() {}
 
@@ -44,7 +42,6 @@ final class ReflectiveWriteResultInvoker {
 
 		GET_ERROR_METHOD = findMethod(WriteResult.class, "getError");
 		WAS_ACKNOWLEDGED_METHOD = findMethod(WriteResult.class, "wasAcknowledged");
-		WAS_ACKNOWLEDGED_METHOD_UR = findMethod(UpdateResult.class, "wasAcknowledged");
 	}
 
 	/**
@@ -67,12 +64,4 @@ final class ReflectiveWriteResultInvoker {
 	public static boolean wasAcknowledged(WriteResult writeResult) {
 		return isMongo3Driver() ? ((Boolean) invokeMethod(WAS_ACKNOWLEDGED_METHOD, writeResult)).booleanValue() : true;
 	}
-
-	/**
-	 * @param writeResult
-	 * @return return in case of MongoDB Java driver version 2.
-	 */
-	public static boolean wasAcknowledged(UpdateResult writeResult) {
-		return isMongo3Driver() ? ((Boolean) invokeMethod(WAS_ACKNOWLEDGED_METHOD_UR, writeResult)).booleanValue() : true;
-	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,6 @@ import com.mongodb.MongoClientURI;
 import com.mongodb.MongoException;
 import com.mongodb.MongoURI;
 import com.mongodb.WriteConcern;
-import com.mongodb.client.MongoDatabase;
 
 /**
  * Factory to create {@link DB} instances from a {@link Mongo} instance.
@@ -188,7 +187,7 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.MongoDbFactory#getDb()
 	 */
-	public MongoDatabase getDb() throws DataAccessException {
+	public DB getDb() throws DataAccessException {
 		return getDb(databaseName);
 	}
 
@@ -196,17 +195,18 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.MongoDbFactory#getDb(java.lang.String)
 	 */
-	public MongoDatabase getDb(String dbName) throws DataAccessException {
+	@SuppressWarnings("deprecation")
+	public DB getDb(String dbName) throws DataAccessException {
 
 		Assert.hasText(dbName, "Database name must not be empty.");
 
-		MongoDatabase db = ((MongoClient) mongo).getDatabase(dbName);
+		DB db = MongoDbUtils.getDB(mongo, dbName, credentials, authenticationDatabaseName);
 
-		if (writeConcern == null) {
-			return db;
+		if (writeConcern != null) {
+			db.setWriteConcern(writeConcern);
 		}
 
-		return db.withWriteConcern(writeConcern);
+		return db;
 	}
 
 	/**
@@ -232,10 +232,4 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	public PersistenceExceptionTranslator getExceptionTranslator() {
 		return this.exceptionTranslator;
 	}
-
-	@SuppressWarnings("deprecation")
-	@Override
-	public DB getLegacyDb() {
-		return mongo.getDB(databaseName);
-	}
 }

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

@@ -1,134 +0,0 @@
-/*
- * Copyright 2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import java.net.UnknownHostException;
-
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.dao.DataAccessException;
-import org.springframework.dao.support.PersistenceExceptionTranslator;
-import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory;
-import org.springframework.util.Assert;
-
-import com.mongodb.ConnectionString;
-import com.mongodb.WriteConcern;
-import com.mongodb.reactivestreams.client.MongoClient;
-import com.mongodb.reactivestreams.client.MongoClients;
-import com.mongodb.reactivestreams.client.MongoDatabase;
-
-/**
- * Factory to create {@link MongoDatabase} instances from a {@link MongoClient} instance.
- *
- * @author Mark Paluch
- * @since 2.0
- */
-public class SimpleReactiveMongoDatabaseFactory implements DisposableBean, ReactiveMongoDatabaseFactory {
-
-	private final MongoClient mongo;
-	private final String databaseName;
-	private final boolean mongoInstanceCreated;
-	private final PersistenceExceptionTranslator exceptionTranslator;
-
-	private WriteConcern writeConcern;
-
-	/**
-	 * Creates a new {@link SimpleReactiveMongoDatabaseFactory} instance from the given {@link ConnectionString}.
-	 *
-	 * @param connectionString must not be {@literal null}.
-	 * @throws UnknownHostException
-	 */
-	public SimpleReactiveMongoDatabaseFactory(ConnectionString connectionString) throws UnknownHostException {
-		this(MongoClients.create(connectionString), connectionString.getDatabase(), true);
-	}
-
-	/**
-	 * Creates a new {@link SimpleReactiveMongoDatabaseFactory} instance from the given {@link MongoClient}.
-	 *
-	 * @param mongoClient must not be {@literal null}.
-	 * @param databaseName must not be {@literal null}.
-	 * @since 1.7
-	 */
-	public SimpleReactiveMongoDatabaseFactory(MongoClient mongoClient, String databaseName) {
-		this(mongoClient, databaseName, false);
-	}
-
-	private SimpleReactiveMongoDatabaseFactory(MongoClient client, String databaseName, boolean mongoInstanceCreated) {
-
-		Assert.notNull(client, "MongoClient must not be null!");
-		Assert.hasText(databaseName, "Database name must not be empty!");
-		Assert.isTrue(databaseName.matches("[\\w-]+"),
-				"Database name must only contain letters, numbers, underscores and dashes!");
-
-		this.mongo = client;
-		this.databaseName = databaseName;
-		this.mongoInstanceCreated = mongoInstanceCreated;
-		this.exceptionTranslator = new MongoExceptionTranslator();
-	}
-
-	/**
-	 * Configures the {@link WriteConcern} to be used on the {@link MongoDatabase} instance being created.
-	 *
-	 * @param writeConcern the writeConcern to set
-	 */
-	public void setWriteConcern(WriteConcern writeConcern) {
-		this.writeConcern = writeConcern;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.ReactiveMongoDbFactory#getMongoDatabase()
-	 */
-	public MongoDatabase getMongoDatabase() throws DataAccessException {
-		return getMongoDatabase(databaseName);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.ReactiveMongoDbFactory#getMongoDatabase(java.lang.String)
-	 */
-	public MongoDatabase getMongoDatabase(String dbName) throws DataAccessException {
-
-		Assert.hasText(dbName, "Database name must not be empty.");
-
-		MongoDatabase db = ReactiveMongoDbUtils.getMongoDatabase(mongo, dbName);
-
-		if (writeConcern != null) {
-
-			db = db.withWriteConcern(writeConcern);
-		}
-
-		return db;
-	}
-
-	/**
-	 * Clean up the Mongo instance if it was created by the factory itself.
-	 *
-	 * @see DisposableBean#destroy()
-	 */
-	public void destroy() throws Exception {
-		if (mongoInstanceCreated) {
-			mongo.close();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.ReactiveMongoDbFactory#getExceptionTranslator()
-	 */
-	public PersistenceExceptionTranslator getExceptionTranslator() {
-		return this.exceptionTranslator;
-	}
-}

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

@@ -21,7 +21,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.bson.Document;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
@@ -33,6 +32,9 @@ import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.SerializationUtils;
 import org.springframework.util.Assert;
 
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
 /**
  * An {@code Aggregation} is a representation of a list of aggregation steps to be performed by the MongoDB Aggregation
  * Framework.
@@ -42,8 +44,6 @@ import org.springframework.util.Assert;
  * @author Oliver Gierke
  * @author Mark Paluch
  * @author Alessio Fachechi
- * @author Christoph Strobl
- * @author Nikolay Bogdanov
  * @since 1.3
  */
 public class Aggregation {
@@ -159,21 +159,10 @@ public class Aggregation {
 		Assert.isTrue(!aggregationOperations.isEmpty(), "At least one AggregationOperation has to be provided");
 		Assert.notNull(options, "AggregationOptions must not be null!");
 
-		// check $out is the last operation if it exists
-		for (AggregationOperation aggregationOperation : aggregationOperations) {
-			if (aggregationOperation instanceof OutOperation && !isLast(aggregationOperation, aggregationOperations)) {
-				throw new IllegalArgumentException("The $out operator must be the last stage in the pipeline.");
-			}
-		}
-
 		this.operations = aggregationOperations;
 		this.options = options;
 	}
 
-	private boolean isLast(AggregationOperation aggregationOperation, List<AggregationOperation> aggregationOperations) {
-		return aggregationOperations.indexOf(aggregationOperation) == aggregationOperations.size() - 1;
-	}
-
 	/**
 	 * A pointer to the previous {@link AggregationOperation}.
 	 *
@@ -206,57 +195,13 @@ public class Aggregation {
 	/**
 	 * Factory method to create a new {@link UnwindOperation} for the field with the given name.
 	 *
-	 * @param field must not be {@literal null} or empty.
+	 * @param fieldName must not be {@literal null} or empty.
 	 * @return
 	 */
 	public static UnwindOperation unwind(String field) {
 		return new UnwindOperation(field(field));
 	}
 
-	/**
-	 * Factory method to create a new {@link UnwindOperation} for the field with the given name and
-	 * {@code preserveNullAndEmptyArrays}. Note that extended unwind is supported in MongoDB version 3.2+.
-	 *
-	 * @param field must not be {@literal null} or empty.
-	 * @param preserveNullAndEmptyArrays {@literal true} to output the document if path is {@literal null}, missing or
-	 *          array is empty.
-	 * @return new {@link UnwindOperation}
-	 * @since 1.10
-	 */
-	public static UnwindOperation unwind(String field, boolean preserveNullAndEmptyArrays) {
-		return new UnwindOperation(field(field), preserveNullAndEmptyArrays);
-	}
-
-	/**
-	 * Factory method to create a new {@link UnwindOperation} for the field with the given name including the name of a
-	 * new field to hold the array index of the element as {@code arrayIndex}. Note that extended unwind is supported in
-	 * MongoDB version 3.2+.
-	 *
-	 * @param field must not be {@literal null} or empty.
-	 * @param arrayIndex must not be {@literal null} or empty.
-	 * @return new {@link UnwindOperation}
-	 * @since 1.10
-	 */
-	public static UnwindOperation unwind(String field, String arrayIndex) {
-		return new UnwindOperation(field(field), field(arrayIndex), false);
-	}
-
-	/**
-	 * Factory method to create a new {@link UnwindOperation} for the field with the given nameincluding the name of a new
-	 * field to hold the array index of the element as {@code arrayIndex} using {@code preserveNullAndEmptyArrays}. Note
-	 * that extended unwind is supported in MongoDB version 3.2+.
-	 *
-	 * @param field must not be {@literal null} or empty.
-	 * @param arrayIndex must not be {@literal null} or empty.
-	 * @param preserveNullAndEmptyArrays {@literal true} to output the document if path is {@literal null}, missing or
-	 *          array is empty.
-	 * @return new {@link UnwindOperation}
-	 * @since 1.10
-	 */
-	public static UnwindOperation unwind(String field, String arrayIndex, boolean preserveNullAndEmptyArrays) {
-		return new UnwindOperation(field(field), field(arrayIndex), preserveNullAndEmptyArrays);
-	}
-
 	/**
 	 * Creates a new {@link GroupOperation} for the given fields.
 	 *
@@ -303,22 +248,11 @@ public class Aggregation {
 	 *
 	 * @param elementsToSkip must not be less than zero.
 	 * @return
-	 * @deprecated prepare to get this one removed in favor of {@link #skip(long)}.
 	 */
 	public static SkipOperation skip(int elementsToSkip) {
 		return new SkipOperation(elementsToSkip);
 	}
 
-	/**
-	 * Creates a new {@link SkipOperation} skipping the given number of elements.
-	 *
-	 * @param elementsToSkip must not be less than zero.
-	 * @return
-	 */
-	public static SkipOperation skip(long elementsToSkip) {
-		return new SkipOperation(elementsToSkip);
-	}
-
 	/**
 	 * Creates a new {@link LimitOperation} limiting the result to the given number of elements.
 	 *
@@ -339,20 +273,6 @@ public class Aggregation {
 		return new MatchOperation(criteria);
 	}
 
-	/**
-	 * Creates a new {@link OutOperation} using the given collection name. This operation must be the last operation in
-	 * the pipeline.
-	 *
-	 * @param outCollectionName collection name to export aggregation results. The {@link OutOperation} creates a new
-	 *          collection in the current database if one does not already exist. The collection is not visible until the
-	 *          aggregation completes. If the aggregation fails, MongoDB does not create the collection. Must not be
-	 *          {@literal null}.
-	 * @return
-	 */
-	public static OutOperation out(String outCollectionName) {
-		return new OutOperation(outCollectionName);
-	}
-
 	/**
 	 * Creates a new {@link LookupOperation}.
 	 *
@@ -381,68 +301,6 @@ public class Aggregation {
 		return new LookupOperation(from, localField, foreignField, as);
 	}
 
-	/**
-	 * Creates a new {@link IfNullOperator} for the given {@code field} and {@code replacement} value.
-	 *
-	 * @param field must not be {@literal null}.
-	 * @param replacement must not be {@literal null}.
-	 * @return never {@literal null}.
-	 * @since 1.10
-	 */
-	public static IfNullOperator ifNull(String field, Object replacement) {
-		return IfNullOperator.newBuilder().ifNull(field).thenReplaceWith(replacement);
-	}
-
-	/**
-	 * Creates a new {@link IfNullOperator} for the given {@link Field} and {@link Field} to obtain a value from.
-	 *
-	 * @param field must not be {@literal null}.
-	 * @param replacement must not be {@literal null}.
-	 * @return never {@literal null}.
-	 * @since 1.10
-	 */
-	public static IfNullOperator ifNull(Field field, Field replacement) {
-		return IfNullOperator.newBuilder().ifNull(field).thenReplaceWith(replacement);
-	}
-
-	/**
-	 * Creates a new {@link IfNullOperator} for the given {@link Field} and {@code replacement} value.
-	 *
-	 * @param field must not be {@literal null}.
-	 * @param replacement must not be {@literal null}.
-	 * @return never {@literal null}.
-	 * @since 1.10
-	 */
-	public static IfNullOperator ifNull(Field field, Object replacement) {
-		return IfNullOperator.newBuilder().ifNull(field).thenReplaceWith(replacement);
-	}
-
-	/**
-	 * Creates a new {@link ConditionalOperator} for the given {@link Field} that holds a {@literal boolean} value.
-	 *
-	 * @param booleanField must not be {@literal null}.
-	 * @param then must not be {@literal null}.
-	 * @param otherwise must not be {@literal null}.
-	 * @return never {@literal null}.
-	 * @since 1.10
-	 */
-	public static ConditionalOperator conditional(Field booleanField, Object then, Object otherwise) {
-		return ConditionalOperator.newBuilder().when(booleanField).then(then).otherwise(otherwise);
-	}
-
-	/**
-	 * Creates a new {@link ConditionalOperator} for the given {@link Criteria}.
-	 *
-	 * @param criteria must not be {@literal null}.
-	 * @param then must not be {@literal null}.
-	 * @param otherwise must not be {@literal null}.
-	 * @return never {@literal null}.
-	 * @since 1.10
-	 */
-	public static ConditionalOperator conditional(Criteria criteria, Object then, Object otherwise) {
-		return ConditionalOperator.newBuilder().when(criteria).then(then).otherwise(otherwise);
-	}
-
 	/**
 	 * Creates a new {@link Fields} instance for the given field names.
 	 *
@@ -489,19 +347,19 @@ public class Aggregation {
 	}
 
 	/**
-	 * Converts this {@link Aggregation} specification to a {@link Document}.
+	 * Converts this {@link Aggregation} specification to a {@link DBObject}.
 	 *
 	 * @param inputCollectionName the name of the input collection
-	 * @return the {@code Document} representing this aggregation
+	 * @return the {@code DBObject} representing this aggregation
 	 */
-	public Document toDocument(String inputCollectionName, AggregationOperationContext rootContext) {
+	public DBObject toDbObject(String inputCollectionName, AggregationOperationContext rootContext) {
 
 		AggregationOperationContext context = rootContext;
-		List<Document> operationDocuments = new ArrayList<Document>(operations.size());
+		List<DBObject> operationDocuments = new ArrayList<DBObject>(operations.size());
 
 		for (AggregationOperation operation : operations) {
 
-			operationDocuments.add(operation.toDocument(context));
+			operationDocuments.add(operation.toDBObject(context));
 
 			if (operation instanceof FieldsExposingAggregationOperation) {
 
@@ -515,7 +373,7 @@ public class Aggregation {
 			}
 		}
 
-		Document command = new Document("aggregate", inputCollectionName);
+		DBObject command = new BasicDBObject("aggregate", inputCollectionName);
 		command.put("pipeline", operationDocuments);
 
 		command = options.applyAndReturnPotentiallyChangedCommand(command);
@@ -530,7 +388,7 @@ public class Aggregation {
 	@Override
 	public String toString() {
 		return SerializationUtils
-				.serializeToJsonSafely(toDocument("__collection__", new NoOpAggregationOperationContext()));
+				.serializeToJsonSafely(toDbObject("__collection__", new NoOpAggregationOperationContext()));
 	}
 
 	/**
@@ -542,11 +400,11 @@ public class Aggregation {
 
 		/* 
 		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(com.mongodb.Document)
+		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(com.mongodb.DBObject)
 		 */
 		@Override
-		public Document getMappedObject(Document document) {
-			return document;
+		public DBObject getMappedObject(DBObject dbObject) {
+			return dbObject;
 		}
 
 		/* 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 the original author or authors.
+ * Copyright 2015 the original author 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,24 +15,23 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import org.bson.Document;
+import com.mongodb.DBObject;
 
 /**
  * An {@link AggregationExpression} can be used with field expressions in aggregation pipeline stages like
  * {@code project} and {@code group}.
- *
+ * 
  * @author Thomas Darimont
  * @author Oliver Gierke
- * @author Christoph Strobl
  */
-public interface AggregationExpression {
+interface AggregationExpression {
 
 	/**
-	 * Turns the {@link AggregationExpression} into a {@link Document} within the given
+	 * Turns the {@link AggregationExpression} into a {@link DBObject} within the given
 	 * {@link AggregationOperationContext}.
-	 *
+	 * 
 	 * @param context
 	 * @return
 	 */
-	Document toDocument(AggregationOperationContext context);
+	DBObject toDbObject(AggregationOperationContext context);
 }

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

@@ -15,7 +15,6 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import org.bson.Document;
 import org.springframework.data.mongodb.core.aggregation.AggregationExpressionTransformer.AggregationExpressionTransformationContext;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
 import org.springframework.data.mongodb.core.spel.ExpressionNode;
@@ -23,16 +22,16 @@ import org.springframework.data.mongodb.core.spel.ExpressionTransformationContex
 import org.springframework.data.mongodb.core.spel.ExpressionTransformer;
 import org.springframework.util.Assert;
 
+import com.mongodb.DBObject;
+
 /**
  * Interface to type an {@link ExpressionTransformer} to the contained
  * {@link AggregationExpressionTransformationContext}.
  * 
  * @author Oliver Gierke
- * @author Christoph Strobl
- * @since 1.4
  */
-interface AggregationExpressionTransformer
-		extends ExpressionTransformer<AggregationExpressionTransformationContext<ExpressionNode>> {
+interface AggregationExpressionTransformer extends
+		ExpressionTransformer<AggregationExpressionTransformationContext<ExpressionNode>> {
 
 	/**
 	 * A special {@link ExpressionTransformationContextSupport} to be aware of the {@link AggregationOperationContext}.
@@ -40,8 +39,8 @@ interface AggregationExpressionTransformer
 	 * @author Oliver Gierke
 	 * @author Thomas Darimont
 	 */
-	class AggregationExpressionTransformationContext<T extends ExpressionNode>
-			extends ExpressionTransformationContextSupport<T> {
+	public static class AggregationExpressionTransformationContext<T extends ExpressionNode> extends
+			ExpressionTransformationContextSupport<T> {
 
 		private final AggregationOperationContext aggregationContext;
 
@@ -54,7 +53,7 @@ interface AggregationExpressionTransformer
 		 * @param aggregationContext must not be {@literal null}.
 		 */
 		public AggregationExpressionTransformationContext(T currentNode, ExpressionNode parentNode,
-				Document previousOperationObject, AggregationOperationContext context) {
+				DBObject previousOperationObject, AggregationOperationContext context) {
 
 			super(currentNode, parentNode, previousOperationObject);
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 the original author or authors.
+ * Copyright 2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,17 +19,17 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.bson.Document;
 import org.springframework.util.Assert;
 
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
 /**
  * An enum of supported {@link AggregationExpression}s in aggregation pipeline stages.
  * 
  * @author Thomas Darimont
  * @author Oliver Gierke
- * @author Christoph Strobl
- * @author Mark Paluch
- * @since 1.7
+ * @since 1.10
  */
 public enum AggregationFunctionExpressions {
 
@@ -76,10 +76,10 @@ public enum AggregationFunctionExpressions {
 
 		/*
 		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.Expression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 * @see org.springframework.data.mongodb.core.aggregation.Expression#toDbObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 		 */
 		@Override
-		public Document toDocument(AggregationOperationContext context) {
+		public DBObject toDbObject(AggregationOperationContext context) {
 
 			List<Object> args = new ArrayList<Object>(values.size());
 
@@ -87,13 +87,13 @@ public enum AggregationFunctionExpressions {
 				args.add(unpack(value, context));
 			}
 
-			return new Document("$" + name, args);
+			return new BasicDBObject("$" + name, args);
 		}
 
 		private static Object unpack(Object value, AggregationOperationContext context) {
 
 			if (value instanceof AggregationExpression) {
-				return ((AggregationExpression) value).toDocument(context);
+				return ((AggregationExpression) value).toDbObject(context);
 			}
 
 			if (value instanceof Field) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import org.bson.Document;
+import com.mongodb.DBObject;
 
 /**
  * Represents one single operation in an aggregation pipeline.
@@ -23,16 +23,15 @@ import org.bson.Document;
  * @author Sebastian Herold
  * @author Thomas Darimont
  * @author Oliver Gierke
- * @author Christoph Strobl
  * @since 1.3
  */
 public interface AggregationOperation {
 
 	/**
-	 * Turns the {@link AggregationOperation} into a {@link Document} by using the given
+	 * Turns the {@link AggregationOperation} into a {@link DBObject} by using the given
 	 * {@link AggregationOperationContext}.
 	 * 
-	 * @return the Document
+	 * @return the DBObject
 	 */
-	Document toDocument(AggregationOperationContext context);
+	DBObject toDBObject(AggregationOperationContext context);
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 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,25 +15,25 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import org.bson.Document;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
 
+import com.mongodb.DBObject;
+
 /**
  * The context for an {@link AggregationOperation}.
  * 
  * @author Oliver Gierke
- * @author Christoph Strobl
  * @since 1.3
  */
 public interface AggregationOperationContext {
 
 	/**
-	 * Returns the mapped {@link Document}, potentially converting the source considering mapping metadata etc.
+	 * Returns the mapped {@link DBObject}, potentially converting the source considering mapping metadata etc.
 	 * 
-	 * @param document will never be {@literal null}.
+	 * @param dbObject will never be {@literal null}.
 	 * @return must not be {@literal null}.
 	 */
-	Document getMappedObject(Document document);
+	DBObject getMappedObject(DBObject dbObject);
 
 	/**
 	 * Returns a {@link FieldReference} for the given field or {@literal null} if the context does not expose the given

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * 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.
@@ -15,7 +15,8 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import org.bson.Document;
+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
@@ -24,7 +25,6 @@ import org.bson.Document;
  * 
  * @author Thomas Darimont
  * @author Oliver Gierke
- * @author Christoph Strobl
  * @see Aggregation#withOptions(AggregationOptions)
  * @see TypedAggregation#withOptions(AggregationOptions)
  * @since 1.6
@@ -37,7 +37,7 @@ public class AggregationOptions {
 
 	private final boolean allowDiskUse;
 	private final boolean explain;
-	private final Document cursor;
+	private final DBObject cursor;
 
 	/**
 	 * Creates a new {@link AggregationOptions}.
@@ -46,7 +46,7 @@ public class AggregationOptions {
 	 * @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, Document cursor) {
+	public AggregationOptions(boolean allowDiskUse, boolean explain, DBObject cursor) {
 
 		this.allowDiskUse = allowDiskUse;
 		this.explain = explain;
@@ -77,7 +77,7 @@ public class AggregationOptions {
 	 * 
 	 * @return
 	 */
-	public Document getCursor() {
+	public DBObject getCursor() {
 		return cursor;
 	}
 
@@ -88,19 +88,19 @@ public class AggregationOptions {
 	 * @param command the aggregation command.
 	 * @return
 	 */
-	Document applyAndReturnPotentiallyChangedCommand(Document command) {
+	DBObject applyAndReturnPotentiallyChangedCommand(DBObject command) {
 
-		Document result = new Document(command);
+		DBObject result = new BasicDBObject(command.toMap());
 
-		if (allowDiskUse && !result.containsKey(ALLOW_DISK_USE)) {
+		if (allowDiskUse && !result.containsField(ALLOW_DISK_USE)) {
 			result.put(ALLOW_DISK_USE, allowDiskUse);
 		}
 
-		if (explain && !result.containsKey(EXPLAIN)) {
+		if (explain && !result.containsField(EXPLAIN)) {
 			result.put(EXPLAIN, explain);
 		}
 
-		if (cursor != null && !result.containsKey(CURSOR)) {
+		if (cursor != null && !result.containsField(CURSOR)) {
 			result.put("cursor", cursor);
 		}
 
@@ -108,18 +108,18 @@ public class AggregationOptions {
 	}
 
 	/**
-	 * Returns a {@link Document} representation of this {@link AggregationOptions}.
+	 * Returns a {@link DBObject} representation of this {@link AggregationOptions}.
 	 * 
 	 * @return
 	 */
-	public Document toDocument() {
+	public DBObject toDbObject() {
 
-		Document document = new Document();
-		document.put(ALLOW_DISK_USE, allowDiskUse);
-		document.put(EXPLAIN, explain);
-		document.put(CURSOR, cursor);
+		DBObject dbo = new BasicDBObject();
+		dbo.put(ALLOW_DISK_USE, allowDiskUse);
+		dbo.put(EXPLAIN, explain);
+		dbo.put(CURSOR, cursor);
 
-		return document;
+		return dbo;
 	}
 
 	/* (non-Javadoc)
@@ -127,7 +127,7 @@ public class AggregationOptions {
 	 */
 	@Override
 	public String toString() {
-		return toDocument().toJson();
+		return toDbObject().toString();
 	}
 
 	/**
@@ -139,7 +139,7 @@ public class AggregationOptions {
 
 		private boolean allowDiskUse;
 		private boolean explain;
-		private Document cursor;
+		private DBObject cursor;
 
 		/**
 		 * Defines whether to off-load intensive sort-operations to disk.
@@ -171,7 +171,7 @@ public class AggregationOptions {
 		 * @param cursor
 		 * @return
 		 */
-		public Builder cursor(Document cursor) {
+		public Builder cursor(DBObject cursor) {
 
 			this.cursor = cursor;
 			return this;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,23 +19,23 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-import org.bson.Document;
 import org.springframework.util.Assert;
 
+import com.mongodb.DBObject;
+
 /**
  * Collects the results of executing an aggregation operation.
  * 
  * @author Tobias Trelle
  * @author Oliver Gierke
  * @author Thomas Darimont
- * @author Christoph Strobl
  * @param <T> The class in which the results are mapped onto.
  * @since 1.3
  */
 public class AggregationResults<T> implements Iterable<T> {
 
 	private final List<T> mappedResults;
-	private final Document rawResults;
+	private final DBObject rawResults;
 	private final String serverUsed;
 
 	/**
@@ -44,7 +44,7 @@ public class AggregationResults<T> implements Iterable<T> {
 	 * @param mappedResults must not be {@literal null}.
 	 * @param rawResults must not be {@literal null}.
 	 */
-	public AggregationResults(List<T> mappedResults, Document rawResults) {
+	public AggregationResults(List<T> mappedResults, DBObject rawResults) {
 
 		Assert.notNull(mappedResults);
 		Assert.notNull(rawResults);
@@ -97,7 +97,7 @@ public class AggregationResults<T> implements Iterable<T> {
 	 * @return
 	 * @since 1.6
 	 */
-	public Document getRawResults() {
+	public DBObject getRawResults() {
 		return rawResults;
 	}
 

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

@@ -1,392 +0,0 @@
-/*
- * Copyright 2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.aggregation;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bson.Document;
-import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.data.mongodb.core.query.CriteriaDefinition;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-
-/**
- * Encapsulates the aggregation framework {@code $cond} operator. A {@link ConditionalOperator} allows nested conditions
- * {@code if-then[if-then-else]-else} using {@link Field}, {@link CriteriaDefinition} or a {@link Document custom}
- * condition. Replacement values can be either {@link Field field references}, values of simple MongoDB types or values
- * that can be converted to a simple MongoDB type.
- * 
- * @see http://docs.mongodb.com/manual/reference/operator/aggregation/cond/
- * @author Mark Paluch
- * @author Christoph Strobl
- * @since 1.10
- */
-public class ConditionalOperator implements AggregationExpression {
-
-	private final Object condition;
-	private final Object thenValue;
-	private final Object otherwiseValue;
-
-	/**
-	 * Creates a new {@link ConditionalOperator} for a given {@link Field} and {@code then}/{@code otherwise} values.
-	 *
-	 * @param condition must not be {@literal null}.
-	 * @param thenValue must not be {@literal null}.
-	 * @param otherwiseValue must not be {@literal null}.
-	 */
-	public ConditionalOperator(Field condition, Object thenValue, Object otherwiseValue) {
-		this((Object) condition, thenValue, otherwiseValue);
-	}
-
-	/**
-	 * Creates a new {@link ConditionalOperator} for a given {@link CriteriaDefinition} and {@code then}/{@code otherwise}
-	 * values.
-	 *
-	 * @param condition must not be {@literal null}.
-	 * @param thenValue must not be {@literal null}.
-	 * @param otherwiseValue must not be {@literal null}.
-	 */
-	public ConditionalOperator(CriteriaDefinition condition, Object thenValue, Object otherwiseValue) {
-		this((Object) condition, thenValue, otherwiseValue);
-	}
-
-	/**
-	 * Creates a new {@link ConditionalOperator} for a given {@link Document criteria} and {@code then}/{@code otherwise}
-	 * values.
-	 *
-	 * @param condition must not be {@literal null}.
-	 * @param thenValue must not be {@literal null}.
-	 * @param otherwiseValue must not be {@literal null}.
-	 */
-	public ConditionalOperator(Document condition, Object thenValue, Object otherwiseValue) {
-		this((Object) condition, thenValue, otherwiseValue);
-	}
-
-	private ConditionalOperator(Object condition, Object thenValue, Object otherwiseValue) {
-
-		Assert.notNull(condition, "Condition must not be null!");
-		Assert.notNull(thenValue, "'Then value' must not be null!");
-		Assert.notNull(otherwiseValue, "'Otherwise value' must not be null!");
-
-		assertNotBuilder(condition, "Condition");
-		assertNotBuilder(thenValue, "'Then value'");
-		assertNotBuilder(otherwiseValue, "'Otherwise value'");
-
-		this.condition = condition;
-		this.thenValue = thenValue;
-		this.otherwiseValue = otherwiseValue;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
-	@Override
-	public Document toDocument(AggregationOperationContext context) {
-
-		Document condObject = new Document();
-
-		condObject.append("if", resolveCriteria(context, condition));
-		condObject.append("then", resolveValue(context, thenValue));
-		condObject.append("else", resolveValue(context, otherwiseValue));
-
-		return new Document("$cond", condObject);
-	}
-
-	private Object resolveValue(AggregationOperationContext context, Object value) {
-
-		if (value instanceof Document || value instanceof Field) {
-			return resolve(context, value);
-		}
-
-		if (value instanceof ConditionalOperator) {
-			return ((ConditionalOperator) value).toDocument(context);
-		}
-
-		return context.getMappedObject(new Document("$set", value)).get("$set");
-	}
-
-	private Object resolveCriteria(AggregationOperationContext context, Object value) {
-
-		if (value instanceof Document || value instanceof Field) {
-			return resolve(context, value);
-		}
-
-		if (value instanceof CriteriaDefinition) {
-
-			Document mappedObject = context.getMappedObject(((CriteriaDefinition) value).getCriteriaObject());
-			List<Object> clauses = new ArrayList<Object>();
-
-			clauses.addAll(getClauses(context, mappedObject));
-
-			if (clauses.size() == 1) {
-				return clauses.get(0);
-			}
-
-			return clauses;
-		}
-
-		throw new InvalidDataAccessApiUsageException(
-				String.format("Invalid value in condition. Supported: Document, Field references, Criteria, got: %s", value));
-	}
-
-	private List<Object> getClauses(AggregationOperationContext context, Document mappedObject) {
-
-		List<Object> clauses = new ArrayList<Object>();
-
-		for (String key : mappedObject.keySet()) {
-
-			Object predicate = mappedObject.get(key);
-			clauses.addAll(getClauses(context, key, predicate));
-		}
-
-		return clauses;
-	}
-
-	private List<Object> getClauses(AggregationOperationContext context, String key, Object predicate) {
-
-		List<Object> clauses = new ArrayList<Object>();
-
-		if (predicate instanceof List) {
-
-			List<Object> args = new ArrayList<Object>();
-			for (Object clause : (List<?>) predicate) {
-				if (clause instanceof Document) {
-					args.addAll(getClauses(context, (Document) clause));
-				}
-			}
-
-			clauses.add(new Document(key, args));
-
-		} else if (predicate instanceof Document) {
-
-			Document nested = (Document) predicate;
-
-			for (String s : nested.keySet()) {
-
-				if (!isKeyword(s)) {
-					continue;
-				}
-
-				List<Object> args = new ArrayList<Object>();
-				args.add("$" + key);
-				args.add(nested.get(s));
-				clauses.add(new Document(s, args));
-			}
-
-		} else if (!isKeyword(key)) {
-
-			List<Object> args = new ArrayList<Object>();
-			args.add("$" + key);
-			args.add(predicate);
-			clauses.add(new Document("$eq", args));
-		}
-
-		return clauses;
-	}
-
-	/**
-	 * Returns whether the given {@link String} is a MongoDB keyword.
-	 *
-	 * @param candidate
-	 * @return
-	 */
-	private boolean isKeyword(String candidate) {
-		return candidate.startsWith("$");
-	}
-
-	private Object resolve(AggregationOperationContext context, Object value) {
-
-		if (value instanceof Document) {
-			return context.getMappedObject((Document) value);
-		}
-
-		return context.getReference((Field) value).toString();
-	}
-
-	private void assertNotBuilder(Object toCheck, String name) {
-		Assert.isTrue(!ClassUtils.isAssignableValue(ConditionalExpressionBuilder.class, toCheck),
-				String.format("%s must not be of type %s", name, ConditionalExpressionBuilder.class.getSimpleName()));
-	}
-
-	/**
-	 * Get a builder that allows fluent creation of {@link ConditionalOperator}.
-	 *
-	 * @return a new {@link ConditionalExpressionBuilder}.
-	 */
-	public static ConditionalExpressionBuilder newBuilder() {
-		return ConditionalExpressionBuilder.newBuilder();
-	}
-
-	/**
-	 * @since 1.10
-	 */
-	public static interface WhenBuilder {
-
-		/**
-		 * @param booleanExpression expression that yields in a boolean result, must not be {@literal null}.
-		 * @return the {@link ThenBuilder}
-		 */
-		ThenBuilder when(Document booleanExpression);
-
-		/**
-		 * @param booleanField reference to a field holding a boolean value, must not be {@literal null}.
-		 * @return the {@link ThenBuilder}
-		 */
-		ThenBuilder when(Field booleanField);
-
-		/**
-		 * @param booleanField name of a field holding a boolean value, must not be {@literal null}.
-		 * @return the {@link ThenBuilder}
-		 */
-		ThenBuilder when(String booleanField);
-
-		/**
-		 * @param criteria criteria to evaluate, must not be {@literal null}.
-		 * @return the {@link ThenBuilder}
-		 */
-		ThenBuilder when(CriteriaDefinition criteria);
-	}
-
-	/**
-	 * @since 1.10
-	 */
-	public static interface ThenBuilder {
-
-		/**
-		 * @param value the value to be used if the condition evaluates {@literal true}. Can be a {@link Document}, a value
-		 *          that is supported by MongoDB or a value that can be converted to a MongoDB representation but must not
-		 *          be {@literal null}.
-		 * @return the {@link OtherwiseBuilder}
-		 */
-		OtherwiseBuilder then(Object value);
-	}
-
-	/**
-	 * @since 1.10
-	 */
-	public static interface OtherwiseBuilder {
-
-		/**
-		 * @param value the value to be used if the condition evaluates {@literal false}. Can be a {@link Document}, a value
-		 *          that is supported by MongoDB or a value that can be converted to a MongoDB representation but must not
-		 *          be {@literal null}.
-		 * @return the {@link ConditionalOperator}
-		 */
-		ConditionalOperator otherwise(Object value);
-	}
-
-	/**
-	 * Builder for fluent {@link ConditionalOperator} creation.
-	 *
-	 * @author Mark Paluch
-	 * @since 1.10
-	 */
-	public static final class ConditionalExpressionBuilder implements WhenBuilder, ThenBuilder, OtherwiseBuilder {
-
-		private Object condition;
-		private Object thenValue;
-
-		private ConditionalExpressionBuilder() {}
-
-		/**
-		 * Creates a new builder for {@link ConditionalOperator}.
-		 *
-		 * @return never {@literal null}.
-		 */
-		public static ConditionalExpressionBuilder newBuilder() {
-			return new ConditionalExpressionBuilder();
-		}
-
-		/* 
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperator.WhenBuilder#when(org.bson.Document)
-		 */
-		@Override
-		public ConditionalExpressionBuilder when(Document booleanExpression) {
-
-			Assert.notNull(booleanExpression, "'Boolean expression' must not be null!");
-
-			this.condition = booleanExpression;
-			return this;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperator.WhenBuilder#when(org.springframework.data.mongodb.core.query.CriteriaDefinition)
-		 */
-		@Override
-		public ThenBuilder when(CriteriaDefinition criteria) {
-
-			Assert.notNull(criteria, "Criteria must not be null!");
-
-			this.condition = criteria;
-			return this;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperator.WhenBuilder#when(org.springframework.data.mongodb.core.aggregation.Field)
-		 */
-		@Override
-		public ThenBuilder when(Field booleanField) {
-
-			Assert.notNull(booleanField, "Boolean field must not be null!");
-
-			this.condition = booleanField;
-			return this;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperator.WhenBuilder#when(java.lang.String)
-		 */
-		@Override
-		public ThenBuilder when(String booleanField) {
-
-			Assert.hasText(booleanField, "Boolean field name must not be null or empty!");
-
-			this.condition = Fields.field(booleanField);
-			return this;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperator.ThenBuilder#then(java.lang.Object)
-		 */
-		@Override
-		public OtherwiseBuilder then(Object thenValue) {
-
-			Assert.notNull(thenValue, "'Then-value' must not be null!");
-
-			this.thenValue = thenValue;
-			return this;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperator.OtherwiseBuilder#otherwise(java.lang.Object)
-		 */
-		@Override
-		public ConditionalOperator otherwise(Object otherwiseValue) {
-
-			Assert.notNull(otherwiseValue, "'Otherwise-value' must not be null!");
-
-			return new ConditionalOperator(condition, thenValue, otherwiseValue);
-		}
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,6 @@ import org.springframework.util.CompositeIterator;
  * 
  * @author Oliver Gierke
  * @author Thomas Darimont
- * @author Mark Paluch
  * @since 1.3
  */
 public final class ExposedFields implements Iterable<ExposedField> {
@@ -204,13 +203,8 @@ public final class ExposedFields implements Iterable<ExposedField> {
 	public Iterator<ExposedField> iterator() {
 
 		CompositeIterator<ExposedField> iterator = new CompositeIterator<ExposedField>();
-		if (!syntheticFields.isEmpty()) {
-			iterator.add(syntheticFields.iterator());
-		}
-
-		if (!originalFields.isEmpty()) {
-			iterator.add(originalFields.iterator());
-		}
+		iterator.add(syntheticFields.iterator());
+		iterator.add(originalFields.iterator());
 
 		return iterator;
 	}

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

@@ -15,11 +15,12 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import org.bson.Document;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
 import org.springframework.util.Assert;
 
+import com.mongodb.DBObject;
+
 /**
  * {@link AggregationOperationContext} that combines the available field references from a given
  * {@code AggregationOperationContext} and an {@link FieldsExposingAggregationOperation}.
@@ -27,7 +28,6 @@ import org.springframework.util.Assert;
  * @author Thomas Darimont
  * @author Oliver Gierke
  * @author Mark Paluch
- * @author Christoph Strobl
  * @since 1.4
  */
 class ExposedFieldsAggregationOperationContext implements AggregationOperationContext {
@@ -54,11 +54,11 @@ class ExposedFieldsAggregationOperationContext implements AggregationOperationCo
 
 	/* 
 	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(com.mongodb.Document)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(com.mongodb.DBObject)
 	 */
 	@Override
-	public Document getMappedObject(Document document) {
-		return rootContext.getMappedObject(document);
+	public DBObject getMappedObject(DBObject dbObject) {
+		return rootContext.getMappedObject(dbObject);
 	}
 
 	/* 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2015 the original author 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,10 +15,12 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import org.bson.Document;
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.util.Assert;
 
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
 /**
  * Represents a {@code geoNear} aggregation operation.
  * <p>
@@ -26,7 +28,6 @@ import org.springframework.util.Assert;
  * instances of this class directly.
  * 
  * @author Thomas Darimont
- * @author Christoph Strobl
  * @since 1.3
  */
 public class GeoNearOperation implements AggregationOperation {
@@ -52,14 +53,14 @@ public class GeoNearOperation implements AggregationOperation {
 
 	/* 
 	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 	 */
 	@Override
-	public Document toDocument(AggregationOperationContext context) {
+	public DBObject toDBObject(AggregationOperationContext context) {
 
-		Document command = context.getMappedObject(nearQuery.toDocument());
+		BasicDBObject command = (BasicDBObject) context.getMappedObject(nearQuery.toDBObject());
 		command.put("distanceField", distanceField);
 
-		return new Document("$geoNear", command);
+		return new BasicDBObject("$geoNear", command);
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2015 the original author 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,12 +21,14 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 
-import org.bson.Document;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
 /**
  * Encapsulates the aggregation framework {@code $group}-operation.
  * <p>
@@ -37,7 +39,6 @@ import org.springframework.util.StringUtils;
  * @author Sebastian Herold
  * @author Thomas Darimont
  * @author Oliver Gierke
- * @author Christoph Strobl
  * @since 1.3
  */
 public class GroupOperation implements FieldsExposingAggregationOperation {
@@ -193,8 +194,7 @@ public class GroupOperation implements FieldsExposingAggregationOperation {
 	}
 
 	/**
-	 * Generates an {@link GroupOperationBuilder} for an {@code $last}-expression for the given
-	 * {@link AggregationExpression}.
+	 * Generates an {@link GroupOperationBuilder} for an {@code $last}-expression for the given {@link AggregationExpression}.
 	 * 
 	 * @param expr
 	 * @return
@@ -214,8 +214,7 @@ public class GroupOperation implements FieldsExposingAggregationOperation {
 	}
 
 	/**
-	 * Generates an {@link GroupOperationBuilder} for a {@code $first}-expression for the given
-	 * {@link AggregationExpression}.
+	 * Generates an {@link GroupOperationBuilder} for a {@code $first}-expression for the given {@link AggregationExpression}.
 	 * 
 	 * @param expr
 	 * @return
@@ -235,8 +234,7 @@ public class GroupOperation implements FieldsExposingAggregationOperation {
 	}
 
 	/**
-	 * Generates an {@link GroupOperationBuilder} for an {@code $avg}-expression for the given
-	 * {@link AggregationExpression}.
+	 * Generates an {@link GroupOperationBuilder} for an {@code $avg}-expression for the given {@link AggregationExpression}.
 	 * 
 	 * @param expr
 	 * @return
@@ -280,8 +278,7 @@ public class GroupOperation implements FieldsExposingAggregationOperation {
 	}
 
 	/**
-	 * Generates an {@link GroupOperationBuilder} for an {@code $min}-expression that for the given
-	 * {@link AggregationExpression}.
+	 * Generates an {@link GroupOperationBuilder} for an {@code $min}-expression that for the given {@link AggregationExpression}.
 	 * 
 	 * @param expr
 	 * @return
@@ -301,8 +298,7 @@ public class GroupOperation implements FieldsExposingAggregationOperation {
 	}
 
 	/**
-	 * Generates an {@link GroupOperationBuilder} for an {@code $max}-expression that for the given
-	 * {@link AggregationExpression}.
+	 * Generates an {@link GroupOperationBuilder} for an {@code $max}-expression that for the given {@link AggregationExpression}.
 	 * 
 	 * @param expr
 	 * @return
@@ -333,12 +329,12 @@ public class GroupOperation implements FieldsExposingAggregationOperation {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 	 */
 	@Override
-	public Document toDocument(AggregationOperationContext context) {
+	public com.mongodb.DBObject toDBObject(AggregationOperationContext context) {
 
-		Document operationObject = new Document();
+		BasicDBObject operationObject = new BasicDBObject();
 
 		if (idFields.exposesNoNonSyntheticFields()) {
 
@@ -351,7 +347,7 @@ public class GroupOperation implements FieldsExposingAggregationOperation {
 
 		} else {
 
-			Document inner = new Document();
+			BasicDBObject inner = new BasicDBObject();
 
 			for (ExposedField field : idFields) {
 				FieldReference reference = context.getReference(field);
@@ -362,10 +358,10 @@ public class GroupOperation implements FieldsExposingAggregationOperation {
 		}
 
 		for (Operation operation : operations) {
-			operationObject.putAll(operation.toDocument(context));
+			operationObject.putAll(operation.toDBObject(context));
 		}
 
-		return new Document("$group", operationObject);
+		return new BasicDBObject("$group", operationObject);
 	}
 
 	interface Keyword {
@@ -416,8 +412,8 @@ public class GroupOperation implements FieldsExposingAggregationOperation {
 			return new ExposedField(key, true);
 		}
 
-		public Document toDocument(AggregationOperationContext context) {
-			return new Document(key, new Document(op.toString(), getValue(context)));
+		public DBObject toDBObject(AggregationOperationContext context) {
+			return new BasicDBObject(key, new BasicDBObject(op.toString(), getValue(context)));
 		}
 
 		public Object getValue(AggregationOperationContext context) {
@@ -425,7 +421,7 @@ public class GroupOperation implements FieldsExposingAggregationOperation {
 			if (reference == null) {
 
 				if (value instanceof AggregationExpression) {
-					return ((AggregationExpression) value).toDocument(context);
+					return ((AggregationExpression) value).toDbObject(context);
 				}
 
 				return value;

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

@@ -1,195 +0,0 @@
-/*
- * Copyright 2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.aggregation;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bson.Document;
-import org.springframework.util.Assert;
-
-/**
- * Encapsulates the aggregation framework {@code $ifNull} operator. Replacement values can be either {@link Field field
- * references}, values of simple MongoDB types or values that can be converted to a simple MongoDB type.
- *
- * @see http://docs.mongodb.com/manual/reference/operator/aggregation/ifNull/
- * @author Mark Paluch
- * @author Christoph Strobl
- * @since 1.10
- */
-public class IfNullOperator implements AggregationExpression {
-
-	private final Field field;
-	private final Object value;
-
-	/**
-	 * Creates a new {@link IfNullOperator} for the given {@link Field} and replacement {@code value}.
-	 *
-	 * @param field must not be {@literal null}.
-	 * @param value must not be {@literal null}.
-	 */
-	public IfNullOperator(Field field, Object value) {
-
-		Assert.notNull(field, "Field must not be null!");
-		Assert.notNull(value, "'Replacement-value' must not be null!");
-
-		this.field = field;
-		this.value = value;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
-	@Override
-	public Document toDocument(AggregationOperationContext context) {
-
-		List<Object> list = new ArrayList<Object>();
-
-		list.add(context.getReference(field).toString());
-		list.add(resolve(value, context));
-
-		return new Document("$ifNull", list);
-	}
-
-	private Object resolve(Object value, AggregationOperationContext context) {
-
-		if (value instanceof Field) {
-			return context.getReference((Field) value).toString();
-		} else if (value instanceof Document) {
-			return value;
-		}
-
-		return context.getMappedObject(new Document("$set", value)).get("$set");
-	}
-
-	/**
-	 * Get a builder that allows fluent creation of {@link IfNullOperator}.
-	 *
-	 * @return a new {@link IfNullBuilder}.
-	 */
-	public static IfNullBuilder newBuilder() {
-		return IfNullOperatorBuilder.newBuilder();
-	}
-
-	/**
-	 * @since 1.10
-	 */
-	public static interface IfNullBuilder {
-
-		/**
-		 * @param field the field to check for a {@literal null} value, field reference must not be {@literal null}.
-		 * @return the {@link ThenBuilder}
-		 */
-		ThenBuilder ifNull(Field field);
-
-		/**
-		 * @param field the field to check for a {@literal null} value, field name must not be {@literal null} or empty.
-		 * @return the {@link ThenBuilder}
-		 */
-		ThenBuilder ifNull(String field);
-	}
-
-	/**
-	 * @since 1.10
-	 */
-	public static interface ThenBuilder {
-
-		/**
-		 * @param field the field holding the replacement value, must not be {@literal null}.
-		 * @return the {@link IfNullOperator}
-		 */
-		IfNullOperator thenReplaceWith(Field field);
-
-		/**
-		 * @param value the value to be used if the {@code $ifNull }condition evaluates {@literal true}. Can be a
-		 *          {@link Document}, a value that is supported by MongoDB or a value that can be converted to a MongoDB
-		 *          representation but must not be {@literal null}.
-		 * @return the {@link IfNullOperator}
-		 */
-		IfNullOperator thenReplaceWith(Object value);
-	}
-
-	/**
-	 * Builder for fluent {@link IfNullOperator} creation.
-	 *
-	 * @author Mark Paluch
-	 * @since 1.10
-	 */
-	public static final class IfNullOperatorBuilder implements IfNullBuilder, ThenBuilder {
-
-		private Field field;
-
-		private IfNullOperatorBuilder() {}
-
-		/**
-		 * Creates a new builder for {@link IfNullOperator}.
-		 *
-		 * @return never {@literal null}.
-		 */
-		public static IfNullOperatorBuilder newBuilder() {
-			return new IfNullOperatorBuilder();
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.IfNullOperator.IfNullBuilder#ifNull(org.springframework.data.mongodb.core.aggregation.Field)
-		 */
-		public ThenBuilder ifNull(Field field) {
-
-			Assert.notNull(field, "Field must not be null!");
-
-			this.field = field;
-			return this;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.IfNullOperator.IfNullBuilder#ifNull(java.lang.String)
-		 */
-		public ThenBuilder ifNull(String name) {
-
-			Assert.hasText(name, "Field name must not be null or empty!");
-
-			this.field = Fields.field(name);
-			return this;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.IfNullOperator.ThenReplaceBuilder#thenReplaceWith(org.springframework.data.mongodb.core.aggregation.Field)
-		 */
-		@Override
-		public IfNullOperator thenReplaceWith(Field replacementField) {
-
-			Assert.notNull(replacementField, "Replacement field must not be null!");
-
-			return new IfNullOperator(this.field, replacementField);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.IfNullOperator.ThenReplaceBuilder#thenReplaceWith(java.lang.Object)
-		 */
-		@Override
-		public IfNullOperator thenReplaceWith(Object value) {
-
-			Assert.notNull(value, "'Replacement-value' must not be null!");
-
-			return new IfNullOperator(this.field, value);
-		}
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,11 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import org.bson.Document;
 import org.springframework.util.Assert;
 
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
 /**
  * Encapsulates the {@code $limit}-operation.
  * <p>
@@ -27,7 +29,6 @@ import org.springframework.util.Assert;
  * @see http://docs.mongodb.org/manual/reference/aggregation/limit/
  * @author Thomas Darimont
  * @author Oliver Gierke
- * @author Christoph Strobl
  * @since 1.3
  */
 public class LimitOperation implements AggregationOperation {
@@ -45,10 +46,10 @@ public class LimitOperation implements AggregationOperation {
 
 	/* 
 	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 	 */
 	@Override
-	public Document toDocument(AggregationOperationContext context) {
-		return new Document("$limit", Long.valueOf(maxElements));
+	public DBObject toDBObject(AggregationOperationContext context) {
+		return new BasicDBObject("$limit", maxElements);
 	}
 }

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

@@ -15,11 +15,13 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import org.bson.Document;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
 import org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation.InheritsFieldsAggregationOperation;
 import org.springframework.util.Assert;
 
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
 /**
  * Encapsulates the aggregation framework {@code $lookup}-operation. We recommend to use the static factory method
  * {@link Aggregation#lookup(String, String, String, String)} instead of creating instances of this class directly.
@@ -73,19 +75,19 @@ public class LookupOperation implements FieldsExposingAggregationOperation, Inhe
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 	 */
 	@Override
-	public Document toDocument(AggregationOperationContext context) {
+	public DBObject toDBObject(AggregationOperationContext context) {
 
-		Document lookupObject = new Document();
+		BasicDBObject lookupObject = new BasicDBObject();
 
 		lookupObject.append("from", from.getTarget());
 		lookupObject.append("localField", localField.getTarget());
 		lookupObject.append("foreignField", foreignField.getTarget());
 		lookupObject.append("as", as.getTarget());
 
-		return new Document("$lookup", lookupObject);
+		return new BasicDBObject("$lookup", lookupObject);
 	}
 
 	/**

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

@@ -15,10 +15,12 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import org.bson.Document;
 import org.springframework.data.mongodb.core.query.CriteriaDefinition;
 import org.springframework.util.Assert;
 
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
 /**
  * Encapsulates the {@code $match}-operation.
  * <p>
@@ -49,10 +51,10 @@ public class MatchOperation implements AggregationOperation {
 
 	/* 
 	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 	 */
 	@Override
-	public Document toDocument(AggregationOperationContext context) {
-		return new Document("$match", context.getMappedObject(criteriaDefinition.getCriteriaObject()));
+	public DBObject toDBObject(AggregationOperationContext context) {
+		return new BasicDBObject("$match", context.getMappedObject(criteriaDefinition.getCriteriaObject()));
 	}
 }

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

@@ -1,51 +0,0 @@
-/*
- * Copyright 2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.aggregation;
-
-import org.bson.Document;
-import org.springframework.util.Assert;
-
-/**
- * Encapsulates the {@code $out}-operation.
- * <p>
- * We recommend to use the static factory method {@link Aggregation#out(String)} instead of creating instances of this
- * class directly.
- *
- * @see http://docs.mongodb.org/manual/reference/aggregation/out/
- * @author Nikolay Bogdanov
- * @author Christoph Strobl
- */
-public class OutOperation implements AggregationOperation {
-
-	private final String collectionName;
-
-	/**
-	 * @param outCollectionName Collection name to export the results. Must not be {@literal null}.
-	 */
-	public OutOperation(String outCollectionName) {
-		Assert.notNull(outCollectionName, "Collection name must not be null!");
-		this.collectionName = outCollectionName;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
-	@Override
-	public Document toDocument(AggregationOperationContext context) {
-		return new Document("$out", collectionName);
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2015 the original author 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,12 +20,14 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import org.bson.Document;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
 import org.springframework.data.mongodb.core.aggregation.Fields.AggregationField;
 import org.springframework.data.mongodb.core.aggregation.ProjectionOperation.ProjectionOperationBuilder.FieldProjection;
 import org.springframework.util.Assert;
 
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
 /**
  * Encapsulates the aggregation framework {@code $project}-operation.
  * <p>
@@ -40,7 +42,6 @@ import org.springframework.util.Assert;
  * @author Thomas Darimont
  * @author Oliver Gierke
  * @author Christoph Strobl
- * @author Mark Paluch
  * @since 1.3
  */
 public class ProjectionOperation implements FieldsExposingAggregationOperation {
@@ -103,8 +104,8 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 	 */
 	private ProjectionOperation andReplaceLastOneWith(Projection projection) {
 
-		List<Projection> projections = this.projections.isEmpty() ? Collections.<Projection> emptyList()
-				: this.projections.subList(0, this.projections.size() - 1);
+		List<Projection> projections = this.projections.isEmpty() ? Collections.<Projection> emptyList() : this.projections
+				.subList(0, this.projections.size() - 1);
 		return new ProjectionOperation(projections, Arrays.asList(projection));
 	}
 
@@ -184,18 +185,18 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 	 */
 	@Override
-	public Document toDocument(AggregationOperationContext context) {
+	public DBObject toDBObject(AggregationOperationContext context) {
 
-		Document fieldObject = new Document();
+		BasicDBObject fieldObject = new BasicDBObject();
 
 		for (Projection projection : projections) {
-			fieldObject.putAll(projection.toDocument(context));
+			fieldObject.putAll(projection.toDBObject(context));
 		}
 
-		return new Document("$project", fieldObject);
+		return new BasicDBObject("$project", fieldObject);
 	}
 
 	/**
@@ -225,11 +226,11 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 
 		/* 
 		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 		 */
 		@Override
-		public Document toDocument(AggregationOperationContext context) {
-			return this.operation.toDocument(context);
+		public DBObject toDBObject(AggregationOperationContext context) {
+			return this.operation.toDBObject(context);
 		}
 
 		/**
@@ -239,24 +240,6 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		 * @return
 		 */
 		public abstract ProjectionOperation as(String alias);
-
-		/**
-		 * Apply a conditional projection using {@link ConditionalOperator}.
-		 *
-		 * @param conditionalOperator must not be {@literal null}.
-		 * @return never {@literal null}.
-		 * @since 1.10
-		 */
-		public abstract ProjectionOperation applyCondition(ConditionalOperator conditionalOperator);
-
-		/**
-		 * Apply a conditional value replacement for {@literal null} values using {@link IfNullOperator}.
-		 *
-		 * @param ifNullOperator must not be {@literal null}.
-		 * @return never {@literal null}.
-		 * @since 1.10
-		 */
-		public abstract ProjectionOperation applyCondition(IfNullOperator ifNullOperator);
 	}
 
 	/**
@@ -351,15 +334,14 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 
 			/* 
 			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+			 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 			 */
 			@Override
-			public Document toDocument(AggregationOperationContext context) {
-				return new Document(getExposedField().getName(), toMongoExpression(context, expression, params));
+			public DBObject toDBObject(AggregationOperationContext context) {
+				return new BasicDBObject(getExposedField().getName(), toMongoExpression(context, expression, params));
 			}
 
-			protected static Object toMongoExpression(AggregationOperationContext context, String expression,
-					Object[] params) {
+			protected static Object toMongoExpression(AggregationOperationContext context, String expression, Object[] params) {
 				return TRANSFORMER.transform(expression, context, params);
 			}
 		}
@@ -370,7 +352,6 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 	 * 
 	 * @author Oliver Gierke
 	 * @author Thomas Darimont
-	 * @author Christoph Strobl
 	 */
 	public static class ProjectionOperationBuilder extends AbstractProjectionOperationBuilder {
 
@@ -388,8 +369,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		 * @param operation must not be {@literal null}.
 		 * @param previousProjection the previous operation projection, may be {@literal null}.
 		 */
-		public ProjectionOperationBuilder(String name, ProjectionOperation operation,
-				OperationProjection previousProjection) {
+		public ProjectionOperationBuilder(String name, ProjectionOperation operation, OperationProjection previousProjection) {
 			super(name, operation);
 
 			this.name = name;
@@ -438,7 +418,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		/**
 		 * Allows to specify an alias for the previous projection operation.
 		 * 
-		 * @param alias
+		 * @param string
 		 * @return
 		 */
 		@Override
@@ -455,28 +435,6 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 			return this.operation.and(new FieldProjection(Fields.field(alias, name), null));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.AbstractProjectionOperationBuilder#transform(org.springframework.data.mongodb.core.aggregation.ConditionalOperator)
-		 */
-		@Override
-		public ProjectionOperation applyCondition(ConditionalOperator conditionalOperator) {
-
-			Assert.notNull(conditionalOperator, "ConditionalOperator must not be null!");
-			return this.operation.and(new ExpressionProjection(Fields.field(name), conditionalOperator));
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.AbstractProjectionOperationBuilder#transform(org.springframework.data.mongodb.core.aggregation.IfNullOperator)
-		 */
-		@Override
-		public ProjectionOperation applyCondition(IfNullOperator ifNullOperator) {
-
-			Assert.notNull(ifNullOperator, "IfNullOperator must not be null!");
-			return this.operation.and(new ExpressionProjection(Fields.field(name), ifNullOperator));
-		}
-
 		/**
 		 * Generates an {@code $add} expression that adds the given number to the previously mentioned field.
 		 * 
@@ -604,48 +562,17 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 			return project("mod", Fields.field(fieldReference));
 		}
 
-		/**
-		 * Generates a {@code $size} expression that returns the size of the array held by the given field. <br />
-		 *
-		 * @return never {@literal null}.
-		 * @since 1.7
-		 */
 		public ProjectionOperationBuilder size() {
 			return project("size");
 		}
 
-		/**
-		 * Generates a {@code $slice} expression that returns a subset of the array held by the given field. <br />
-		 * If {@literal n} is positive, $slice returns up to the first n elements in the array. <br />
-		 * If {@literal n} is negative, $slice returns up to the last n elements in the array.
-		 *
-		 * @param count max number of elements.
-		 * @return never {@literal null}.
-		 * @since 1.10
-		 */
-		public ProjectionOperationBuilder slice(int count) {
-			return project("slice", count);
-		}
-
-		/**
-		 * Generates a {@code $slice} expression that returns a subset of the array held by the given field. <br />
-		 *
-		 * @param count max number of elements. Must not be negative.
-		 * @param offset the offset within the array to start from.
-		 * @return never {@literal null}.
-		 * @since 1.10
-		 */
-		public ProjectionOperationBuilder slice(int count, int offset) {
-			return project("slice", offset, count);
-		}
-
 		/* 
 		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 		 */
 		@Override
-		public Document toDocument(AggregationOperationContext context) {
-			return this.operation.toDocument(context);
+		public DBObject toDBObject(AggregationOperationContext context) {
+			return this.operation.toDBObject(context);
 		}
 
 		/**
@@ -682,11 +609,11 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 
 			/* 
 			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+			 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 			 */
 			@Override
-			public Document toDocument(AggregationOperationContext context) {
-				return new Document(name, Fields.UNDERSCORE_ID_REF);
+			public DBObject toDBObject(AggregationOperationContext context) {
+				return new BasicDBObject(name, Fields.UNDERSCORE_ID_REF);
 			}
 		}
 
@@ -751,11 +678,11 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 
 			/* 
 			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+			 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 			 */
 			@Override
-			public Document toDocument(AggregationOperationContext context) {
-				return new Document(field.getName(), renderFieldValue(context));
+			public DBObject toDBObject(AggregationOperationContext context) {
+				return new BasicDBObject(field.getName(), renderFieldValue(context));
 			}
 
 			private Object renderFieldValue(AggregationOperationContext context) {
@@ -805,16 +732,16 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 				this.values = Arrays.asList(values);
 			}
 
-			/*
+			/* 
 			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+			 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 			 */
 			@Override
-			public Document toDocument(AggregationOperationContext context) {
+			public DBObject toDBObject(AggregationOperationContext context) {
 
-				Document inner = new Document("$" + operation, getOperationArguments(context));
+				DBObject inner = new BasicDBObject("$" + operation, getOperationArguments(context));
 
-				return new Document(getField().getName(), inner);
+				return new BasicDBObject(getField().getName(), inner);
 			}
 
 			protected List<Object> getOperationArguments(AggregationOperationContext context) {
@@ -897,18 +824,18 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 
 			/* 
 			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+			 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 			 */
 			@Override
-			public Document toDocument(AggregationOperationContext context) {
+			public DBObject toDBObject(AggregationOperationContext context) {
 
-				Document nestedObject = new Document();
+				DBObject nestedObject = new BasicDBObject();
 
 				for (Field field : fields) {
 					nestedObject.put(field.getName(), context.getReference(field.getTarget()).toString());
 				}
 
-				return new Document(name, nestedObject);
+				return new BasicDBObject(name, nestedObject);
 			}
 		}
 
@@ -1033,13 +960,13 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		}
 
 		/**
-		 * Renders the current {@link Projection} into a {@link Document} based on the given
+		 * Renders the current {@link Projection} into a {@link DBObject} based on the given
 		 * {@link AggregationOperationContext}.
 		 * 
 		 * @param context will never be {@literal null}.
 		 * @return
 		 */
-		public abstract Document toDocument(AggregationOperationContext context);
+		public abstract DBObject toDBObject(AggregationOperationContext context);
 	}
 
 	/**
@@ -1064,8 +991,8 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		}
 
 		@Override
-		public Document toDocument(AggregationOperationContext context) {
-			return new Document(field.getName(), expression.toDocument(context));
+		public DBObject toDBObject(AggregationOperationContext context) {
+			return new BasicDBObject(field.getName(), expression.toDbObject(context));
 		}
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,11 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import org.bson.Document;
 import org.springframework.util.Assert;
 
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
 /**
  * Encapsulates the aggregation framework {@code $skip}-operation.
  * <p>
@@ -27,7 +29,6 @@ import org.springframework.util.Assert;
  * @see http://docs.mongodb.org/manual/reference/aggregation/skip/
  * @author Thomas Darimont
  * @author Oliver Gierke
- * @author Christoph Strobl
  * @since 1.3
  */
 public class SkipOperation implements AggregationOperation {
@@ -37,7 +38,7 @@ public class SkipOperation implements AggregationOperation {
 	/**
 	 * Creates a new {@link SkipOperation} skipping the given number of elements.
 	 * 
-	 * @param skipCount number of documents to skip, must not be less than zero.
+	 * @param skipCount number of documents to skip.
 	 */
 	public SkipOperation(long skipCount) {
 
@@ -47,10 +48,10 @@ public class SkipOperation implements AggregationOperation {
 
 	/* 
 	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 	 */
 	@Override
-	public Document toDocument(AggregationOperationContext context) {
-		return new Document("$skip", skipCount);
+	public DBObject toDBObject(AggregationOperationContext context) {
+		return new BasicDBObject("$skip", skipCount);
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2015 the original author 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,13 +15,15 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import org.bson.Document;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.domain.Sort.Order;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
 import org.springframework.util.Assert;
 
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
 /**
  * Encapsulates the aggregation framework {@code $sort}-operation.
  * <p>
@@ -31,7 +33,6 @@ import org.springframework.util.Assert;
  * @see http://docs.mongodb.org/manual/reference/aggregation/sort/#pipe._S_sort
  * @author Thomas Darimont
  * @author Oliver Gierke
- * @author Christoph Strobl
  * @since 1.3
  */
 public class SortOperation implements AggregationOperation {
@@ -59,12 +60,12 @@ public class SortOperation implements AggregationOperation {
 
 	/* 
 	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 	 */
 	@Override
-	public Document toDocument(AggregationOperationContext context) {
+	public DBObject toDBObject(AggregationOperationContext context) {
 
-		Document object = new Document();
+		BasicDBObject object = new BasicDBObject();
 
 		for (Order order : sort) {
 
@@ -73,6 +74,6 @@ public class SortOperation implements AggregationOperation {
 			object.put(reference.getRaw(), order.isAscending() ? 1 : -1);
 		}
 
-		return new Document("$sort", object);
+		return new BasicDBObject("$sort", object);
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,12 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
+import static org.springframework.data.mongodb.util.DBObjectUtils.*;
+
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import org.bson.Document;
 import org.springframework.core.GenericTypeResolver;
 import org.springframework.data.mongodb.core.spel.ExpressionNode;
 import org.springframework.data.mongodb.core.spel.ExpressionTransformationContextSupport;
@@ -40,6 +40,10 @@ import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.util.Assert;
 import org.springframework.util.NumberUtils;
 
+import com.mongodb.BasicDBList;
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
 /**
  * Renders the AST of a SpEL expression as a MongoDB Aggregation Framework projection expression.
  * 
@@ -127,8 +131,8 @@ class SpelExpressionTransformer implements AggregationExpressionTransformer {
 	 * @author Thomas Darimont
 	 * @author Oliver Gierke
 	 */
-	private static abstract class ExpressionNodeConversion<T extends ExpressionNode>
-			implements AggregationExpressionTransformer {
+	private static abstract class ExpressionNodeConversion<T extends ExpressionNode> implements
+			AggregationExpressionTransformer {
 
 		private final AggregationExpressionTransformer transformer;
 		private final Class<? extends ExpressionNode> nodeType;
@@ -184,7 +188,7 @@ class SpelExpressionTransformer implements AggregationExpressionTransformer {
 		 * @param context must not be {@literal null}.
 		 * @return
 		 */
-		protected Object transform(ExpressionNode node, ExpressionNode parent, Document operation,
+		protected Object transform(ExpressionNode node, ExpressionNode parent, DBObject operation,
 				AggregationExpressionTransformationContext<?> context) {
 
 			Assert.notNull(node, "ExpressionNode must not be null!");
@@ -232,7 +236,7 @@ class SpelExpressionTransformer implements AggregationExpressionTransformer {
 
 			OperatorNode currentNode = context.getCurrentNode();
 
-			Document operationObject = createOperationObjectAndAddToPreviousArgumentsIfNecessary(context, currentNode);
+			DBObject operationObject = createOperationObjectAndAddToPreviousArgumentsIfNecessary(context, currentNode);
 			Object leftResult = transform(currentNode.getLeft(), currentNode, operationObject, context);
 
 			if (currentNode.isUnaryMinus()) {
@@ -245,33 +249,32 @@ class SpelExpressionTransformer implements AggregationExpressionTransformer {
 			return operationObject;
 		}
 
-		private Document createOperationObjectAndAddToPreviousArgumentsIfNecessary(
+		private DBObject createOperationObjectAndAddToPreviousArgumentsIfNecessary(
 				AggregationExpressionTransformationContext<OperatorNode> context, OperatorNode currentNode) {
 
-			Document nextDocument = new Document(currentNode.getMongoOperator(), new ArrayList<Object>());
+			DBObject nextDbObject = new BasicDBObject(currentNode.getMongoOperator(), new BasicDBList());
 
 			if (!context.hasPreviousOperation()) {
-				return nextDocument;
+				return nextDbObject;
 			}
 
 			if (context.parentIsSameOperation()) {
 
 				// same operator applied in a row e.g. 1 + 2 + 3 carry on with the operation and render as $add: [1, 2 ,3]
-				nextDocument = context.getPreviousOperationObject();
+				nextDbObject = context.getPreviousOperationObject();
 			} else if (!currentNode.isUnaryOperator()) {
 
 				// different operator -> add context object for next level to list if arguments of previous expression
-				context.addToPreviousOperation(nextDocument);
+				context.addToPreviousOperation(nextDbObject);
 			}
 
-			return nextDocument;
+			return nextDbObject;
 		}
 
-		private Object convertUnaryMinusOp(ExpressionTransformationContextSupport<OperatorNode> context,
-				Object leftResult) {
+		private Object convertUnaryMinusOp(ExpressionTransformationContextSupport<OperatorNode> context, Object leftResult) {
 
 			Object result = leftResult instanceof Number ? leftResult
-					: new Document("$multiply", Arrays.<Object> asList(Integer.valueOf(-1), leftResult));
+					: new BasicDBObject("$multiply", dbList(-1, leftResult));
 
 			if (leftResult != null && context.hasPreviousOperation()) {
 				context.addToPreviousOperation(result);
@@ -465,7 +468,7 @@ class SpelExpressionTransformer implements AggregationExpressionTransformer {
 				args.add(transform(childNode, context));
 			}
 
-			return context.addToPreviousOrReturn(new Document(node.getMethodName(), args));
+			return context.addToPreviousOrReturn(new BasicDBObject(node.getMethodName(), dbList(args.toArray())));
 		}
 	}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 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.
@@ -17,7 +17,6 @@ package org.springframework.data.mongodb.core.aggregation;
 
 import static org.springframework.data.mongodb.core.aggregation.Fields.*;
 
-import org.bson.Document;
 import org.springframework.data.mapping.PropertyPath;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.context.PersistentPropertyPath;
@@ -28,12 +27,13 @@ import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.util.Assert;
 
+import com.mongodb.DBObject;
+
 /**
  * {@link AggregationOperationContext} aware of a particular type and a {@link MappingContext} to potentially translate
  * property references into document field names.
  * 
  * @author Oliver Gierke
- * @author Christoph Strobl
  * @since 1.3
  */
 public class TypeBasedAggregationOperationContext implements AggregationOperationContext {
@@ -64,11 +64,11 @@ public class TypeBasedAggregationOperationContext implements AggregationOperatio
 
 	/* 
 	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(com.mongodb.Document)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(com.mongodb.DBObject)
 	 */
 	@Override
-	public Document getMappedObject(Document document) {
-		return mapper.getMappedObject(document, mappingContext.getPersistentEntity(type));
+	public DBObject getMappedObject(DBObject dbObject) {
+		return mapper.getMappedObject(dbObject, mappingContext.getPersistentEntity(type));
 	}
 
 	/*
@@ -93,8 +93,8 @@ public class TypeBasedAggregationOperationContext implements AggregationOperatio
 
 	private FieldReference getReferenceFor(Field field) {
 
-		PersistentPropertyPath<MongoPersistentProperty> propertyPath = mappingContext
-				.getPersistentPropertyPath(field.getTarget(), type);
+		PersistentPropertyPath<MongoPersistentProperty> propertyPath = mappingContext.getPersistentPropertyPath(
+				field.getTarget(), type);
 		Field mappedField = field(propertyPath.getLeafProperty().getName(),
 				propertyPath.toDotPath(MongoPersistentProperty.PropertyToFieldNameConverter.INSTANCE));
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2015 the original author 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,10 +15,12 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import org.bson.Document;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
 import org.springframework.util.Assert;
 
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
 /**
  * Encapsulates the aggregation framework {@code $unwind}-operation.
  * <p>
@@ -28,238 +30,29 @@ import org.springframework.util.Assert;
  * @see http://docs.mongodb.org/manual/reference/aggregation/unwind/#pipe._S_unwind
  * @author Thomas Darimont
  * @author Oliver Gierke
- * @author Mark Paluch
- * @author Christoph Strobl
  * @since 1.3
  */
-public class UnwindOperation
-		implements AggregationOperation, FieldsExposingAggregationOperation.InheritsFieldsAggregationOperation {
+public class UnwindOperation implements AggregationOperation {
 
 	private final ExposedField field;
-	private final ExposedField arrayIndex;
-	private final boolean preserveNullAndEmptyArrays;
 
 	/**
 	 * Creates a new {@link UnwindOperation} for the given {@link Field}.
-	 *
+	 * 
 	 * @param field must not be {@literal null}.
 	 */
 	public UnwindOperation(Field field) {
-		this(new ExposedField(field, true), false);
-	}
-
-	/**
-	 * Creates a new {@link UnwindOperation} using Mongo 3.2 syntax.
-	 *
-	 * @param field must not be {@literal null}.
-	 * @param preserveNullAndEmptyArrays {@literal true} to output the document if path is {@literal null}, missing or
-	 *          array is empty.
-	 * @since 1.10
-	 */
-	public UnwindOperation(Field field, boolean preserveNullAndEmptyArrays) {
-		Assert.notNull(field, "Field must not be null!");
 
+		Assert.notNull(field);
 		this.field = new ExposedField(field, true);
-		this.arrayIndex = null;
-		this.preserveNullAndEmptyArrays = preserveNullAndEmptyArrays;
 	}
 
-	/**
-	 * Creates a new {@link UnwindOperation} using Mongo 3.2 syntax.
-	 *
-	 * @param field must not be {@literal null}.
-	 * @param arrayIndex optional field name to expose the field array index, must not be {@literal null}.
-	 * @param preserveNullAndEmptyArrays {@literal true} to output the document if path is {@literal null}, missing or
-	 *          array is empty.
-	 * @since 1.10
-	 */
-	public UnwindOperation(Field field, Field arrayIndex, boolean preserveNullAndEmptyArrays) {
-
-		Assert.notNull(field, "Field must not be null!");
-		Assert.notNull(arrayIndex, "ArrayIndex must not be null!");
-
-		this.field = new ExposedField(field, true);
-		this.arrayIndex = new ExposedField(arrayIndex, true);
-		this.preserveNullAndEmptyArrays = preserveNullAndEmptyArrays;
-	}
-
-	/*
+	/* 
 	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDBObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 	 */
 	@Override
-	public Document toDocument(AggregationOperationContext context) {
-
-		String path = context.getReference(field).toString();
-
-		if (!preserveNullAndEmptyArrays && arrayIndex == null) {
-			return new Document("$unwind", path);
-		}
-
-		Document unwindArgs = new Document();
-		unwindArgs.put("path", path);
-		if (arrayIndex != null) {
-			unwindArgs.put("includeArrayIndex", arrayIndex.getName());
-		}
-		unwindArgs.put("preserveNullAndEmptyArrays", preserveNullAndEmptyArrays);
-
-		return new Document("$unwind", unwindArgs);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields()
-	 */
-	@Override
-	public ExposedFields getFields() {
-		return arrayIndex != null ? ExposedFields.from(arrayIndex) : ExposedFields.from();
-	}
-
-	/**
-	 * Get a builder that allows creation of {@link LookupOperation}.
-	 *
-	 * @return
-	 * @since 1.10
-	 */
-	public static PathBuilder newUnwind() {
-		return UnwindOperationBuilder.newBuilder();
-	}
-
-	/**
-	 * @author Mark Paluch
-	 * @since 1.10
-	 */
-	public static interface PathBuilder {
-
-		/**
-		 * @param path the path to unwind, must not be {@literal null} or empty.
-		 * @return
-		 */
-		IndexBuilder path(String path);
-	}
-
-	/**
-	 * @author Mark Paluch
-	 * @since 1.10
-	 */
-	public static interface IndexBuilder {
-
-		/**
-		 * Exposes the array index as {@code field}.
-		 *
-		 * @param field field name to expose the field array index, must not be {@literal null} or empty.
-		 * @return
-		 */
-		EmptyArraysBuilder arrayIndex(String field);
-
-		/**
-		 * Do not expose the array index.
-		 *
-		 * @return
-		 */
-		EmptyArraysBuilder noArrayIndex();
-	}
-
-	public static interface EmptyArraysBuilder {
-
-		/**
-		 * Output documents if the array is null or empty.
-		 *
-		 * @return
-		 */
-		UnwindOperation preserveNullAndEmptyArrays();
-
-		/**
-		 * Do not output documents if the array is null or empty.
-		 *
-		 * @return
-		 */
-		UnwindOperation skipNullAndEmptyArrays();
-	}
-
-	/**
-	 * Builder for fluent {@link UnwindOperation} creation.
-	 *
-	 * @author Mark Paluch
-	 * @since 1.10
-	 */
-	public static final class UnwindOperationBuilder implements PathBuilder, IndexBuilder, EmptyArraysBuilder {
-
-		private Field field;
-		private Field arrayIndex;
-
-		private UnwindOperationBuilder() {}
-
-		/**
-		 * Creates new builder for {@link UnwindOperation}.
-		 *
-		 * @return never {@literal null}.
-		 */
-		public static PathBuilder newBuilder() {
-			return new UnwindOperationBuilder();
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.UnwindOperation.EmptyArraysBuilder#preserveNullAndEmptyArrays()
-		 */
-		@Override
-		public UnwindOperation preserveNullAndEmptyArrays() {
-
-			if (arrayIndex != null) {
-				return new UnwindOperation(field, arrayIndex, true);
-			}
-
-			return new UnwindOperation(field, true);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.UnwindOperation.EmptyArraysBuilder#skipNullAndEmptyArrays()
-		 */
-		@Override
-		public UnwindOperation skipNullAndEmptyArrays() {
-
-			if (arrayIndex != null) {
-				return new UnwindOperation(field, arrayIndex, false);
-			}
-
-			return new UnwindOperation(field, false);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.UnwindOperation.IndexBuilder#arrayIndex(java.lang.String)
-		 */
-		@Override
-		public EmptyArraysBuilder arrayIndex(String field) {
-
-			Assert.hasText(field, "'ArrayIndex' must not be null or empty!");
-			arrayIndex = Fields.field(field);
-			return this;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.UnwindOperation.IndexBuilder#noArrayIndex()
-		 */
-		@Override
-		public EmptyArraysBuilder noArrayIndex() {
-
-			arrayIndex = null;
-			return this;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.UnwindOperation.PathBuilder#path(java.lang.String)
-		 */
-		@Override
-		public UnwindOperationBuilder path(String path) {
-
-			Assert.hasText(path, "'Path' must not be null or empty!");
-			field = Fields.field(path);
-			return this;
-		}
+	public DBObject toDBObject(AggregationOperationContext context) {
+		return new BasicDBObject("$unwind", context.getReference(field).toString());
 	}
 }

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

@@ -31,7 +31,7 @@ import org.springframework.data.mongodb.core.convert.MongoConverters.StringToObj
 /**
  * Base class for {@link MongoConverter} implementations. Sets up a {@link GenericConversionService} and populates basic
  * converters. Allows registering {@link CustomConversions}.
- *
+ * 
  * @author Jon Brisbin
  * @author Oliver Gierke
  */
@@ -43,7 +43,7 @@ public abstract class AbstractMongoConverter implements MongoConverter, Initiali
 
 	/**
 	 * Creates a new {@link AbstractMongoConverter} using the given {@link GenericConversionService}.
-	 *
+	 * 
 	 * @param conversionService
 	 */
 	public AbstractMongoConverter(GenericConversionService conversionService) {
@@ -52,7 +52,7 @@ public abstract class AbstractMongoConverter implements MongoConverter, Initiali
 
 	/**
 	 * Registers the given custom conversions with the converter.
-	 *
+	 * 
 	 * @param conversions
 	 */
 	public void setCustomConversions(CustomConversions conversions) {
@@ -61,7 +61,7 @@ public abstract class AbstractMongoConverter implements MongoConverter, Initiali
 
 	/**
 	 * Registers {@link EntityInstantiators} to customize entity instantiation.
-	 *
+	 * 
 	 * @param instantiators
 	 */
 	public void setInstantiators(EntityInstantiators instantiators) {
@@ -89,7 +89,7 @@ public abstract class AbstractMongoConverter implements MongoConverter, Initiali
 		conversions.registerConvertersIn(conversionService);
 	}
 
-	/*
+	/* 
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.convert.MongoWriter#convertToMongoType(java.lang.Object)
 	 */

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,47 +19,40 @@ import java.util.Arrays;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.bson.Document;
-import org.bson.conversions.Bson;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.data.mongodb.util.BsonUtils;
 import org.springframework.util.Assert;
 
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
 
 /**
- * Wrapper value object for a {@link Document} to be able to access raw values by {@link MongoPersistentProperty}
+ * Wrapper value object for a {@link BasicDBObject} to be able to access raw values by {@link MongoPersistentProperty}
  * references. The accessors will transparently resolve nested document values that a {@link MongoPersistentProperty}
  * might refer to through a path expression in field names.
  * 
  * @author Oliver Gierke
- * @author Christoph Strobl
  */
-class DocumentAccessor {
+class DBObjectAccessor {
 
-	private final Bson document;
+	private final BasicDBObject dbObject;
 
 	/**
-	 * Creates a new {@link DocumentAccessor} for the given {@link Document}.
+	 * Creates a new {@link DBObjectAccessor} for the given {@link DBObject}.
 	 * 
-	 * @param document must be a {@link Document} effectively, must not be {@literal null}.
+	 * @param dbObject must be a {@link BasicDBObject} effectively, must not be {@literal null}.
 	 */
-	public DocumentAccessor(Bson document) {
+	public DBObjectAccessor(DBObject dbObject) {
 
-		Assert.notNull(document, "Document must not be null!");
+		Assert.notNull(dbObject, "DBObject must not be null!");
+		Assert.isInstanceOf(BasicDBObject.class, dbObject, "Given DBObject must be a BasicDBObject!");
 
-		if (!(document instanceof Document) && !(document instanceof DBObject)) {
-			Assert.isInstanceOf(Document.class, document, "Given Bson must be a Document or DBObject!");
-		}
-
-		this.document = document;
+		this.dbObject = (BasicDBObject) dbObject;
 	}
 
 	/**
-	 * Puts the given value into the backing {@link Document} based on the coordinates defined through the given
+	 * Puts the given value into the backing {@link DBObject} based on the coordinates defined through the given
 	 * {@link MongoPersistentProperty}. By default this will be the plain field name. But field names might also consist
-	 * of path traversals so we might need to create intermediate {@link BasicDocument}s.
+	 * of path traversals so we might need to create intermediate {@link BasicDBObject}s.
 	 * 
 	 * @param prop must not be {@literal null}.
 	 * @param value
@@ -70,21 +63,21 @@ class DocumentAccessor {
 		String fieldName = prop.getFieldName();
 
 		if (!fieldName.contains(".")) {
-			BsonUtils.addToMap(document, fieldName, value);
+			dbObject.put(fieldName, value);
 			return;
 		}
 
 		Iterator<String> parts = Arrays.asList(fieldName.split("\\.")).iterator();
-		Bson document = this.document;
+		DBObject dbObject = this.dbObject;
 
 		while (parts.hasNext()) {
 
 			String part = parts.next();
 
 			if (parts.hasNext()) {
-				document = getOrCreateNestedDocument(part, document);
+				dbObject = getOrCreateNestedDbObject(part, dbObject);
 			} else {
-				BsonUtils.addToMap(document, part, value);
+				dbObject.put(part, value);
 			}
 		}
 	}
@@ -102,11 +95,11 @@ class DocumentAccessor {
 		String fieldName = property.getFieldName();
 
 		if (!fieldName.contains(".")) {
-			return BsonUtils.asMap(this.document).get(fieldName);
+			return this.dbObject.get(fieldName);
 		}
 
 		Iterator<String> parts = Arrays.asList(fieldName.split("\\.")).iterator();
-		Map<String, Object> source = BsonUtils.asMap(this.document);
+		Map<String, Object> source = this.dbObject;
 		Object result = null;
 
 		while (source != null && parts.hasNext()) {
@@ -122,55 +115,7 @@ class DocumentAccessor {
 	}
 
 	/**
-	 * Returns whether the underlying {@link Document} has a value ({@literal null} or non-{@literal null}) for the given
-	 * {@link MongoPersistentProperty}.
-	 *
-	 * @param property must not be {@literal null}.
-	 * @return
-	 */
-	public boolean hasValue(MongoPersistentProperty property) {
-
-		Assert.notNull(property, "Property must not be null!");
-
-		String fieldName = property.getFieldName();
-
-		if (!fieldName.contains(".")) {
-
-			if (this.document instanceof Document) {
-				return ((Document) this.document).containsKey(fieldName);
-			}
-
-			if (this.document instanceof DBObject) {
-				return ((DBObject) this.document).containsField(fieldName);
-			}
-		}
-
-		String[] parts = fieldName.split("\\.");
-		Map<String, Object> source;
-
-		if (this.document instanceof Document) {
-			source = ((Document) this.document);
-		}else {
-			source = ((DBObject) this.document).toMap();
-		}
-
-		Object result = null;
-
-		for (int i = 1; i < parts.length; i++) {
-
-			result = source.get(parts[i - 1]);
-			source = getAsMap(result);
-
-			if (source == null) {
-				return false;
-			}
-		}
-
-		return source.containsKey(parts[parts.length - 1]);
-	}
-
-	/**
-	 * Returns the given source object as map, i.e. {@link Document}s and maps as is or {@literal null} otherwise.
+	 * Returns the given source object as map, i.e. {@link BasicDBObject}s and maps as is or {@literal null} otherwise.
 	 * 
 	 * @param source can be {@literal null}.
 	 * @return
@@ -178,10 +123,6 @@ class DocumentAccessor {
 	@SuppressWarnings("unchecked")
 	private static Map<String, Object> getAsMap(Object source) {
 
-		if (source instanceof Document) {
-			return (Document) source;
-		}
-
 		if (source instanceof BasicDBObject) {
 			return (BasicDBObject) source;
 		}
@@ -194,23 +135,23 @@ class DocumentAccessor {
 	}
 
 	/**
-	 * Returns the {@link Document} which either already exists in the given source under the given key, or creates a new
+	 * Returns the {@link DBObject} which either already exists in the given source under the given key, or creates a new
 	 * nested one, registers it with the source and returns it.
 	 * 
 	 * @param key must not be {@literal null} or empty.
 	 * @param source must not be {@literal null}.
 	 * @return
 	 */
-	private static Document getOrCreateNestedDocument(String key, Bson source) {
+	private static DBObject getOrCreateNestedDbObject(String key, DBObject source) {
 
-		Object existing = BsonUtils.asMap(source).get(key);
+		Object existing = source.get(key);
 
-		if (existing instanceof Document) {
-			return (Document) existing;
+		if (existing instanceof BasicDBObject) {
+			return (BasicDBObject) existing;
 		}
 
-		Document nested = new Document();
-		BsonUtils.addToMap(source, key, nested);
+		DBObject nested = new BasicDBObject();
+		source.put(key, nested);
 
 		return nested;
 	}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,21 +17,21 @@ package org.springframework.data.mongodb.core.convert;
 
 import java.util.Map;
 
-import org.bson.Document;
 import org.springframework.context.expression.MapAccessor;
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.PropertyAccessor;
 import org.springframework.expression.TypedValue;
 
+import com.mongodb.DBObject;
+
 /**
- * {@link PropertyAccessor} to allow entity based field access to {@link Document}s.
+ * {@link PropertyAccessor} to allow entity based field access to {@link DBObject}s.
  * 
  * @author Oliver Gierke
- * @author Christoph Strobl
  */
-class DocumentPropertyAccessor extends MapAccessor {
+class DBObjectPropertyAccessor extends MapAccessor {
 
-	static final MapAccessor INSTANCE = new DocumentPropertyAccessor();
+	static final MapAccessor INSTANCE = new DBObjectPropertyAccessor();
 
 	/*
 	 * (non-Javadoc)
@@ -39,7 +39,7 @@ class DocumentPropertyAccessor extends MapAccessor {
 	 */
 	@Override
 	public Class<?>[] getSpecificTargetClasses() {
-		return new Class[] { Document.class };
+		return new Class[] { DBObject.class };
 	}
 
 	/*

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2015 the original author 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,13 +15,10 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
-import org.bson.Document;
-import java.util.List;
-
-import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 
+import com.mongodb.DBObject;
 import com.mongodb.DBRef;
 
 /**
@@ -30,7 +27,6 @@ import com.mongodb.DBRef;
  * @author Thomas Darimont
  * @author Oliver Gierke
  * @author Christoph Strobl
- * @author Mark Paluch
  * @since 1.4
  */
 public interface DbRefResolver {
@@ -67,17 +63,5 @@ public interface DbRefResolver {
 	 * @return
 	 * @since 1.7
 	 */
-	Document fetch(DBRef dbRef);
-
-	/**
-	 * Loads a given {@link List} of {@link DBRef}s from the datasource in one batch. The resulting {@link List} of
-	 * {@link Document} will reflect the ordering of the {@link DBRef} passed in.<br />
-	 * The {@link DBRef} elements in the list must not reference different collections.
-	 *
-	 * @param dbRefs must not be {@literal null}.
-	 * @return never {@literal null}.
-	 * @throws InvalidDataAccessApiUsageException in case not all {@link DBRef} target the same collection.
-	 * @since 1.10
-	 */
-	List<Document> bulkFetch(List<DBRef> dbRefs);
+	DBObject fetch(DBRef dbRef);
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * 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.
@@ -15,7 +15,6 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
-import org.bson.Document;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.model.DefaultSpELExpressionEvaluator;
@@ -24,11 +23,12 @@ import org.springframework.data.mapping.model.SpELExpressionEvaluator;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
 import com.mongodb.DBRef;
 
 /**
  * @author Oliver Gierke
- * @author Christoph Strobl
  */
 class DefaultDbRefProxyHandler implements DbRefProxyHandler {
 
@@ -38,12 +38,11 @@ class DefaultDbRefProxyHandler implements DbRefProxyHandler {
 
 	/**
 	 * @param spELContext must not be {@literal null}.
+	 * @param conversionService must not be {@literal null}.
 	 * @param mappingContext must not be {@literal null}.
-	 * @param resolver must not be {@literal null}.
 	 */
 	public DefaultDbRefProxyHandler(SpELContext spELContext,
-			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext,
-			ValueResolver resolver) {
+			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext, ValueResolver resolver) {
 
 		this.spELContext = spELContext;
 		this.mappingContext = mappingContext;
@@ -71,7 +70,7 @@ class DefaultDbRefProxyHandler implements DbRefProxyHandler {
 		SpELExpressionEvaluator evaluator = new DefaultSpELExpressionEvaluator(proxy, spELContext);
 		PersistentPropertyAccessor accessor = entity.getPropertyAccessor(proxy);
 
-		Document object = new Document(idProperty.getFieldName(), source.getId());
+		DBObject object = new BasicDBObject(idProperty.getFieldName(), source.getId());
 		ObjectPath objectPath = ObjectPath.ROOT.push(proxy, entity, null);
 		accessor.setProperty(idProperty, resolver.getValueInternal(idProperty, object, evaluator, objectPath));
 

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

@@ -22,21 +22,15 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
-import org.bson.Document;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.cglib.proxy.Callback;
 import org.springframework.cglib.proxy.Enhancer;
 import org.springframework.cglib.proxy.Factory;
 import org.springframework.cglib.proxy.MethodProxy;
 import org.springframework.dao.DataAccessException;
-import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.mongodb.LazyLoadingException;
 import org.springframework.data.mongodb.MongoDbFactory;
@@ -46,8 +40,8 @@ import org.springframework.objenesis.ObjenesisStd;
 import org.springframework.util.Assert;
 import org.springframework.util.ReflectionUtils;
 
+import com.mongodb.DBObject;
 import com.mongodb.DBRef;
-import com.mongodb.client.MongoDatabase;
 
 /**
  * A {@link DbRefResolver} that resolves {@link org.springframework.data.mongodb.core.mapping.DBRef}s by delegating to a
@@ -56,7 +50,6 @@ import com.mongodb.client.MongoDatabase;
  * @author Thomas Darimont
  * @author Oliver Gierke
  * @author Christoph Strobl
- * @author Mark Paluch
  * @since 1.4
  */
 public class DefaultDbRefResolver implements DbRefResolver {
@@ -112,44 +105,10 @@ public class DefaultDbRefResolver implements DbRefResolver {
 	 * @see org.springframework.data.mongodb.core.convert.DbRefResolver#fetch(com.mongodb.DBRef)
 	 */
 	@Override
-	public Document fetch(DBRef dbRef) {
+	public DBObject fetch(DBRef dbRef) {
 		return ReflectiveDBRefResolver.fetch(mongoDbFactory, dbRef);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.DbRefResolver#bulkFetch(java.util.List)
-	 */
-	@Override
-	public List<Document> bulkFetch(List<DBRef> refs) {
-
-		Assert.notNull(mongoDbFactory, "Factory must not be null!");
-		Assert.notNull(refs, "DBRef to fetch must not be null!");
-
-		if (refs.isEmpty()) {
-			return Collections.emptyList();
-		}
-
-		String collection = refs.iterator().next().getCollectionName();
-
-		List<Object> ids = new ArrayList<Object>(refs.size());
-		for (DBRef ref : refs) {
-
-			if (!collection.equals(ref.getCollectionName())) {
-				throw new InvalidDataAccessApiUsageException(
-						"DBRefs must all target the same collection for bulk fetch operation.");
-			}
-
-			ids.add(ref.getId());
-		}
-
-		MongoDatabase db = mongoDbFactory.getDb();
-		List<Document> result = new ArrayList<>();
-		db.getCollection(collection).find(new Document("_id", new Document("$in", ids))).into(result);
-		Collections.sort(result, new DbRefByReferencePositionComparator(ids));
-		return result;
-	}
-
 	/**
 	 * Creates a proxy for the given {@link MongoPersistentProperty} using the given {@link DbRefResolverCallback} to
 	 * eventually resolve the value of the property.
@@ -436,37 +395,4 @@ public class DefaultDbRefResolver implements DbRefResolver {
 			return result;
 		}
 	}
-
-	/**
-	 * {@link Comparator} for sorting {@link Document} that have been loaded in random order by a predefined list of
-	 * reference identifiers.
-	 *
-	 * @author Christoph Strobl
-	 * @author Oliver Gierke
-	 * @since 1.10
-	 */
-	private static class DbRefByReferencePositionComparator implements Comparator<Document> {
-
-		private final List<Object> reference;
-
-		/**
-		 * Creates a new {@link DbRefByReferencePositionComparator} for the given list of reference identifiers.
-		 *
-		 * @param referenceIds must not be {@literal null}.
-		 */
-		public DbRefByReferencePositionComparator(List<Object> referenceIds) {
-
-			Assert.notNull(referenceIds, "Reference identifiers must not be null!");
-			this.reference = new ArrayList<Object>(referenceIds);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
-		 */
-		@Override
-		public int compare(Document o1, Document o2) {
-			return Integer.compare(reference.indexOf(o1.get("_id")), reference.indexOf(o2.get("_id")));
-		}
-	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * 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.
@@ -15,26 +15,25 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
-import org.bson.Document;
-import org.bson.conversions.Bson;
 import org.springframework.data.mapping.model.SpELExpressionEvaluator;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 
+import com.mongodb.DBObject;
+
 /**
  * Default implementation of {@link DbRefResolverCallback}.
  * 
  * @author Oliver Gierke
- * @author Christoph Strobl
  */
 class DefaultDbRefResolverCallback implements DbRefResolverCallback {
 
-	private final Bson surroundingObject;
+	private final DBObject surroundingObject;
 	private final ObjectPath path;
 	private final ValueResolver resolver;
 	private final SpELExpressionEvaluator evaluator;
 
 	/**
-	 * Creates a new {@link DefaultDbRefResolverCallback} using the given {@link Document}, {@link ObjectPath},
+	 * Creates a new {@link DefaultDbRefResolverCallback} using the given {@link DBObject}, {@link ObjectPath},
 	 * {@link ValueResolver} and {@link SpELExpressionEvaluator}.
 	 * 
 	 * @param surroundingObject must not be {@literal null}.
@@ -42,7 +41,7 @@ class DefaultDbRefResolverCallback implements DbRefResolverCallback {
 	 * @param evaluator must not be {@literal null}.
 	 * @param resolver must not be {@literal null}.
 	 */
-	public DefaultDbRefResolverCallback(Bson surroundingObject, ObjectPath path, SpELExpressionEvaluator evaluator,
+	public DefaultDbRefResolverCallback(DBObject surroundingObject, ObjectPath path, SpELExpressionEvaluator evaluator,
 			ValueResolver resolver) {
 
 		this.surroundingObject = surroundingObject;

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

@@ -20,8 +20,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.bson.Document;
-import org.bson.conversions.Bson;
 import org.springframework.data.convert.DefaultTypeMapper;
 import org.springframework.data.convert.SimpleTypeInformationMapper;
 import org.springframework.data.convert.TypeAliasAccessor;
@@ -32,20 +30,19 @@ import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.TypeInformation;
 
 import com.mongodb.BasicDBList;
+import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
 
 /**
  * Default implementation of {@link MongoTypeMapper} allowing configuration of the key to lookup and store type
- * information in {@link Document}. The key defaults to {@link #DEFAULT_TYPE_KEY}. Actual type-to-{@link String}
+ * information in {@link DBObject}. The key defaults to {@link #DEFAULT_TYPE_KEY}. Actual type-to-{@link String}
  * conversion and back is done in {@link #getTypeString(TypeInformation)} or {@link #getTypeInformation(String)}
  * respectively.
  * 
  * @author Oliver Gierke
  * @author Thomas Darimont
- * @author Christoph Strobl
- * @author Mark Paluch
  */
-public class DefaultMongoTypeMapper extends DefaultTypeMapper<Bson> implements MongoTypeMapper {
+public class DefaultMongoTypeMapper extends DefaultTypeMapper<DBObject> implements MongoTypeMapper {
 
 	public static final String DEFAULT_TYPE_KEY = "_class";
 	@SuppressWarnings("rawtypes") //
@@ -53,7 +50,7 @@ public class DefaultMongoTypeMapper extends DefaultTypeMapper<Bson> implements M
 	@SuppressWarnings("rawtypes") //
 	private static final TypeInformation<Map> MAP_TYPE_INFO = ClassTypeInformation.from(Map.class);
 
-	private final TypeAliasAccessor<Bson> accessor;
+	private final TypeAliasAccessor<DBObject> accessor;
 	private final String typeKey;
 
 	public DefaultMongoTypeMapper() {
@@ -65,15 +62,15 @@ public class DefaultMongoTypeMapper extends DefaultTypeMapper<Bson> implements M
 	}
 
 	public DefaultMongoTypeMapper(String typeKey, MappingContext<? extends PersistentEntity<?, ?>, ?> mappingContext) {
-		this(typeKey, new DocumentTypeAliasAccessor(typeKey), mappingContext,
+		this(typeKey, new DBObjectTypeAliasAccessor(typeKey), mappingContext,
 				Arrays.asList(new SimpleTypeInformationMapper()));
 	}
 
 	public DefaultMongoTypeMapper(String typeKey, List<? extends TypeInformationMapper> mappers) {
-		this(typeKey, new DocumentTypeAliasAccessor(typeKey), null, mappers);
+		this(typeKey, new DBObjectTypeAliasAccessor(typeKey), null, mappers);
 	}
 
-	private DefaultMongoTypeMapper(String typeKey, TypeAliasAccessor<Bson> accessor,
+	private DefaultMongoTypeMapper(String typeKey, TypeAliasAccessor<DBObject> accessor,
 			MappingContext<? extends PersistentEntity<?, ?>, ?> mappingContext,
 			List<? extends TypeInformationMapper> mappers) {
 
@@ -96,7 +93,7 @@ public class DefaultMongoTypeMapper extends DefaultTypeMapper<Bson> implements M
 	 * @see org.springframework.data.mongodb.core.convert.MongoTypeMapper#writeTypeRestrictions(java.util.Set)
 	 */
 	@Override
-	public void writeTypeRestrictions(Document result, Set<Class<?>> restrictedTypes) {
+	public void writeTypeRestrictions(DBObject result, Set<Class<?>> restrictedTypes) {
 
 		if (restrictedTypes == null || restrictedTypes.isEmpty()) {
 			return;
@@ -113,28 +110,27 @@ public class DefaultMongoTypeMapper extends DefaultTypeMapper<Bson> implements M
 			}
 		}
 
-		accessor.writeTypeTo(result, new Document("$in", restrictedMappedTypes));
+		accessor.writeTypeTo(result, new BasicDBObject("$in", restrictedMappedTypes));
 	}
 
 	/* (non-Javadoc)
 	 * @see org.springframework.data.convert.DefaultTypeMapper#getFallbackTypeFor(java.lang.Object)
 	 */
 	@Override
-	protected TypeInformation<?> getFallbackTypeFor(Bson source) {
-
+	protected TypeInformation<?> getFallbackTypeFor(DBObject source) {
 		return source instanceof BasicDBList ? LIST_TYPE_INFO : MAP_TYPE_INFO;
 	}
 
 	/**
-	 * {@link TypeAliasAccessor} to store aliases in a {@link Document}.
+	 * {@link TypeAliasAccessor} to store aliases in a {@link DBObject}.
 	 * 
 	 * @author Oliver Gierke
 	 */
-	public static final class DocumentTypeAliasAccessor implements TypeAliasAccessor<Bson> {
+	public static final class DBObjectTypeAliasAccessor implements TypeAliasAccessor<DBObject> {
 
 		private final String typeKey;
 
-		public DocumentTypeAliasAccessor(String typeKey) {
+		public DBObjectTypeAliasAccessor(String typeKey) {
 			this.typeKey = typeKey;
 		}
 
@@ -142,34 +138,22 @@ public class DefaultMongoTypeMapper extends DefaultTypeMapper<Bson> implements M
 		 * (non-Javadoc)
 		 * @see org.springframework.data.convert.TypeAliasAccessor#readAliasFrom(java.lang.Object)
 		 */
-		public Object readAliasFrom(Bson source) {
+		public Object readAliasFrom(DBObject source) {
 
-			if (source instanceof List) {
+			if (source instanceof BasicDBList) {
 				return null;
 			}
 
-			if (source instanceof Document) {
-				return ((Document) source).get(typeKey);
-			} else if (source instanceof DBObject) {
-				return ((DBObject) source).get(typeKey);
-			}
-
-			throw new IllegalArgumentException("Cannot read alias from " + source.getClass());
+			return source.get(typeKey);
 		}
 
 		/*
 		 * (non-Javadoc)
 		 * @see org.springframework.data.convert.TypeAliasAccessor#writeTypeTo(java.lang.Object, java.lang.Object)
 		 */
-		public void writeTypeTo(Bson sink, Object alias) {
-
+		public void writeTypeTo(DBObject sink, Object alias) {
 			if (typeKey != null) {
-
-				if (sink instanceof Document) {
-					((Document) sink).put(typeKey, alias);
-				} else if (sink instanceof DBObject) {
-					((DBObject) sink).put(typeKey, alias);
-				}
+				sink.put(typeKey, alias);
 			}
 		}
 	}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2015 the original author 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,7 +20,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
-import org.bson.Document;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.convert.ReadingConverter;
 import org.springframework.data.convert.WritingConverter;
@@ -45,6 +44,8 @@ import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 
 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.
@@ -69,27 +70,27 @@ abstract class GeoConverters {
 	@SuppressWarnings("unchecked")
 	public static Collection<? extends Object> getConvertersToRegister() {
 		return Arrays.asList( //
-				BoxToDocumentConverter.INSTANCE //
-				, PolygonToDocumentConverter.INSTANCE //
-				, CircleToDocumentConverter.INSTANCE //
-				, SphereToDocumentConverter.INSTANCE //
-				, DocumentToBoxConverter.INSTANCE //
-				, DocumentToPolygonConverter.INSTANCE //
-				, DocumentToCircleConverter.INSTANCE //
-				, DocumentToSphereConverter.INSTANCE //
-				, DocumentToPointConverter.INSTANCE //
-				, PointToDocumentConverter.INSTANCE //
-				, GeoCommandToDocumentConverter.INSTANCE //
-				, GeoJsonToDocumentConverter.INSTANCE //
-				, GeoJsonPointToDocumentConverter.INSTANCE //
-				, GeoJsonPolygonToDocumentConverter.INSTANCE //
-				, DocumentToGeoJsonPointConverter.INSTANCE //
-				, DocumentToGeoJsonPolygonConverter.INSTANCE //
-				, DocumentToGeoJsonLineStringConverter.INSTANCE //
-				, DocumentToGeoJsonMultiLineStringConverter.INSTANCE //
-				, DocumentToGeoJsonMultiPointConverter.INSTANCE //
-				, DocumentToGeoJsonMultiPolygonConverter.INSTANCE //
-				, DocumentToGeoJsonGeometryCollectionConverter.INSTANCE);
+				BoxToDbObjectConverter.INSTANCE //
+				, PolygonToDbObjectConverter.INSTANCE //
+				, CircleToDbObjectConverter.INSTANCE //
+				, SphereToDbObjectConverter.INSTANCE //
+				, DbObjectToBoxConverter.INSTANCE //
+				, DbObjectToPolygonConverter.INSTANCE //
+				, DbObjectToCircleConverter.INSTANCE //
+				, DbObjectToSphereConverter.INSTANCE //
+				, DbObjectToPointConverter.INSTANCE //
+				, PointToDbObjectConverter.INSTANCE //
+				, GeoCommandToDbObjectConverter.INSTANCE //
+				, GeoJsonToDbObjectConverter.INSTANCE //
+				, GeoJsonPointToDbObjectConverter.INSTANCE //
+				, GeoJsonPolygonToDbObjectConverter.INSTANCE //
+				, DbObjectToGeoJsonPointConverter.INSTANCE //
+				, DbObjectToGeoJsonPolygonConverter.INSTANCE //
+				, DbObjectToGeoJsonLineStringConverter.INSTANCE //
+				, DbObjectToGeoJsonMultiLineStringConverter.INSTANCE //
+				, DbObjectToGeoJsonMultiPointConverter.INSTANCE //
+				, DbObjectToGeoJsonMultiPolygonConverter.INSTANCE //
+				, DbObjectToGeoJsonGeometryCollectionConverter.INSTANCE);
 	}
 
 	/**
@@ -99,7 +100,7 @@ abstract class GeoConverters {
 	 * @since 1.5
 	 */
 	@ReadingConverter
-	static enum DocumentToPointConverter implements Converter<Document, Point> {
+	static enum DbObjectToPointConverter implements Converter<DBObject, Point> {
 
 		INSTANCE;
 
@@ -108,7 +109,7 @@ abstract class GeoConverters {
 		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
 		 */
 		@Override
-		public Point convert(Document source) {
+		public Point convert(DBObject source) {
 
 			if (source == null) {
 				return null;
@@ -116,8 +117,8 @@ abstract class GeoConverters {
 
 			Assert.isTrue(source.keySet().size() == 2, "Source must contain 2 elements");
 
-			if (source.containsKey("type")) {
-				return DocumentToGeoJsonPointConverter.INSTANCE.convert(source);
+			if (source.containsField("type")) {
+				return DbObjectToGeoJsonPointConverter.INSTANCE.convert(source);
 			}
 
 			return new Point((Double) source.get("x"), (Double) source.get("y"));
@@ -130,7 +131,7 @@ abstract class GeoConverters {
 	 * @author Thomas Darimont
 	 * @since 1.5
 	 */
-	static enum PointToDocumentConverter implements Converter<Point, Document> {
+	static enum PointToDbObjectConverter implements Converter<Point, DBObject> {
 
 		INSTANCE;
 
@@ -139,8 +140,8 @@ abstract class GeoConverters {
 		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
 		 */
 		@Override
-		public Document convert(Point source) {
-			return source == null ? null : new Document("x", source.getX()).append("y", source.getY());
+		public DBObject convert(Point source) {
+			return source == null ? null : new BasicDBObject("x", source.getX()).append("y", source.getY());
 		}
 	}
 
@@ -151,7 +152,7 @@ abstract class GeoConverters {
 	 * @since 1.5
 	 */
 	@WritingConverter
-	static enum BoxToDocumentConverter implements Converter<Box, Document> {
+	static enum BoxToDbObjectConverter implements Converter<Box, DBObject> {
 
 		INSTANCE;
 
@@ -160,15 +161,15 @@ abstract class GeoConverters {
 		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
 		 */
 		@Override
-		public Document convert(Box source) {
+		public DBObject convert(Box source) {
 
 			if (source == null) {
 				return null;
 			}
 
-			Document result = new Document();
-			result.put("first", PointToDocumentConverter.INSTANCE.convert(source.getFirst()));
-			result.put("second", PointToDocumentConverter.INSTANCE.convert(source.getSecond()));
+			BasicDBObject result = new BasicDBObject();
+			result.put("first", PointToDbObjectConverter.INSTANCE.convert(source.getFirst()));
+			result.put("second", PointToDbObjectConverter.INSTANCE.convert(source.getSecond()));
 			return result;
 		}
 	}
@@ -180,7 +181,7 @@ abstract class GeoConverters {
 	 * @since 1.5
 	 */
 	@ReadingConverter
-	static enum DocumentToBoxConverter implements Converter<Document, Box> {
+	static enum DbObjectToBoxConverter implements Converter<DBObject, Box> {
 
 		INSTANCE;
 
@@ -189,14 +190,14 @@ abstract class GeoConverters {
 		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
 		 */
 		@Override
-		public Box convert(Document source) {
+		public Box convert(DBObject source) {
 
 			if (source == null) {
 				return null;
 			}
 
-			Point first = DocumentToPointConverter.INSTANCE.convert((Document) source.get("first"));
-			Point second = DocumentToPointConverter.INSTANCE.convert((Document) source.get("second"));
+			Point first = DbObjectToPointConverter.INSTANCE.convert((DBObject) source.get("first"));
+			Point second = DbObjectToPointConverter.INSTANCE.convert((DBObject) source.get("second"));
 
 			return new Box(first, second);
 		}
@@ -208,7 +209,7 @@ abstract class GeoConverters {
 	 * @author Thomas Darimont
 	 * @since 1.5
 	 */
-	static enum CircleToDocumentConverter implements Converter<Circle, Document> {
+	static enum CircleToDbObjectConverter implements Converter<Circle, DBObject> {
 
 		INSTANCE;
 
@@ -217,14 +218,14 @@ abstract class GeoConverters {
 		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
 		 */
 		@Override
-		public Document convert(Circle source) {
+		public DBObject convert(Circle source) {
 
 			if (source == null) {
 				return null;
 			}
 
-			Document result = new Document();
-			result.put("center", PointToDocumentConverter.INSTANCE.convert(source.getCenter()));
+			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;
@@ -232,13 +233,13 @@ abstract class GeoConverters {
 	}
 
 	/**
-	 * Converts a {@link Document} into a {@link Circle}.
+	 * Converts a {@link DBObject} into a {@link Circle}.
 	 * 
 	 * @author Thomas Darimont
 	 * @since 1.5
 	 */
 	@ReadingConverter
-	static enum DocumentToCircleConverter implements Converter<Document, Circle> {
+	static enum DbObjectToCircleConverter implements Converter<DBObject, Circle> {
 
 		INSTANCE;
 
@@ -247,18 +248,18 @@ abstract class GeoConverters {
 		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
 		 */
 		@Override
-		public Circle convert(Document source) {
+		public Circle convert(DBObject source) {
 
 			if (source == null) {
 				return null;
 			}
 
-			Document center = (Document) source.get("center");
+			DBObject center = (DBObject) source.get("center");
 			Double radius = (Double) source.get("radius");
 
 			Distance distance = new Distance(radius);
 
-			if (source.containsKey("metric")) {
+			if (source.containsField("metric")) {
 
 				String metricString = (String) source.get("metric");
 				Assert.notNull(metricString, "Metric must not be null!");
@@ -269,7 +270,7 @@ abstract class GeoConverters {
 			Assert.notNull(center, "Center must not be null!");
 			Assert.notNull(radius, "Radius must not be null!");
 
-			return new Circle(DocumentToPointConverter.INSTANCE.convert(center), distance);
+			return new Circle(DbObjectToPointConverter.INSTANCE.convert(center), distance);
 		}
 	}
 
@@ -279,7 +280,7 @@ abstract class GeoConverters {
 	 * @author Thomas Darimont
 	 * @since 1.5
 	 */
-	static enum SphereToDocumentConverter implements Converter<Sphere, Document> {
+	static enum SphereToDbObjectConverter implements Converter<Sphere, DBObject> {
 
 		INSTANCE;
 
@@ -288,14 +289,14 @@ abstract class GeoConverters {
 		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
 		 */
 		@Override
-		public Document convert(Sphere source) {
+		public DBObject convert(Sphere source) {
 
 			if (source == null) {
 				return null;
 			}
 
-			Document result = new Document();
-			result.put("center", PointToDocumentConverter.INSTANCE.convert(source.getCenter()));
+			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;
@@ -309,7 +310,7 @@ abstract class GeoConverters {
 	 * @since 1.5
 	 */
 	@ReadingConverter
-	static enum DocumentToSphereConverter implements Converter<Document, Sphere> {
+	static enum DbObjectToSphereConverter implements Converter<DBObject, Sphere> {
 
 		INSTANCE;
 
@@ -318,18 +319,18 @@ abstract class GeoConverters {
 		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
 		 */
 		@Override
-		public Sphere convert(Document source) {
+		public Sphere convert(DBObject source) {
 
 			if (source == null) {
 				return null;
 			}
 
-			Document center = (Document) source.get("center");
+			DBObject center = (DBObject) source.get("center");
 			Double radius = (Double) source.get("radius");
 
 			Distance distance = new Distance(radius);
 
-			if (source.containsKey("metric")) {
+			if (source.containsField("metric")) {
 
 				String metricString = (String) source.get("metric");
 				Assert.notNull(metricString, "Metric must not be null!");
@@ -340,7 +341,7 @@ abstract class GeoConverters {
 			Assert.notNull(center, "Center must not be null!");
 			Assert.notNull(radius, "Radius must not be null!");
 
-			return new Sphere(DocumentToPointConverter.INSTANCE.convert(center), distance);
+			return new Sphere(DbObjectToPointConverter.INSTANCE.convert(center), distance);
 		}
 	}
 
@@ -350,7 +351,7 @@ abstract class GeoConverters {
 	 * @author Thomas Darimont
 	 * @since 1.5
 	 */
-	static enum PolygonToDocumentConverter implements Converter<Polygon, Document> {
+	static enum PolygonToDbObjectConverter implements Converter<Polygon, DBObject> {
 
 		INSTANCE;
 
@@ -359,20 +360,20 @@ abstract class GeoConverters {
 		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
 		 */
 		@Override
-		public Document convert(Polygon source) {
+		public DBObject convert(Polygon source) {
 
 			if (source == null) {
 				return null;
 			}
 
 			List<Point> points = source.getPoints();
-			List<Document> pointTuples = new ArrayList<Document>(points.size());
+			List<DBObject> pointTuples = new ArrayList<DBObject>(points.size());
 
 			for (Point point : points) {
-				pointTuples.add(PointToDocumentConverter.INSTANCE.convert(point));
+				pointTuples.add(PointToDbObjectConverter.INSTANCE.convert(point));
 			}
 
-			Document result = new Document();
+			DBObject result = new BasicDBObject();
 			result.put("points", pointTuples);
 			return result;
 		}
@@ -385,7 +386,7 @@ abstract class GeoConverters {
 	 * @since 1.5
 	 */
 	@ReadingConverter
-	static enum DocumentToPolygonConverter implements Converter<Document, Polygon> {
+	static enum DbObjectToPolygonConverter implements Converter<DBObject, Polygon> {
 
 		INSTANCE;
 
@@ -395,19 +396,19 @@ abstract class GeoConverters {
 		 */
 		@Override
 		@SuppressWarnings({ "unchecked" })
-		public Polygon convert(Document source) {
+		public Polygon convert(DBObject source) {
 
 			if (source == null) {
 				return null;
 			}
 
-			List<Document> points = (List<Document>) source.get("points");
+			List<DBObject> points = (List<DBObject>) source.get("points");
 			List<Point> newPoints = new ArrayList<Point>(points.size());
 
-			for (Document element : points) {
+			for (DBObject element : points) {
 
 				Assert.notNull(element, "Point elements of polygon must not be null!");
-				newPoints.add(DocumentToPointConverter.INSTANCE.convert(element));
+				newPoints.add(DbObjectToPointConverter.INSTANCE.convert(element));
 			}
 
 			return new Polygon(newPoints);
@@ -420,7 +421,7 @@ abstract class GeoConverters {
 	 * @author Thomas Darimont
 	 * @since 1.5
 	 */
-	static enum GeoCommandToDocumentConverter implements Converter<GeoCommand, Document> {
+	static enum GeoCommandToDbObjectConverter implements Converter<GeoCommand, DBObject> {
 
 		INSTANCE;
 
@@ -430,18 +431,18 @@ abstract class GeoConverters {
 		 */
 		@Override
 		@SuppressWarnings("rawtypes")
-		public Document convert(GeoCommand source) {
+		public DBObject convert(GeoCommand source) {
 
 			if (source == null) {
 				return null;
 			}
 
-			List argument = new ArrayList();
+			BasicDBList argument = new BasicDBList();
 
 			Shape shape = source.getShape();
 
 			if (shape instanceof GeoJson) {
-				return GeoJsonToDocumentConverter.INSTANCE.convert((GeoJson) shape);
+				return GeoJsonToDbObjectConverter.INSTANCE.convert((GeoJson) shape);
 			}
 
 			if (shape instanceof Box) {
@@ -471,7 +472,7 @@ abstract class GeoConverters {
 				argument.add(((Sphere) shape).getRadius().getNormalizedValue());
 			}
 
-			return new Document(source.getCommand(), argument);
+			return new BasicDBObject(source.getCommand(), argument);
 		}
 	}
 
@@ -480,7 +481,7 @@ abstract class GeoConverters {
 	 * @since 1.7
 	 */
 	@SuppressWarnings("rawtypes")
-	static enum GeoJsonToDocumentConverter implements Converter<GeoJson, Document> {
+	static enum GeoJsonToDbObjectConverter implements Converter<GeoJson, DBObject> {
 
 		INSTANCE;
 
@@ -489,17 +490,17 @@ abstract class GeoConverters {
 		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
 		 */
 		@Override
-		public Document convert(GeoJson source) {
+		public DBObject convert(GeoJson source) {
 
 			if (source == null) {
 				return null;
 			}
 
-			Document dbo = new Document("type", source.getType());
+			DBObject dbo = new BasicDBObject("type", source.getType());
 
 			if (source instanceof GeoJsonGeometryCollection) {
 
-				List dbl = new ArrayList();
+				BasicDBList dbl = new BasicDBList();
 
 				for (GeoJson geometry : ((GeoJsonGeometryCollection) source).getCoordinates()) {
 					dbl.add(convert(geometry));
@@ -522,7 +523,7 @@ abstract class GeoConverters {
 
 			if (candidate instanceof Iterable) {
 
-				List dbl = new ArrayList();
+				BasicDBList dbl = new BasicDBList();
 
 				for (Object element : (Iterable) candidate) {
 					dbl.add(convertIfNecessarry(element));
@@ -543,7 +544,7 @@ abstract class GeoConverters {
 	 * @author Christoph Strobl
 	 * @since 1.7
 	 */
-	static enum GeoJsonPointToDocumentConverter implements Converter<GeoJsonPoint, Document> {
+	static enum GeoJsonPointToDbObjectConverter implements Converter<GeoJsonPoint, DBObject> {
 
 		INSTANCE;
 
@@ -552,8 +553,8 @@ abstract class GeoConverters {
 		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
 		 */
 		@Override
-		public Document convert(GeoJsonPoint source) {
-			return GeoJsonToDocumentConverter.INSTANCE.convert(source);
+		public DBObject convert(GeoJsonPoint source) {
+			return GeoJsonToDbObjectConverter.INSTANCE.convert(source);
 		}
 	}
 
@@ -561,7 +562,7 @@ abstract class GeoConverters {
 	 * @author Christoph Strobl
 	 * @since 1.7
 	 */
-	static enum GeoJsonPolygonToDocumentConverter implements Converter<GeoJsonPolygon, Document> {
+	static enum GeoJsonPolygonToDbObjectConverter implements Converter<GeoJsonPolygon, DBObject> {
 
 		INSTANCE;
 
@@ -570,8 +571,8 @@ abstract class GeoConverters {
 		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
 		 */
 		@Override
-		public Document convert(GeoJsonPolygon source) {
-			return GeoJsonToDocumentConverter.INSTANCE.convert(source);
+		public DBObject convert(GeoJsonPolygon source) {
+			return GeoJsonToDbObjectConverter.INSTANCE.convert(source);
 		}
 	}
 
@@ -579,7 +580,7 @@ abstract class GeoConverters {
 	 * @author Christoph Strobl
 	 * @since 1.7
 	 */
-	static enum DocumentToGeoJsonPointConverter implements Converter<Document, GeoJsonPoint> {
+	static enum DbObjectToGeoJsonPointConverter implements Converter<DBObject, GeoJsonPoint> {
 
 		INSTANCE;
 
@@ -589,7 +590,7 @@ abstract class GeoConverters {
 		 */
 		@Override
 		@SuppressWarnings("unchecked")
-		public GeoJsonPoint convert(Document source) {
+		public GeoJsonPoint convert(DBObject source) {
 
 			if (source == null) {
 				return null;
@@ -598,7 +599,7 @@ abstract class GeoConverters {
 			Assert.isTrue(ObjectUtils.nullSafeEquals(source.get("type"), "Point"),
 					String.format("Cannot convert type '%s' to Point.", source.get("type")));
 
-			List<Number> dbl = (List<Number>) source.get("coordinates");
+			List<Double> dbl = (List<Double>) source.get("coordinates");
 			return new GeoJsonPoint(dbl.get(0).doubleValue(), dbl.get(1).doubleValue());
 		}
 	}
@@ -607,7 +608,7 @@ abstract class GeoConverters {
 	 * @author Christoph Strobl
 	 * @since 1.7
 	 */
-	static enum DocumentToGeoJsonPolygonConverter implements Converter<Document, GeoJsonPolygon> {
+	static enum DbObjectToGeoJsonPolygonConverter implements Converter<DBObject, GeoJsonPolygon> {
 
 		INSTANCE;
 
@@ -616,7 +617,7 @@ abstract class GeoConverters {
 		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
 		 */
 		@Override
-		public GeoJsonPolygon convert(Document source) {
+		public GeoJsonPolygon convert(DBObject source) {
 
 			if (source == null) {
 				return null;
@@ -625,7 +626,7 @@ abstract class GeoConverters {
 			Assert.isTrue(ObjectUtils.nullSafeEquals(source.get("type"), "Polygon"),
 					String.format("Cannot convert type '%s' to Polygon.", source.get("type")));
 
-			return toGeoJsonPolygon((List) source.get("coordinates"));
+			return toGeoJsonPolygon((BasicDBList) source.get("coordinates"));
 		}
 	}
 
@@ -633,7 +634,7 @@ abstract class GeoConverters {
 	 * @author Christoph Strobl
 	 * @since 1.7
 	 */
-	static enum DocumentToGeoJsonMultiPolygonConverter implements Converter<Document, GeoJsonMultiPolygon> {
+	static enum DbObjectToGeoJsonMultiPolygonConverter implements Converter<DBObject, GeoJsonMultiPolygon> {
 
 		INSTANCE;
 
@@ -642,7 +643,7 @@ abstract class GeoConverters {
 		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
 		 */
 		@Override
-		public GeoJsonMultiPolygon convert(Document source) {
+		public GeoJsonMultiPolygon convert(DBObject source) {
 
 			if (source == null) {
 				return null;
@@ -651,11 +652,11 @@ abstract class GeoConverters {
 			Assert.isTrue(ObjectUtils.nullSafeEquals(source.get("type"), "MultiPolygon"),
 					String.format("Cannot convert type '%s' to MultiPolygon.", source.get("type")));
 
-			List dbl = (List) source.get("coordinates");
+			BasicDBList dbl = (BasicDBList) source.get("coordinates");
 			List<GeoJsonPolygon> polygones = new ArrayList<GeoJsonPolygon>();
 
 			for (Object polygon : dbl) {
-				polygones.add(toGeoJsonPolygon((List) polygon));
+				polygones.add(toGeoJsonPolygon((BasicDBList) polygon));
 			}
 
 			return new GeoJsonMultiPolygon(polygones);
@@ -666,7 +667,7 @@ abstract class GeoConverters {
 	 * @author Christoph Strobl
 	 * @since 1.7
 	 */
-	static enum DocumentToGeoJsonLineStringConverter implements Converter<Document, GeoJsonLineString> {
+	static enum DbObjectToGeoJsonLineStringConverter implements Converter<DBObject, GeoJsonLineString> {
 
 		INSTANCE;
 
@@ -675,7 +676,7 @@ abstract class GeoConverters {
 		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
 		 */
 		@Override
-		public GeoJsonLineString convert(Document source) {
+		public GeoJsonLineString convert(DBObject source) {
 
 			if (source == null) {
 				return null;
@@ -684,7 +685,7 @@ abstract class GeoConverters {
 			Assert.isTrue(ObjectUtils.nullSafeEquals(source.get("type"), "LineString"),
 					String.format("Cannot convert type '%s' to LineString.", source.get("type")));
 
-			List cords = (List) source.get("coordinates");
+			BasicDBList cords = (BasicDBList) source.get("coordinates");
 
 			return new GeoJsonLineString(toListOfPoint(cords));
 		}
@@ -694,7 +695,7 @@ abstract class GeoConverters {
 	 * @author Christoph Strobl
 	 * @since 1.7
 	 */
-	static enum DocumentToGeoJsonMultiPointConverter implements Converter<Document, GeoJsonMultiPoint> {
+	static enum DbObjectToGeoJsonMultiPointConverter implements Converter<DBObject, GeoJsonMultiPoint> {
 
 		INSTANCE;
 
@@ -703,7 +704,7 @@ abstract class GeoConverters {
 		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
 		 */
 		@Override
-		public GeoJsonMultiPoint convert(Document source) {
+		public GeoJsonMultiPoint convert(DBObject source) {
 
 			if (source == null) {
 				return null;
@@ -712,7 +713,7 @@ abstract class GeoConverters {
 			Assert.isTrue(ObjectUtils.nullSafeEquals(source.get("type"), "MultiPoint"),
 					String.format("Cannot convert type '%s' to MultiPoint.", source.get("type")));
 
-			List cords = (List) source.get("coordinates");
+			BasicDBList cords = (BasicDBList) source.get("coordinates");
 
 			return new GeoJsonMultiPoint(toListOfPoint(cords));
 		}
@@ -722,7 +723,7 @@ abstract class GeoConverters {
 	 * @author Christoph Strobl
 	 * @since 1.7
 	 */
-	static enum DocumentToGeoJsonMultiLineStringConverter implements Converter<Document, GeoJsonMultiLineString> {
+	static enum DbObjectToGeoJsonMultiLineStringConverter implements Converter<DBObject, GeoJsonMultiLineString> {
 
 		INSTANCE;
 
@@ -731,7 +732,7 @@ abstract class GeoConverters {
 		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
 		 */
 		@Override
-		public GeoJsonMultiLineString convert(Document source) {
+		public GeoJsonMultiLineString convert(DBObject source) {
 
 			if (source == null) {
 				return null;
@@ -741,10 +742,10 @@ abstract class GeoConverters {
 					String.format("Cannot convert type '%s' to MultiLineString.", source.get("type")));
 
 			List<GeoJsonLineString> lines = new ArrayList<GeoJsonLineString>();
-			List cords = (List) source.get("coordinates");
+			BasicDBList cords = (BasicDBList) source.get("coordinates");
 
 			for (Object line : cords) {
-				lines.add(new GeoJsonLineString(toListOfPoint((List) line)));
+				lines.add(new GeoJsonLineString(toListOfPoint((BasicDBList) line)));
 			}
 			return new GeoJsonMultiLineString(lines);
 		}
@@ -754,7 +755,7 @@ abstract class GeoConverters {
 	 * @author Christoph Strobl
 	 * @since 1.7
 	 */
-	static enum DocumentToGeoJsonGeometryCollectionConverter implements Converter<Document, GeoJsonGeometryCollection> {
+	static enum DbObjectToGeoJsonGeometryCollectionConverter implements Converter<DBObject, GeoJsonGeometryCollection> {
 
 		INSTANCE;
 
@@ -764,7 +765,7 @@ abstract class GeoConverters {
 		 */
 		@SuppressWarnings("rawtypes")
 		@Override
-		public GeoJsonGeometryCollection convert(Document source) {
+		public GeoJsonGeometryCollection convert(DBObject source) {
 
 			if (source == null) {
 				return null;
@@ -775,36 +776,36 @@ abstract class GeoConverters {
 
 			List<GeoJson<?>> geometries = new ArrayList<GeoJson<?>>();
 			for (Object o : (List) source.get("geometries")) {
-				geometries.add(convertGeometries((Document) o));
+				geometries.add(convertGeometries((DBObject) o));
 			}
 			return new GeoJsonGeometryCollection(geometries);
 
 		}
 
-		private static GeoJson<?> convertGeometries(Document source) {
+		private static GeoJson<?> convertGeometries(DBObject source) {
 
 			Object type = source.get("type");
 			if (ObjectUtils.nullSafeEquals(type, "Point")) {
-				return DocumentToGeoJsonPointConverter.INSTANCE.convert(source);
+				return DbObjectToGeoJsonPointConverter.INSTANCE.convert(source);
 			}
 
 			if (ObjectUtils.nullSafeEquals(type, "MultiPoint")) {
-				return DocumentToGeoJsonMultiPointConverter.INSTANCE.convert(source);
+				return DbObjectToGeoJsonMultiPointConverter.INSTANCE.convert(source);
 			}
 
 			if (ObjectUtils.nullSafeEquals(type, "LineString")) {
-				return DocumentToGeoJsonLineStringConverter.INSTANCE.convert(source);
+				return DbObjectToGeoJsonLineStringConverter.INSTANCE.convert(source);
 			}
 
 			if (ObjectUtils.nullSafeEquals(type, "MultiLineString")) {
-				return DocumentToGeoJsonMultiLineStringConverter.INSTANCE.convert(source);
+				return DbObjectToGeoJsonMultiLineStringConverter.INSTANCE.convert(source);
 			}
 
 			if (ObjectUtils.nullSafeEquals(type, "Polygon")) {
-				return DocumentToGeoJsonPolygonConverter.INSTANCE.convert(source);
+				return DbObjectToGeoJsonPolygonConverter.INSTANCE.convert(source);
 			}
 			if (ObjectUtils.nullSafeEquals(type, "MultiPolygon")) {
-				return DocumentToGeoJsonMultiPolygonConverter.INSTANCE.convert(source);
+				return DbObjectToGeoJsonMultiPolygonConverter.INSTANCE.convert(source);
 			}
 
 			throw new IllegalArgumentException(String.format("Cannot convert unknown GeoJson type %s", type));
@@ -823,7 +824,7 @@ abstract class GeoConverters {
 	 * @since 1.7
 	 */
 	@SuppressWarnings("unchecked")
-	static List<Point> toListOfPoint(List listOfCoordinatePairs) {
+	static List<Point> toListOfPoint(BasicDBList listOfCoordinatePairs) {
 
 		List<Point> points = new ArrayList<Point>();
 
@@ -831,7 +832,7 @@ abstract class GeoConverters {
 
 			Assert.isInstanceOf(List.class, point);
 
-			List<Number> coordinatesList = (List<Number>) point;
+			List<Double> coordinatesList = (List<Double>) point;
 
 			points.add(new GeoJsonPoint(coordinatesList.get(0).doubleValue(), coordinatesList.get(1).doubleValue()));
 		}
@@ -845,7 +846,7 @@ abstract class GeoConverters {
 	 * @return
 	 * @since 1.7
 	 */
-	static GeoJsonPolygon toGeoJsonPolygon(List dbList) {
-		return new GeoJsonPolygon(toListOfPoint((List) dbList.get(0)));
+	static GeoJsonPolygon toGeoJsonPolygon(BasicDBList dbList) {
+		return new GeoJsonPolygon(toListOfPoint((BasicDBList) dbList.get(0)));
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2016 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.
@@ -15,27 +15,26 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
-import org.bson.Document;
-import org.bson.conversions.Bson;
 import org.springframework.data.convert.EntityConverter;
 import org.springframework.data.convert.EntityReader;
 import org.springframework.data.convert.TypeMapper;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 
+import com.mongodb.DBObject;
+
 /**
  * Central Mongo specific converter interface which combines {@link MongoWriter} and {@link MongoReader}.
  * 
  * @author Oliver Gierke
  * @author Thomas Darimont
- * @author Christoph Strobl
  */
-public interface MongoConverter
-		extends EntityConverter<MongoPersistentEntity<?>, MongoPersistentProperty, Object, Bson>, MongoWriter<Object>,
-		EntityReader<Object, Bson> {
+public interface MongoConverter extends
+		EntityConverter<MongoPersistentEntity<?>, MongoPersistentProperty, Object, DBObject>, MongoWriter<Object>,
+		EntityReader<Object, DBObject> {
 
 	/**
-	 * Returns thw {@link TypeMapper} being used to write type information into {@link Document}s created with that
+	 * Returns thw {@link TypeMapper} being used to write type information into {@link DBObject}s created with that
 	 * converter.
 	 * 
 	 * @return will never be {@literal null}.

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

@@ -15,8 +15,6 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
-import reactor.core.publisher.Flux;
-
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.MalformedURLException;
@@ -28,10 +26,8 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.bson.Document;
 import org.bson.types.Code;
 import org.bson.types.ObjectId;
-import org.reactivestreams.Publisher;
 import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.converter.ConditionalConverter;
@@ -45,13 +41,16 @@ import org.springframework.util.Assert;
 import org.springframework.util.NumberUtils;
 import org.springframework.util.StringUtils;
 
+import com.mongodb.BasicDBObject;
+import com.mongodb.BasicDBObjectBuilder;
+import com.mongodb.DBObject;
+
 /**
  * Wrapper class to contain useful converters for the usage with Mongo.
- *
+ * 
  * @author Oliver Gierke
  * @author Thomas Darimont
  * @author Christoph Strobl
- * @author Mark Paluch
  */
 abstract class MongoConverters {
 
@@ -62,7 +61,7 @@ abstract class MongoConverters {
 
 	/**
 	 * Returns the converters to be registered.
-	 *
+	 * 
 	 * @return
 	 * @since 1.9
 	 */
@@ -76,10 +75,10 @@ abstract class MongoConverters {
 		converters.add(StringToBigIntegerConverter.INSTANCE);
 		converters.add(URLToStringConverter.INSTANCE);
 		converters.add(StringToURLConverter.INSTANCE);
-		converters.add(DocumentToStringConverter.INSTANCE);
+		converters.add(DBObjectToStringConverter.INSTANCE);
 		converters.add(TermToStringConverter.INSTANCE);
-		converters.add(NamedMongoScriptToDocumentConverter.INSTANCE);
-		converters.add(DocumentToNamedMongoScriptConverter.INSTANCE);
+		converters.add(NamedMongoScriptToDBObjectConverter.INSTANCE);
+		converters.add(DBObjectToNamedMongoScriptCoverter.INSTANCE);
 		converters.add(CurrencyToStringConverter.INSTANCE);
 		converters.add(StringToCurrencyConverter.INSTANCE);
 		converters.add(AtomicIntegerToIntegerConverter.INSTANCE);
@@ -92,7 +91,7 @@ abstract class MongoConverters {
 
 	/**
 	 * Simple singleton to convert {@link ObjectId}s to their {@link String} representation.
-	 *
+	 * 
 	 * @author Oliver Gierke
 	 */
 	public static enum ObjectIdToStringConverter implements Converter<ObjectId, String> {
@@ -105,7 +104,7 @@ abstract class MongoConverters {
 
 	/**
 	 * Simple singleton to convert {@link String}s to their {@link ObjectId} representation.
-	 *
+	 * 
 	 * @author Oliver Gierke
 	 */
 	public static enum StringToObjectIdConverter implements Converter<String, ObjectId> {
@@ -118,7 +117,7 @@ abstract class MongoConverters {
 
 	/**
 	 * Simple singleton to convert {@link ObjectId}s to their {@link java.math.BigInteger} representation.
-	 *
+	 * 
 	 * @author Oliver Gierke
 	 */
 	public static enum ObjectIdToBigIntegerConverter implements Converter<ObjectId, BigInteger> {
@@ -131,7 +130,7 @@ abstract class MongoConverters {
 
 	/**
 	 * Simple singleton to convert {@link BigInteger}s to their {@link ObjectId} representation.
-	 *
+	 * 
 	 * @author Oliver Gierke
 	 */
 	public static enum BigIntegerToObjectIdConverter implements Converter<BigInteger, ObjectId> {
@@ -199,18 +198,13 @@ abstract class MongoConverters {
 	}
 
 	@ReadingConverter
-	public static enum DocumentToStringConverter implements Converter<Document, String> {
+	public static enum DBObjectToStringConverter implements Converter<DBObject, String> {
 
 		INSTANCE;
 
 		@Override
-		public String convert(Document source) {
-
-			if (source == null) {
-				return null;
-			}
-
-			return source.toJson();
+		public String convert(DBObject source) {
+			return source == null ? null : source.toString();
 		}
 	}
 
@@ -233,12 +227,12 @@ abstract class MongoConverters {
 	 * @author Christoph Strobl
 	 * @since 1.7
 	 */
-	public static enum DocumentToNamedMongoScriptConverter implements Converter<Document, NamedMongoScript> {
+	public static enum DBObjectToNamedMongoScriptCoverter implements Converter<DBObject, NamedMongoScript> {
 
 		INSTANCE;
 
 		@Override
-		public NamedMongoScript convert(Document source) {
+		public NamedMongoScript convert(DBObject source) {
 
 			if (source == null) {
 				return null;
@@ -255,29 +249,29 @@ abstract class MongoConverters {
 	 * @author Christoph Strobl
 	 * @since 1.7
 	 */
-	public static enum NamedMongoScriptToDocumentConverter implements Converter<NamedMongoScript, Document> {
+	public static enum NamedMongoScriptToDBObjectConverter implements Converter<NamedMongoScript, DBObject> {
 
 		INSTANCE;
 
 		@Override
-		public Document convert(NamedMongoScript source) {
+		public DBObject convert(NamedMongoScript source) {
 
 			if (source == null) {
-				return new Document();
+				return new BasicDBObject();
 			}
 
-			Document document = new Document();
+			BasicDBObjectBuilder builder = new BasicDBObjectBuilder();
 
-			document.put("_id", source.getName());
-			document.put("value", new Code(source.getCode()));
+			builder.append("_id", source.getName());
+			builder.append("value", new Code(source.getCode()));
 
-			return document;
+			return builder.get();
 		}
 	}
 
 	/**
 	 * {@link Converter} implementation converting {@link Currency} into its ISO 4217 {@link String} representation.
-	 *
+	 * 
 	 * @author Christoph Strobl
 	 * @since 1.9
 	 */
@@ -298,7 +292,7 @@ abstract class MongoConverters {
 
 	/**
 	 * {@link Converter} implementation converting ISO 4217 {@link String} into {@link Currency}.
-	 *
+	 * 
 	 * @author Christoph Strobl
 	 * @since 1.9
 	 */
@@ -321,12 +315,12 @@ abstract class MongoConverters {
 	 * {@link ConverterFactory} implementation using {@link NumberUtils} for number conversion and parsing. Additionally
 	 * deals with {@link AtomicInteger} and {@link AtomicLong} by calling {@code get()} before performing the actual
 	 * conversion.
-	 *
+	 * 
 	 * @author Christoph Strobl
 	 * @since 1.9
 	 */
 	@WritingConverter
-	public static enum NumberToNumberConverterFactory implements ConverterFactory<Number, Number>, ConditionalConverter {
+	public static enum NumberToNumberConverterFactory implements ConverterFactory<Number, Number>,ConditionalConverter {
 
 		INSTANCE;
 
@@ -354,13 +348,13 @@ abstract class MongoConverters {
 
 			/**
 			 * Creates a new {@link NumberToNumberConverter} for the given target type.
-			 *
+			 * 
 			 * @param targetType must not be {@literal null}.
 			 */
 			public NumberToNumberConverter(Class<T> targetType) {
-
+				
 				Assert.notNull(targetType, "Target type must not be null!");
-
+				
 				this.targetType = targetType;
 			}
 

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

@@ -27,7 +27,6 @@ import java.util.Set;
 import java.util.Stack;
 import java.util.regex.Pattern;
 
-import org.bson.Document;
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.ExampleMatcher.NullHandler;
 import org.springframework.data.domain.ExampleMatcher.PropertyValueTransformer;
@@ -45,6 +44,9 @@ import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
 /**
  * @author Christoph Strobl
  * @author Mark Paluch
@@ -69,13 +71,13 @@ public class MongoExampleMapper {
 	}
 
 	/**
-	 * Returns the given {@link Example} as {@link Document} holding matching values extracted from
+	 * Returns the given {@link Example} as {@link DBObject} holding matching values extracted from
 	 * {@link Example#getProbe()}.
 	 *
 	 * @param example must not be {@literal null}.
 	 * @return
 	 */
-	public Document getMappedExample(Example<?> example) {
+	public DBObject getMappedExample(Example<?> example) {
 
 		Assert.notNull(example, "Example must not be null!");
 
@@ -83,7 +85,7 @@ public class MongoExampleMapper {
 	}
 
 	/**
-	 * Returns the given {@link Example} as {@link Document} holding matching values extracted from
+	 * Returns the given {@link Example} as {@link DBObject} holding matching values extracted from
 	 * {@link Example#getProbe()}.
 	 *
 	 * @param example must not be {@literal null}.
@@ -91,39 +93,25 @@ public class MongoExampleMapper {
 	 * @return
 	 */
 	@SuppressWarnings({ "unchecked", "rawtypes" })
-	public Document getMappedExample(Example<?> example, MongoPersistentEntity<?> entity) {
+	public DBObject getMappedExample(Example<?> example, MongoPersistentEntity<?> entity) {
 
 		Assert.notNull(example, "Example must not be null!");
 		Assert.notNull(entity, "MongoPersistentEntity must not be null!");
 
-		Document reference = (Document) converter.convertToMongoType(example.getProbe());
+		DBObject reference = (DBObject) converter.convertToMongoType(example.getProbe());
 
 		if (entity.hasIdProperty() && entity.getIdentifierAccessor(example.getProbe()).getIdentifier() == null) {
-			reference.remove(entity.getIdProperty().getFieldName());
+			reference.removeField(entity.getIdProperty().getFieldName());
 		}
 
 		ExampleMatcherAccessor matcherAccessor = new ExampleMatcherAccessor(example.getMatcher());
 
 		applyPropertySpecs("", reference, example.getProbeType(), matcherAccessor);
 
-		Document flattened = ObjectUtils.nullSafeEquals(NullHandler.INCLUDE, matcherAccessor.getNullHandler()) ? reference
-				: new Document(SerializationUtils.flattenMap(reference));
-		Document result = example.getMatcher().isAllMatching() ? flattened : orConcatenate(flattened);
+		this.converter.getTypeMapper().writeTypeRestrictions(reference, getTypesToMatch(example));
 
-		this.converter.getTypeMapper().writeTypeRestrictions(result, getTypesToMatch(example));
-
-		return result;
-	}
-
-	private static Document orConcatenate(Document source) {
-
-		List<Document> foo = new ArrayList<Document>(source.keySet().size());
-
-		for (String key : source.keySet()) {
-			foo.add(new Document(key, source.get(key)));
-		}
-
-		return new Document("$or", foo);
+		return ObjectUtils.nullSafeEquals(NullHandler.INCLUDE, matcherAccessor.getNullHandler()) ? reference
+				: new BasicDBObject(SerializationUtils.flattenMap(reference));
 	}
 
 	private Set<Class<?>> getTypesToMatch(Example<?> example) {
@@ -186,14 +174,14 @@ public class MongoExampleMapper {
 
 	}
 
-	private void applyPropertySpecs(String path, Document source, Class<?> probeType,
+	private void applyPropertySpecs(String path, DBObject source, Class<?> probeType,
 			ExampleMatcherAccessor exampleSpecAccessor) {
 
-		if (!(source instanceof Document)) {
+		if (!(source instanceof BasicDBObject)) {
 			return;
 		}
 
-		Iterator<Map.Entry<String, Object>> iter = ((Document) source).entrySet().iterator();
+		Iterator<Map.Entry<String, Object>> iter = ((BasicDBObject) source).entrySet().iterator();
 
 		while (iter.hasNext()) {
 
@@ -239,8 +227,8 @@ public class MongoExampleMapper {
 
 			if (entry.getValue() instanceof String) {
 				applyStringMatcher(entry, stringMatcher, ignoreCase);
-			} else if (entry.getValue() instanceof Document) {
-				applyPropertySpecs(propertyPath, (Document) entry.getValue(), probeType, exampleSpecAccessor);
+			} else if (entry.getValue() instanceof BasicDBObject) {
+				applyPropertySpecs(propertyPath, (BasicDBObject) entry.getValue(), probeType, exampleSpecAccessor);
 			}
 		}
 	}
@@ -251,24 +239,24 @@ public class MongoExampleMapper {
 
 	private void applyStringMatcher(Map.Entry<String, Object> entry, StringMatcher stringMatcher, boolean ignoreCase) {
 
-		Document document = new Document();
+		BasicDBObject dbo = new BasicDBObject();
 
 		if (ObjectUtils.nullSafeEquals(StringMatcher.DEFAULT, stringMatcher)) {
 
 			if (ignoreCase) {
-				document.put("$regex", Pattern.quote((String) entry.getValue()));
-				entry.setValue(document);
+				dbo.put("$regex", Pattern.quote((String) entry.getValue()));
+				entry.setValue(dbo);
 			}
 		} else {
 
 			Type type = stringMatcherPartMapping.get(stringMatcher);
 			String expression = MongoRegexCreator.INSTANCE.toRegularExpression((String) entry.getValue(), type);
-			document.put("$regex", expression);
-			entry.setValue(document);
+			dbo.put("$regex", expression);
+			entry.setValue(dbo);
 		}
 
 		if (ignoreCase) {
-			document.put("$options", "i");
+			dbo.put("$options", "i");
 		}
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 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,18 +17,16 @@ package org.springframework.data.mongodb.core.convert;
 
 import java.util.Set;
 
-import org.bson.Document;
-import org.bson.conversions.Bson;
 import org.springframework.data.convert.TypeMapper;
 
+import com.mongodb.DBObject;
+
 /**
- * Mongo-specific {@link TypeMapper} exposing that {@link Document}s might contain a type key.
+ * Mongo-specific {@link TypeMapper} exposing that {@link DBObject}s might contain a type key.
  * 
  * @author Oliver Gierke
- * @author Christoph Strobl
- * @since 1.0
  */
-public interface MongoTypeMapper extends TypeMapper<Bson> {
+public interface MongoTypeMapper extends TypeMapper<DBObject> {
 
 	/**
 	 * Returns whether the given key is the type key.
@@ -38,12 +36,12 @@ public interface MongoTypeMapper extends TypeMapper<Bson> {
 	boolean isTypeKey(String key);
 
 	/**
-	 * Writes type restrictions to the given {@link Document}. This usually results in an {@code $in}-clause to be
+	 * Writes type restrictions to the given {@link DBObject}. This usually results in an {@code $in}-clause to be
 	 * generated that restricts the type-key (e.g. {@code _class}) to be in the set of type aliases for the given
 	 * {@code restrictedTypes}.
 	 * 
 	 * @param result must not be {@literal null}
 	 * @param restrictedTypes must not be {@literal null}
 	 */
-	void writeTypeRestrictions(Document result, Set<Class<?>> restrictedTypes);
+	void writeTypeRestrictions(DBObject result, Set<Class<?>> restrictedTypes);
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2016 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.
@@ -15,23 +15,22 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
-import org.bson.conversions.Bson;
 import org.springframework.data.convert.EntityWriter;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.util.TypeInformation;
 
+import com.mongodb.DBObject;
 import com.mongodb.DBRef;
 
 /**
- * A MongoWriter is responsible for converting an object of type T to the native MongoDB representation Document.
+ * A MongoWriter is responsible for converting an object of type T to the native MongoDB representation DBObject.
  * 
- * @param <T> the type of the object to convert to a Document
+ * @param <T> the type of the object to convert to a DBObject
  * @author Mark Pollack
  * @author Thomas Risberg
  * @author Oliver Gierke
- * @author Christoph Strobl
  */
-public interface MongoWriter<T> extends EntityWriter<T, Bson> {
+public interface MongoWriter<T> extends EntityWriter<T, DBObject> {
 
 	/**
 	 * Converts the given object into one Mongo will be able to store natively. If the given object can already be stored

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * 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.
@@ -23,12 +23,14 @@ import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
+import com.mongodb.DBObject;
+
 /**
  * A path of objects nested into each other. The type allows access to all parent objects currently in creation even
  * when resolving more nested objects. This allows to avoid re-resolving object instances that are logically equivalent
  * to already resolved ones.
  * <p>
- * An immutable ordered set of target objects for {@link Document} to {@link Object} conversions. Object paths can be
+ * An immutable ordered set of target objects for {@link DBObject} to {@link Object} conversions. Object paths can be
  * constructed by the {@link #toObjectPath(Object)} method and extended via {@link #push(Object)}.
  * 
  * @author Thomas Darimont

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

@@ -23,8 +23,6 @@ import java.util.List;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.bson.Document;
-import org.bson.conversions.Bson;
 import org.bson.types.ObjectId;
 import org.springframework.core.convert.ConversionException;
 import org.springframework.core.convert.ConversionService;
@@ -43,7 +41,6 @@ import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty.PropertyToFieldNameConverter;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.mongodb.util.BsonUtils;
 import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.util.Assert;
@@ -61,16 +58,15 @@ import com.mongodb.DBRef;
  * @author Patryk Wasik
  * @author Thomas Darimont
  * @author Christoph Strobl
- * @author Mark Paluch
  */
 public class QueryMapper {
 
 	private static final List<String> DEFAULT_ID_NAMES = Arrays.asList("id", "_id");
-	private static final Document META_TEXT_SCORE = new Document("$meta", "textScore");
+	private static final DBObject META_TEXT_SCORE = new BasicDBObject("$meta", "textScore");
 	static final ClassTypeInformation<?> NESTED_DOCUMENT = ClassTypeInformation.from(NestedDocument.class);
 
 	private enum MetaMapping {
-		FORCE, WHEN_PRESENT, IGNORE
+		FORCE, WHEN_PRESENT, IGNORE;
 	}
 
 	private final ConversionService conversionService;
@@ -94,7 +90,7 @@ public class QueryMapper {
 	}
 
 	/**
-	 * Replaces the property keys used in the given {@link Document} with the appropriate keys by using the
+	 * Replaces the property keys used in the given {@link DBObject} with the appropriate keys by using the
 	 * {@link PersistentEntity} metadata.
 	 * 
 	 * @param query must not be {@literal null}.
@@ -102,21 +98,21 @@ public class QueryMapper {
 	 * @return
 	 */
 	@SuppressWarnings("deprecation")
-	public Document getMappedObject(Bson query, MongoPersistentEntity<?> entity) {
+	public DBObject getMappedObject(DBObject query, MongoPersistentEntity<?> entity) {
 
 		if (isNestedKeyword(query)) {
 			return getMappedKeyword(new Keyword(query), entity);
 		}
 
-		Document result = new Document();
+		DBObject result = new BasicDBObject();
 
-		for (String key : BsonUtils.asMap(query).keySet()) {
+		for (String key : query.keySet()) {
 
 			// TODO: remove one once QueryMapper can work with Query instances directly
 			if (Query.isRestrictedTypeKey(key)) {
 
 				@SuppressWarnings("unchecked")
-				Set<Class<?>> restrictedTypes = (Set<Class<?>>) BsonUtils.get(query, key);
+				Set<Class<?>> restrictedTypes = (Set<Class<?>>) query.get(key);
 				this.converter.getTypeMapper().writeTypeRestrictions(result, restrictedTypes);
 
 				continue;
@@ -130,16 +126,16 @@ public class QueryMapper {
 			try {
 
 				Field field = createPropertyField(entity, key, mappingContext);
-				Entry<String, Object> entry = getMappedObjectForField(field, BsonUtils.get(query, key));
-
+				Entry<String, Object> entry = getMappedObjectForField(field, query.get(key));
 				result.put(entry.getKey(), entry.getValue());
 			} catch (InvalidPersistentPropertyPath invalidPathException) {
 
 				// in case the object has not already been mapped
-				if (!(BsonUtils.get(query, key) instanceof Document)) {
+				if (!(query.get(key) instanceof DBObject)) {
 					throw invalidPathException;
 				}
-				result.put(key, BsonUtils.get(query, key));
+
+				result.put(key, query.get(key));
 			}
 		}
 
@@ -155,13 +151,13 @@ public class QueryMapper {
 	 * @return
 	 * @since 1.6
 	 */
-	public Document getMappedSort(Document sortObject, MongoPersistentEntity<?> entity) {
+	public DBObject getMappedSort(DBObject sortObject, MongoPersistentEntity<?> entity) {
 
 		if (sortObject == null) {
 			return null;
 		}
 
-		Document mappedSort = getMappedObject(sortObject, entity);
+		DBObject mappedSort = getMappedObject(sortObject, entity);
 		mapMetaAttributes(mappedSort, entity, MetaMapping.WHEN_PRESENT);
 		return mappedSort;
 	}
@@ -175,14 +171,14 @@ public class QueryMapper {
 	 * @return
 	 * @since 1.6
 	 */
-	public Document getMappedFields(Document fieldsObject, MongoPersistentEntity<?> entity) {
+	public DBObject getMappedFields(DBObject fieldsObject, MongoPersistentEntity<?> entity) {
 
-		Document mappedFields = fieldsObject != null ? getMappedObject(fieldsObject, entity) : new Document();
+		DBObject mappedFields = fieldsObject != null ? getMappedObject(fieldsObject, entity) : new BasicDBObject();
 		mapMetaAttributes(mappedFields, entity, MetaMapping.FORCE);
 		return mappedFields.keySet().isEmpty() ? null : mappedFields;
 	}
 
-	private void mapMetaAttributes(Document source, MongoPersistentEntity<?> entity, MetaMapping metaMapping) {
+	private void mapMetaAttributes(DBObject source, MongoPersistentEntity<?> entity, MetaMapping metaMapping) {
 
 		if (entity == null || source == null) {
 			return;
@@ -191,14 +187,14 @@ public class QueryMapper {
 		if (entity.hasTextScoreProperty() && !MetaMapping.IGNORE.equals(metaMapping)) {
 			MongoPersistentProperty textScoreProperty = entity.getTextScoreProperty();
 			if (MetaMapping.FORCE.equals(metaMapping)
-					|| (MetaMapping.WHEN_PRESENT.equals(metaMapping) && source.containsKey(textScoreProperty.getFieldName()))) {
+					|| (MetaMapping.WHEN_PRESENT.equals(metaMapping) && source.containsField(textScoreProperty.getFieldName()))) {
 				source.putAll(getMappedTextScoreField(textScoreProperty));
 			}
 		}
 	}
 
-	private Document getMappedTextScoreField(MongoPersistentProperty property) {
-		return new Document(property.getFieldName(), META_TEXT_SCORE);
+	private DBObject getMappedTextScoreField(MongoPersistentProperty property) {
+		return new BasicDBObject(property.getFieldName(), META_TEXT_SCORE);
 	}
 
 	/**
@@ -214,7 +210,7 @@ public class QueryMapper {
 		Object value;
 
 		if (isNestedKeyword(rawValue) && !field.isIdField()) {
-			Keyword keyword = new Keyword((Document) rawValue);
+			Keyword keyword = new Keyword((DBObject) rawValue);
 			value = getMappedKeyword(field, keyword);
 		} else {
 			value = getMappedValue(field, rawValue);
@@ -235,33 +231,33 @@ public class QueryMapper {
 	}
 
 	/**
-	 * Returns the given {@link Document} representing a keyword by mapping the keyword's value.
+	 * Returns the given {@link DBObject} representing a keyword by mapping the keyword's value.
 	 * 
-	 * @param keyword the {@link Document} representing a keyword (e.g. {@code $ne : … } )
+	 * @param keyword the {@link DBObject} representing a keyword (e.g. {@code $ne : … } )
 	 * @param entity
 	 * @return
 	 */
-	protected Document getMappedKeyword(Keyword keyword, MongoPersistentEntity<?> entity) {
+	protected DBObject getMappedKeyword(Keyword keyword, MongoPersistentEntity<?> entity) {
 
 		// $or/$nor
 		if (keyword.isOrOrNor() || (keyword.hasIterableValue() && !keyword.isGeometry())) {
 
 			Iterable<?> conditions = keyword.getValue();
-			List<Object> newConditions = new ArrayList<Object>();
+			BasicDBList newConditions = new BasicDBList();
 
 			for (Object condition : conditions) {
-				newConditions.add(isDocument(condition) ? getMappedObject((Document) condition, entity)
-						: convertSimpleOrDocument(condition, entity));
+				newConditions.add(isDBObject(condition) ? getMappedObject((DBObject) condition, entity)
+						: convertSimpleOrDBObject(condition, entity));
 			}
 
-			return new Document(keyword.getKey(), newConditions);
+			return new BasicDBObject(keyword.getKey(), newConditions);
 		}
 
 		if (keyword.isSample()) {
 			return exampleMapper.getMappedExample(keyword.<Example<?>> getValue(), entity);
 		}
 
-		return new Document(keyword.getKey(), convertSimpleOrDocument(keyword.getValue(), entity));
+		return new BasicDBObject(keyword.getKey(), convertSimpleOrDBObject(keyword.getValue(), entity));
 	}
 
 	/**
@@ -271,7 +267,7 @@ public class QueryMapper {
 	 * @param keyword
 	 * @return
 	 */
-	protected Document getMappedKeyword(Field property, Keyword keyword) {
+	protected DBObject getMappedKeyword(Field property, Keyword keyword) {
 
 		boolean needsAssociationConversion = property.isAssociation() && !keyword.isExists();
 		Object value = keyword.getValue();
@@ -279,7 +275,7 @@ public class QueryMapper {
 		Object convertedValue = needsAssociationConversion ? convertAssociation(value, property)
 				: getMappedValue(property.with(keyword.getKey()), value);
 
-		return new Document(keyword.key, convertedValue);
+		return new BasicDBObject(keyword.key, convertedValue);
 	}
 
 	/**
@@ -291,14 +287,13 @@ public class QueryMapper {
 	 * @param newKey the key the value will be bound to eventually
 	 * @return
 	 */
-	@SuppressWarnings("unchecked")
 	protected Object getMappedValue(Field documentField, Object value) {
 
 		if (documentField.isIdField()) {
 
 			if (isDBObject(value)) {
 				DBObject valueDbo = (DBObject) value;
-				Document resultDbo = new Document(valueDbo.toMap());
+				DBObject resultDbo = new BasicDBObject(valueDbo.toMap());
 
 				if (valueDbo.containsField("$in") || valueDbo.containsField("$nin")) {
 					String inKey = valueDbo.containsField("$in") ? "$in" : "$nin";
@@ -306,31 +301,13 @@ public class QueryMapper {
 					for (Object id : (Iterable<?>) valueDbo.get(inKey)) {
 						ids.add(convertId(id));
 					}
-					resultDbo.put(inKey, ids);
+					resultDbo.put(inKey, ids.toArray(new Object[ids.size()]));
 				} else if (valueDbo.containsField("$ne")) {
 					resultDbo.put("$ne", convertId(valueDbo.get("$ne")));
 				} else {
 					return getMappedObject(resultDbo, null);
 				}
-				return resultDbo;
-			}
 
-			else if (isDocument(value)) {
-				Document valueDbo = (Document) value;
-				Document resultDbo = new Document(valueDbo);
-
-				if (valueDbo.containsKey("$in") || valueDbo.containsKey("$nin")) {
-					String inKey = valueDbo.containsKey("$in") ? "$in" : "$nin";
-					List<Object> ids = new ArrayList<Object>();
-					for (Object id : (Iterable<?>) valueDbo.get(inKey)) {
-						ids.add(convertId(id));
-					}
-					resultDbo.put(inKey, ids);
-				} else if (valueDbo.containsKey("$ne")) {
-					resultDbo.put("$ne", convertId(valueDbo.get("$ne")));
-				} else {
-					return getMappedObject(resultDbo, null);
-				}
 				return resultDbo;
 
 			} else {
@@ -339,14 +316,14 @@ public class QueryMapper {
 		}
 
 		if (isNestedKeyword(value)) {
-			return getMappedKeyword(new Keyword((Bson) value), documentField.getPropertyEntity());
+			return getMappedKeyword(new Keyword((DBObject) value), null);
 		}
 
 		if (isAssociationConversionNecessary(documentField, value)) {
 			return convertAssociation(value, documentField);
 		}
 
-		return convertSimpleOrDocument(value, documentField.getPropertyEntity());
+		return convertSimpleOrDBObject(value, documentField.getPropertyEntity());
 	}
 
 	/**
@@ -384,28 +361,20 @@ public class QueryMapper {
 	}
 
 	/**
-	 * Retriggers mapping if the given source is a {@link Document} or simply invokes the
+	 * Retriggers mapping if the given source is a {@link DBObject} or simply invokes the
 	 * 
 	 * @param source
 	 * @param entity
 	 * @return
 	 */
-	protected Object convertSimpleOrDocument(Object source, MongoPersistentEntity<?> entity) {
-
-		if (source instanceof List) {
-			return delegateConvertToMongoType(source, entity);
-		}
-
-		if (isDocument(source)) {
-			return getMappedObject((Document) source, entity);
-		}
+	protected Object convertSimpleOrDBObject(Object source, MongoPersistentEntity<?> entity) {
 
 		if (source instanceof BasicDBList) {
 			return delegateConvertToMongoType(source, entity);
 		}
 
 		if (isDBObject(source)) {
-			return getMappedObject((BasicDBObject) source, entity);
+			return getMappedObject((DBObject) source, entity);
 		}
 
 		return delegateConvertToMongoType(source, entity);
@@ -436,7 +405,7 @@ public class QueryMapper {
 	 */
 	protected Object convertAssociation(Object source, MongoPersistentProperty property) {
 
-		if (property == null || source == null || source instanceof Document || source instanceof DBObject) {
+		if (property == null || source == null || source instanceof DBObject) {
 			return source;
 		}
 
@@ -455,8 +424,8 @@ public class QueryMapper {
 		}
 
 		if (property.isMap()) {
-			Document result = new Document();
-			Document dbObject = (Document) source;
+			BasicDBObject result = new BasicDBObject();
+			DBObject dbObject = (DBObject) source;
 			for (String key : dbObject.keySet()) {
 				result.put(key, createDbRefFor(dbObject.get(key), property));
 			}
@@ -466,19 +435,9 @@ public class QueryMapper {
 		return createDbRefFor(source, property);
 	}
 
-	/**
-	 * Checks whether the given value is a {@link Document}.
-	 * 
-	 * @param value can be {@literal null}.
-	 * @return
-	 */
-	protected final boolean isDocument(Object value) {
-		return value instanceof Document;
-	}
-
 	/**
 	 * Checks whether the given value is a {@link DBObject}.
-	 *
+	 * 
 	 * @param value can be {@literal null}.
 	 * @return
 	 */
@@ -544,18 +503,19 @@ public class QueryMapper {
 	}
 
 	/**
-	 * Returns whether the given {@link Object} is a keyword, i.e. if it's a {@link Document} with a keyword key.
+	 * Returns whether the given {@link Object} is a keyword, i.e. if it's a {@link DBObject} with a keyword key.
 	 * 
 	 * @param candidate
 	 * @return
 	 */
 	protected boolean isNestedKeyword(Object candidate) {
 
-		if (!(candidate instanceof Document)) {
+		if (!(candidate instanceof BasicDBObject)) {
 			return false;
 		}
 
-		Set<String> keys = BsonUtils.asMap((Bson) candidate).keySet();
+		BasicDBObject dbObject = (BasicDBObject) candidate;
+		Set<String> keys = dbObject.keySet();
 
 		if (keys.size() != 1) {
 			return false;
@@ -587,18 +547,18 @@ public class QueryMapper {
 		private final String key;
 		private final Object value;
 
-		public Keyword(Bson source, String key) {
+		public Keyword(DBObject source, String key) {
 			this.key = key;
-			this.value = BsonUtils.get(source, key);
+			this.value = source.get(key);
 		}
 
-		public Keyword(Bson bson) {
+		public Keyword(DBObject dbObject) {
 
-			Set<String> keys = BsonUtils.asMap(bson).keySet();
-			Assert.isTrue(keys.size() == 1, "Can only use a single value Document!");
+			Set<String> keys = dbObject.keySet();
+			Assert.isTrue(keys.size() == 1, "Can only use a single value DBObject!");
 
 			this.key = keys.iterator().next();
-			this.value = BsonUtils.get(bson, key);
+			this.value = dbObject.get(key);
 		}
 
 		/**

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 the original author or authors.
+ * Copyright 2015 the original author 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,12 @@ import static org.springframework.util.ReflectionUtils.*;
 
 import java.lang.reflect.Method;
 
-import org.bson.Document;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.util.Assert;
 
 import com.mongodb.DBCollection;
+import com.mongodb.DBObject;
 import com.mongodb.DBRef;
-import com.mongodb.client.model.Filters;
 
 /**
  * {@link ReflectiveDBRefResolver} provides reflective access to {@link DBRef} API that is not consistently available
@@ -52,18 +51,16 @@ class ReflectiveDBRefResolver {
 	 * @param ref must not be {@literal null}.
 	 * @return the document that this references.
 	 */
-	public static Document fetch(MongoDbFactory factory, DBRef ref) {
+	public static DBObject fetch(MongoDbFactory factory, DBRef ref) {
 
 		Assert.notNull(ref, "DBRef to fetch must not be null!");
 
 		if (isMongo3Driver()) {
 
 			Assert.notNull(factory, "DbFactory to fetch DB from must not be null!");
-
-			return factory.getDb().getCollection(ref.getCollectionName(), Document.class).find(Filters.eq("_id", ref.getId()))
-					.first();
+			return factory.getDb().getCollection(ref.getCollectionName()).findOne(ref.getId());
 		}
 
-		return (Document) invokeMethod(FETCH_METHOD, ref);
+		return (DBObject) invokeMethod(FETCH_METHOD, ref);
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2015 the original author 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,8 +17,6 @@ package org.springframework.data.mongodb.core.convert;
 
 import java.util.Map.Entry;
 
-import org.bson.Document;
-import org.bson.conversions.Bson;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.mapping.Association;
 import org.springframework.data.mapping.context.MappingContext;
@@ -30,13 +28,15 @@ import org.springframework.data.mongodb.core.query.Update.Modifiers;
 import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.TypeInformation;
 
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
 /**
  * A subclass of {@link QueryMapper} that retains type information on the mongo types.
  * 
  * @author Thomas Darimont
  * @author Oliver Gierke
  * @author Christoph Strobl
- * @author Mark Paluch
  */
 public class UpdateMapper extends QueryMapper {
 
@@ -53,70 +53,6 @@ public class UpdateMapper extends QueryMapper {
 		this.converter = converter;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.QueryMapper#getMappedObject(Bson, MongoPersistentEntity)
-	 */
-	@Override
-	public Document getMappedObject(Bson query, MongoPersistentEntity<?> entity) {
-
-		Document document = super.getMappedObject(query, entity);
-
-		boolean hasOperators = false;
-		boolean hasFields = false;
-
-		Document set = null;
-		for (String s : document.keySet()) {
-			if (s.startsWith("$")) {
-
-				if(s.equals("$set")){
-					set = document.get(s, Document.class);
-				}
-				hasOperators = true;
-			} else {
-				hasFields = true;
-			}
-		}
-
-		if (hasOperators && hasFields) {
-
-			Document updateObject = new Document();
-			Document fieldsToSet = set == null ? new Document() : set;
-
-			for (String s : document.keySet()) {
-				if (s.startsWith("$")) {
-					updateObject.put(s, document.get(s));
-				} else {
-					fieldsToSet.put(s, document.get(s));
-				}
-			}
-			updateObject.put("$set", fieldsToSet);
-
-			return updateObject;
-		}
-		return document;
-	}
-
-	/**
-	 * Returns {@literal true} if the given {@link Document} is an update object that uses update operators.
-	 * @param updateObj
-	 * @return {@literal true} if the given {@link Document} is an update object.
-	 */
-	public static boolean isUpdateObject(Document updateObj) {
-
-		if (updateObj == null) {
-			return false;
-		}
-
-		for (String s : updateObj.keySet()) {
-			if (s.startsWith("$")) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
 	/**
 	 * Converts the given source object to a mongo type retaining the original type information of the source type on the
 	 * mongo type.
@@ -137,8 +73,8 @@ public class UpdateMapper extends QueryMapper {
 	@Override
 	protected Entry<String, Object> getMappedObjectForField(Field field, Object rawValue) {
 
-		if (isDocument(rawValue)) {
-			return createMapEntry(field, convertSimpleOrDocument(rawValue, field.getPropertyEntity()));
+		if (isDBObject(rawValue)) {
+			return createMapEntry(field, convertSimpleOrDBObject(rawValue, field.getPropertyEntity()));
 		}
 
 		if (isQuery(rawValue)) {
@@ -162,10 +98,10 @@ public class UpdateMapper extends QueryMapper {
 
 		} else if (rawValue instanceof Modifiers) {
 
-			Document modificationOperations = new Document();
+			DBObject modificationOperations = new BasicDBObject();
 
 			for (Modifier modifier : ((Modifiers) rawValue).getModifiers()) {
-				modificationOperations.putAll(getMappedValue(field, modifier));
+				modificationOperations.putAll(getMappedValue(field, modifier).toMap());
 			}
 
 			value = modificationOperations;
@@ -193,12 +129,12 @@ public class UpdateMapper extends QueryMapper {
 		return value instanceof Query;
 	}
 
-	private Document getMappedValue(Field field, Modifier modifier) {
+	private DBObject getMappedValue(Field field, Modifier modifier) {
 
 		TypeInformation<?> typeHint = field == null ? ClassTypeInformation.OBJECT : field.getTypeHint();
 
 		Object value = converter.convertToMongoType(modifier.getValue(), typeHint);
-		return new Document(modifier.getKey(), value);
+		return new BasicDBObject(modifier.getKey(), value);
 	}
 
 	private TypeInformation<?> getTypeHintForEntity(Object source, MongoPersistentEntity<?> entity) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * 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.
@@ -15,28 +15,28 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
-import org.bson.Document;
-import org.bson.conversions.Bson;
 import org.springframework.data.mapping.model.SpELExpressionEvaluator;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 
+import com.mongodb.DBObject;
+
 /**
  * Internal API to trigger the resolution of properties.
  * 
  * @author Oliver Gierke
- * @author Christoph Strobl
  */
 interface ValueResolver {
 
 	/**
-	 * Resolves the value for the given {@link MongoPersistentProperty} within the given {@link Document} using the given
+	 * Resolves the value for the given {@link MongoPersistentProperty} within the given {@link DBObject} using the given
 	 * {@link SpELExpressionEvaluator} and {@link ObjectPath}.
 	 * 
 	 * @param prop
-	 * @param bson
+	 * @param dbo
 	 * @param evaluator
 	 * @param parent
 	 * @return
 	 */
-	Object getValueInternal(MongoPersistentProperty prop, Bson bson, SpELExpressionEvaluator evaluator, ObjectPath parent);
+	Object getValueInternal(MongoPersistentProperty prop, DBObject dbo, SpELExpressionEvaluator evaluator,
+			ObjectPath parent);
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 the original author or authors.
+ * Copyright 2015 the original author 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,17 +18,15 @@ package org.springframework.data.mongodb.core.geo;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 
 import org.springframework.data.geo.Point;
 import org.springframework.data.geo.Polygon;
-import org.springframework.util.Assert;
 
 /**
  * {@link GeoJson} representation of {@link Polygon}. Unlike {@link Polygon} the {@link GeoJsonPolygon} requires a
  * closed border. Which means that the first and last {@link Point} have to have same coordinate pairs.
- *
+ * 
  * @author Christoph Strobl
  * @since 1.7
  * @see http://geojson.org/geojson-spec.html#polygon
@@ -42,7 +40,7 @@ public class GeoJsonPolygon extends Polygon implements GeoJson<List<GeoJsonLineS
 
 	/**
 	 * Creates new {@link GeoJsonPolygon} from the given {@link Point}s.
-	 *
+	 * 
 	 * @param first must not be {@literal null}.
 	 * @param second must not be {@literal null}.
 	 * @param third must not be {@literal null}.
@@ -55,7 +53,7 @@ public class GeoJsonPolygon extends Polygon implements GeoJson<List<GeoJsonLineS
 
 	/**
 	 * Creates new {@link GeoJsonPolygon} from the given {@link Point}s.
-	 *
+	 * 
 	 * @param points must not be {@literal null}.
 	 */
 	public GeoJsonPolygon(List<Point> points) {
@@ -64,53 +62,6 @@ public class GeoJsonPolygon extends Polygon implements GeoJson<List<GeoJsonLineS
 		this.coordinates.add(new GeoJsonLineString(points));
 	}
 
-	/**
-	 * Creates a new {@link GeoJsonPolygon} with an inner ring defined be the given {@link Point}s.
-	 *
-	 * @param first must not be {@literal null}.
-	 * @param second must not be {@literal null}.
-	 * @param third must not be {@literal null}.
-	 * @param fourth must not be {@literal null}.
-	 * @param others can be {@literal null}.
-	 * @return new {@link GeoJsonPolygon}.
-	 * @since 1.10
-	 */
-	public GeoJsonPolygon withInnerRing(Point first, Point second, Point third, Point fourth, final Point... others) {
-		return withInnerRing(asList(first, second, third, fourth, others));
-	}
-
-	/**
-	 * Creates a new {@link GeoJsonPolygon} with an inner ring defined be the given {@link List} of {@link Point}s.
-	 *
-	 * @param points must not be {@literal null}.
-	 * @return new {@link GeoJsonPolygon}.
-	 */
-	public GeoJsonPolygon withInnerRing(List<Point> points) {
-		return withInnerRing(new GeoJsonLineString(points));
-	}
-
-	/**
-	 * Creates a new {@link GeoJsonPolygon} with an inner ring defined be the given {@link GeoJsonLineString}.
-	 *
-	 * @param lineString must not be {@literal null}.
-	 * @return new {@link GeoJsonPolygon}.
-	 * @since 1.10
-	 */
-	public GeoJsonPolygon withInnerRing(GeoJsonLineString lineString) {
-
-		Assert.notNull(lineString, "LineString must not be null!");
-
-		Iterator<GeoJsonLineString> it = this.coordinates.iterator();
-		GeoJsonPolygon polygon = new GeoJsonPolygon(it.next().getCoordinates());
-
-		while (it.hasNext()) {
-			polygon.coordinates.add(it.next());
-		}
-
-		polygon.coordinates.add(lineString);
-		return polygon;
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.geo.GeoJson#getType()