DATAMONGO-2204 - Release version 2.1.6 (Lovelace SR6).

Ensure to have to DbRefResolver operate within the session while reusing the MappingContext.

Original Pull Request: #734

.mvn/wrapper/MavenWrapperDownloader.java

@@ -1,110 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you 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
-
-  https://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.
-*/
-
-import java.net.*;
-import java.io.*;
-import java.nio.channels.*;
-import java.util.Properties;
-
-public class MavenWrapperDownloader {
-
-    /**
-     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
-     */
-    private static final String DEFAULT_DOWNLOAD_URL =
-            "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar";
-
-    /**
-     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
-     * use instead of the default one.
-     */
-    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
-            ".mvn/wrapper/maven-wrapper.properties";
-
-    /**
-     * Path where the maven-wrapper.jar will be saved to.
-     */
-    private static final String MAVEN_WRAPPER_JAR_PATH =
-            ".mvn/wrapper/maven-wrapper.jar";
-
-    /**
-     * Name of the property which should be used to override the default download url for the wrapper.
-     */
-    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
-
-    public static void main(String args[]) {
-        System.out.println("- Downloader started");
-        File baseDirectory = new File(args[0]);
-        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
-
-        // If the maven-wrapper.properties exists, read it and check if it contains a custom
-        // wrapperUrl parameter.
-        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
-        String url = DEFAULT_DOWNLOAD_URL;
-        if(mavenWrapperPropertyFile.exists()) {
-            FileInputStream mavenWrapperPropertyFileInputStream = null;
-            try {
-                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
-                Properties mavenWrapperProperties = new Properties();
-                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
-                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
-            } catch (IOException e) {
-                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
-            } finally {
-                try {
-                    if(mavenWrapperPropertyFileInputStream != null) {
-                        mavenWrapperPropertyFileInputStream.close();
-                    }
-                } catch (IOException e) {
-                    // Ignore ...
-                }
-            }
-        }
-        System.out.println("- Downloading from: : " + url);
-
-        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
-        if(!outputFile.getParentFile().exists()) {
-            if(!outputFile.getParentFile().mkdirs()) {
-                System.out.println(
-                        "- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'");
-            }
-        }
-        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
-        try {
-            downloadFileFromURL(url, outputFile);
-            System.out.println("Done");
-            System.exit(0);
-        } catch (Throwable e) {
-            System.out.println("- Error downloading");
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-
-    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
-        URL website = new URL(urlString);
-        ReadableByteChannel rbc;
-        rbc = Channels.newChannel(website.openStream());
-        FileOutputStream fos = new FileOutputStream(destination);
-        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
-        fos.close();
-        rbc.close();
-    }
-
-}

.mvn/wrapper/maven-wrapper.properties

@@ -1 +0,0 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip

.travis.yml

@@ -16,12 +16,9 @@ before_install:
 
 env:
   matrix:
-    - MONGO_VERSION=4.1.10
-    - MONGO_VERSION=4.0.4
-    - MONGO_VERSION=3.6.12
-    - MONGO_VERSION=3.4.20
-  global:
     - PROFILE=ci
+  global:
+    - MONGO_VERSION=4.0.0
 
 addons:
   apt:

CODE_OF_CONDUCT.adoc

@@ -24,4 +24,4 @@ Instances of abusive, harassing, or otherwise unacceptable behavior may be repor
 All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances.
 Maintainers are obligated to maintain confidentiality with regard to the reporter of an incident.
 
-This Code of Conduct is adapted from the https://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at https://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/].
+This Code of Conduct is adapted from the http://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at http://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/].

Jenkinsfile

@@ -1,144 +0,0 @@
-pipeline {
-    agent none
-
-    triggers {
-        pollSCM 'H/10 * * * *'
-        upstream(upstreamProjects: "spring-data-commons/master", threshold: hudson.model.Result.SUCCESS)
-    }
-
-    options {
-        disableConcurrentBuilds()
-    }
-
-    stages {
-        stage("Docker images") {
-            parallel {
-                stage('Publish JDK 8 + MongoDB 4.0') {
-                    when {
-                        changeset "ci/openjdk8-mongodb-4.0/**"
-                    }
-                    agent any
-
-                    steps {
-                        script {
-                            def image = docker.build("springci/spring-data-openjdk8-with-mongodb-4.0", "ci/openjdk8-mongodb-4.0/")
-                            docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-                                image.push()
-                            }
-                        }
-                    }
-                }
-                stage('Publish JDK 8 + MongoDB 4.1') {
-                    when {
-                        changeset "ci/openjdk8-mongodb-4.1/**"
-                    }
-                    agent any
-
-                    steps {
-                        script {
-                            def image = docker.build("springci/spring-data-openjdk8-with-mongodb-4.1", "ci/openjdk8-mongodb-4.1/")
-                            docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-                                image.push()
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        stage("test: baseline") {
-            agent {
-                docker {
-                    image 'springci/spring-data-openjdk8-with-mongodb-4.0:latest'
-                    args '-v $HOME/.m2:/root/.m2'
-                }
-            }
-            steps {
-                sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
-                sh 'mongod --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
-                sh 'sleep 10'
-                sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
-                sh 'sleep 15'
-                sh './mvnw clean dependency:list test -Dsort -B'
-            }
-        }
-
-        stage("Test other configurations") {
-            parallel {
-                stage("test: mongodb 4.1") {
-                    agent {
-                        docker {
-                            label 'data'
-                            image 'springci/spring-data-openjdk8-with-mongodb-4.1:latest'
-                            args '-v $HOME/.m2:/root/.m2'
-                        }
-                    }
-                    steps {
-                        sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
-                        sh 'mongod --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
-                        sh 'sleep 10'
-                        sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
-                        sh 'sleep 15'
-                        sh './mvnw clean dependency:list test -Dsort -B'
-                    }
-                }
-            }
-        }
-
-        stage('Release to artifactory') {
-            when {
-                branch 'issue/*'
-            }
-            agent {
-                docker {
-                    image 'adoptopenjdk/openjdk8:latest'
-                    args '-v $HOME/.m2:/root/.m2'
-                }
-            }
-
-            environment {
-                ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
-            }
-
-            steps {
-                sh "./mvnw -Pci,snapshot -Dmaven.test.skip=true clean deploy -B"
-            }
-        }
-
-        stage('Release to artifactory with docs') {
-            when {
-                branch 'master'
-            }
-            agent {
-                docker {
-                    image 'adoptopenjdk/openjdk8:latest'
-                    args '-v $HOME/.m2:/root/.m2'
-                }
-            }
-
-            environment {
-                ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
-            }
-
-            steps {
-                sh "./mvnw -Pci,snapshot -Dmaven.test.skip=true clean deploy -B"
-            }
-        }
-    }
-
-    post {
-        changed {
-            script {
-                slackSend(
-                        color: (currentBuild.currentResult == 'SUCCESS') ? 'good' : 'danger',
-                        channel: '#spring-data-dev',
-                        message: "${currentBuild.fullDisplayName} - `${currentBuild.currentResult}`\n${env.BUILD_URL}")
-                emailext(
-                        subject: "[${currentBuild.fullDisplayName}] ${currentBuild.currentResult}",
-                        mimeType: 'text/html',
-                        recipientProviders: [[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']],
-                        body: "<a href=\"${env.BUILD_URL}\">${currentBuild.fullDisplayName} is reported as ${currentBuild.currentResult}</a>")
-            }
-        }
-    }
-}

README.adoc

@@ -1,234 +0,0 @@
-image:https://spring.io/badges/spring-data-mongodb/ga.svg[Spring Data MongoDB,link=https://projects.spring.io/spring-data-mongodb#quick-start]
-image:https://spring.io/badges/spring-data-mongodb/snapshot.svg[Spring Data MongoDB,link=https://projects.spring.io/spring-data-mongodb#quick-start]
-
-image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-mongodb%2Fmaster&subject=Moore%20(master)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-mongodb/]
-image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-mongodb%2F2.1.x&subject=Lovelace%20(2.1.x)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-mongodb/]
-image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-mongodb%2F1.10.x&subject=Ingalls%20(1.10.x)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-mongodb/]
-
-= Spring Data MongoDB
-
-The primary goal of the https://projects.spring.io/spring-data[Spring Data] project is to make it easier to build Spring-powered applications that use new data access technologies such as non-relational databases, map-reduce frameworks, and cloud based data services.
-
-The Spring Data MongoDB project aims to provide a familiar and consistent Spring-based programming model for new datastores while retaining store-specific features and capabilities. The Spring Data MongoDB project provides integration with the MongoDB document database. Key functional areas of Spring Data MongoDB are a POJO centric model for interacting with a MongoDB DBCollection and easily writing a repository style data access layer.
-
-== Getting Help
-
-For a comprehensive treatment of all the Spring Data MongoDB features, please refer to:
-
-* the https://docs.spring.io/spring-data/mongodb/docs/current/reference/html/[User Guide]
-* the https://docs.spring.io/spring-data/mongodb/docs/current/api/[JavaDocs] have extensive comments in them as well.
-* the home page of https://projects.spring.io/spring-data-mongodb[Spring Data MongoDB] contains links to articles and other resources.
-* for more detailed questions, use https://stackoverflow.com/questions/tagged/spring-data-mongodb[Spring Data Mongodb on Stackoverflow].
-
-If you are new to Spring as well as to Spring Data, look for information about https://projects.spring.io/[Spring projects].
-
-== Quick Start
-
-=== Maven configuration
-
-Add the Maven dependency:
-
-[source,xml]
-----
-<dependency>
-  <groupId>org.springframework.data</groupId>
-  <artifactId>spring-data-mongodb</artifactId>
-  <version>${version}.RELEASE</version>
-</dependency>
-----
-
-If you'd rather like the latest snapshots of the upcoming major version, use our Maven snapshot repository and declare the appropriate dependency version.
-
-[source,xml]
-----
-<dependency>
-  <groupId>org.springframework.data</groupId>
-  <artifactId>spring-data-mongodb</artifactId>
-  <version>${version}.BUILD-SNAPSHOT</version>
-</dependency>
-
-<repository>
-  <id>spring-libs-snapshot</id>
-  <name>Spring Snapshot Repository</name>
-  <url>https://repo.spring.io/libs-snapshot</url>
-</repository>
-----
-
-=== MongoTemplate
-
-MongoTemplate is the central support class for Mongo database operations. It provides:
-
-* Basic POJO mapping support to and from BSON
-* Convenience methods to interact with the store (insert object, update objects) and MongoDB specific ones (geo-spatial operations, upserts, map-reduce etc.)
-* Connection affinity callback
-* Exception translation into Spring's https://docs.spring.io/spring/docs/current/spring-framework-reference/html/dao.html#dao-exceptions[technology agnostic DAO exception hierarchy].
-
-=== Spring Data repositories
-
-To simplify the creation of data repositories Spring Data MongoDB provides a generic repository programming model. It will automatically create a repository proxy for you that adds implementations of finder methods you specify on an interface. 
-
-For example, given a `Person` class with first and last name properties, a `PersonRepository` interface that can query for `Person` by last name and when the first name matches a like expression is shown below:
-
-[source,java]
-----
-public interface PersonRepository extends CrudRepository<Person, Long> {
-
-  List<Person> findByLastname(String lastname);
-
-  List<Person> findByFirstnameLike(String firstname);
-}
-----
-
-The queries issued on execution will be derived from the method name. Extending `CrudRepository` causes CRUD methods being pulled into the interface so that you can easily save and find single entities and collections of them.
-
-You can have Spring automatically create a proxy for the interface by using the following JavaConfig:
-
-[source,java]
-----
-@Configuration
-@EnableMongoRepositories
-class ApplicationConfig extends AbstractMongoConfiguration {
-
-  @Override
-  public MongoClient mongoClient() throws Exception {
-    return new MongoClient();
-  }
-
-  @Override
-  protected String getDatabaseName() {
-    return "springdata";
-  }
-}
-----
-
-This sets up a connection to a local MongoDB instance and enables the detection of Spring Data repositories (through `@EnableMongoRepositories`). The same configuration would look like this in XML:
-
-[source,xml]
-----
-<bean id="template" class="org.springframework.data.mongodb.core.MongoTemplate">
-  <constructor-arg>
-    <bean class="com.mongodb.MongoClient">
-       <constructor-arg value="localhost" />
-       <constructor-arg value="27017" />
-    </bean>
-  </constructor-arg>
-  <constructor-arg value="database" />
-</bean>
-
-<mongo:repositories base-package="com.acme.repository" />
-----
-
-This will find the repository interface and register a proxy object in the container. You can use it as shown below:
-
-[source,java]
-----
-@Service
-public class MyService {
-
-  private final PersonRepository repository;
-
-  @Autowired
-  public MyService(PersonRepository repository) {
-    this.repository = repository;
-  }
-
-  public void doWork() {
-
-     repository.deleteAll();
-
-     Person person = new Person();
-     person.setFirstname("Oliver");
-     person.setLastname("Gierke");
-     person = repository.save(person);
-
-     List<Person> lastNameResults = repository.findByLastname("Gierke");
-     List<Person> firstNameResults = repository.findByFirstnameLike("Oli*");
- }
-}
-----
-
-=== MongoDB 4.0 Transactions
-
-As of version 4 MongoDB supports https://www.mongodb.com/transactions[Transactions]. Transactions are built on top of
- `ClientSessions` and therefore require an active session.
-
-`MongoTransactionManager` is the gateway to the well known Spring transaction support. It allows applications to use
-https://docs.spring.io/spring/docs/current/spring-framework-reference/html/transaction.html[managed transaction features of Spring].
-The `MongoTransactionManager` binds a `ClientSession` to the thread. `MongoTemplate` automatically detects those and operates on them accordingly.
-
-[source,java]
-----
-@Configuration
-static class Config extends AbstractMongoConfiguration {
-
-	@Bean
-	MongoTransactionManager transactionManager(MongoDbFactory dbFactory) {
-		return new MongoTransactionManager(dbFactory);
-	}
-
-	// ...
-}
-
-@Component
-public class StateService {
-
-	@Transactional
-	void someBusinessFunction(Step step) {
-
-		template.insert(step);
-
-		process(step);
-
-		template.update(Step.class).apply(Update.set("state", // ...
-	};
-});
-----
-
-== Contributing to Spring Data
-
-Here are some ways for you to get involved in the community:
-
-* Get involved with the Spring community on Stackoverflow and help out on the https://stackoverflow.com/questions/tagged/spring-data-mongodb[spring-data-mongodb] tag by responding to questions and joining the debate.
-* Create https://jira.spring.io/browse/DATAMONGO[JIRA] tickets for bugs and new features and comment and vote on the ones that you are interested in.
-* Github is for social coding: if you want to write code, we encourage contributions through pull requests from https://help.github.com/forking/[forks of this repository]. If you want to contribute code this way, please reference a JIRA ticket as well covering the specific issue you are addressing.
-* Watch for upcoming articles on Spring by https://spring.io/blog[subscribing] to spring.io.
-
-Before we accept a non-trivial patch or pull request we will need you to https://cla.pivotal.io/sign/spring[sign the Contributor License Agreement]. Signing the contributor’s agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do. If you forget to do so, you'll be reminded when you submit a pull request. Active contributors might be asked to join the core team, and given the ability to merge pull requests.
-
-== Running CI tasks locally
-
-Since this pipeline is purely Docker-based, it's easy to:
-
-* Debug what went wrong on your local machine.
-* Test out a a tweak to your test routine before sending it out.
-* Experiment against a new image before submitting your pull request.
-
-All of these use cases are great reasons to essentially run what the CI server does on your local machine.
-
-IMPORTANT: To do this you must have Docker installed on your machine.
-
-1. `docker run -it --mount type=bind,source="$(pwd)",target=/spring-data-mongodb-github springci/spring-data-openjdk8-with-mongodb-4.0:latest /bin/bash`
-+
-This will launch the Docker image and mount your source code at `spring-data-mongodb-github`.
-+
-2. `cd spring-data-mongodb-github`
-+
-Next, run the tests from inside the container:
-+
-3. `./mvnw clean dependency:list test -Dsort -Dbundlor.enabled=false -B` (or with whatever profile you need to test out)
-
-Since the container is binding to your source, you can make edits from your IDE and continue to run build jobs.
-
-If you need to package things up, do this:
-
-1. `docker run -it --mount type=bind,source="$(pwd)",target=/spring-data-mongodb-github springci/spring-data-openjdk8-with-mongodb-4.0:latest /bin/bash`
-+
-This will launch the Docker image and mount your source code at `spring-data-mongodb-github`.
-+
-2. `cd spring-data-mongodb-github`
-+
-Next, package things from inside the container doing this:
-+
-3. `./mvnw clean dependency:list package -Dsort -Dbundlor.enabled=false -B`
-
-NOTE: Docker containers can eat up disk space fast! From time to time, run `docker system prune` to clean out old images.

README.md

@@ -0,0 +1,186 @@
+[![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.
+
+The Spring Data MongoDB project aims to provide a familiar and consistent Spring-based programming model for new datastores while retaining store-specific features and capabilities. The Spring Data MongoDB project provides integration with the MongoDB document database. Key functional areas of Spring Data MongoDB are a POJO centric model for interacting with a MongoDB DBCollection and easily writing a repository style data access layer.
+
+## Getting Help
+
+For a comprehensive treatment of all the Spring Data MongoDB features, please refer to:
+
+* the [User Guide](http://docs.spring.io/spring-data/mongodb/docs/current/reference/html/)
+* the [JavaDocs](http://docs.spring.io/spring-data/mongodb/docs/current/api/) have extensive comments in them as well.
+* the home page of [Spring Data MongoDB](http://projects.spring.io/spring-data-mongodb) contains links to articles and other resources.
+* for more detailed questions, use [Spring Data Mongodb on Stackoverflow](http://stackoverflow.com/questions/tagged/spring-data-mongodb).
+
+If you are new to Spring as well as to Spring Data, look for information about [Spring projects](http://projects.spring.io/).
+
+
+## Quick Start
+
+### Maven configuration
+
+Add the Maven dependency:
+
+```xml
+<dependency>
+  <groupId>org.springframework.data</groupId>
+  <artifactId>spring-data-mongodb</artifactId>
+  <version>${version}.RELEASE</version>
+</dependency>
+```
+
+If you'd rather like the latest snapshots of the upcoming major version, use our Maven snapshot repository and declare the appropriate dependency version.
+
+```xml
+<dependency>
+  <groupId>org.springframework.data</groupId>
+  <artifactId>spring-data-mongodb</artifactId>
+  <version>${version}.BUILD-SNAPSHOT</version>
+</dependency>
+
+<repository>
+  <id>spring-libs-snapshot</id>
+  <name>Spring Snapshot Repository</name>
+  <url>http://repo.spring.io/libs-snapshot</url>
+</repository>
+```
+
+### MongoTemplate
+
+MongoTemplate is the central support class for Mongo database operations. It provides:
+
+* Basic POJO mapping support to and from BSON
+* Convenience methods to interact with the store (insert object, update objects) and MongoDB specific ones (geo-spatial operations, upserts, map-reduce etc.)
+* Connection affinity callback
+* Exception translation into Spring's [technology agnostic DAO exception hierarchy](http://docs.spring.io/spring/docs/current/spring-framework-reference/html/dao.html#dao-exceptions).
+
+### Spring Data repositories
+
+To simplify the creation of data repositories Spring Data MongoDB provides a generic repository programming model. It will automatically create a repository proxy for you that adds implementations of finder methods you specify on an interface.  
+
+For example, given a `Person` class with first and last name properties, a `PersonRepository` interface that can query for `Person` by last name and when the first name matches a like expression is shown below:
+
+```java
+public interface PersonRepository extends CrudRepository<Person, Long> {
+
+  List<Person> findByLastname(String lastname);
+
+  List<Person> findByFirstnameLike(String firstname);
+}
+```
+
+The queries issued on execution will be derived from the method name. Extending `CrudRepository` causes CRUD methods being pulled into the interface so that you can easily save and find single entities and collections of them.
+
+You can have Spring automatically create a proxy for the interface by using the following JavaConfig:
+
+```java
+@Configuration
+@EnableMongoRepositories
+class ApplicationConfig extends AbstractMongoConfiguration {
+
+  @Override
+  public MongoClient mongoClient() throws Exception {
+    return new MongoClient();
+  }
+
+  @Override
+  protected String getDatabaseName() {
+    return "springdata";
+  }
+}
+```
+
+This sets up a connection to a local MongoDB instance and enables the detection of Spring Data repositories (through `@EnableMongoRepositories`). The same configuration would look like this in XML:
+
+```xml
+<bean id="template" class="org.springframework.data.mongodb.core.MongoTemplate">
+  <constructor-arg>
+    <bean class="com.mongodb.MongoClient">
+       <constructor-arg value="localhost" />
+       <constructor-arg value="27017" />
+    </bean>
+  </constructor-arg>
+  <constructor-arg value="database" />
+</bean>
+
+<mongo:repositories base-package="com.acme.repository" />
+```
+
+This will find the repository interface and register a proxy object in the container. You can use it as shown below:
+
+```java
+@Service
+public class MyService {
+
+  private final PersonRepository repository;
+
+  @Autowired
+  public MyService(PersonRepository repository) {
+    this.repository = repository;
+  }
+
+  public void doWork() {
+
+     repository.deleteAll();
+
+     Person person = new Person();
+     person.setFirstname("Oliver");
+     person.setLastname("Gierke");
+     person = repository.save(person);
+
+     List<Person> lastNameResults = repository.findByLastname("Gierke");
+     List<Person> firstNameResults = repository.findByFirstnameLike("Oli*");
+ }
+}
+```
+
+### MongoDB 4.0 Transactions
+
+As of version 4 MongoDB supports [Transactions](https://www.mongodb.com/transactions). Transactions are built on top of
+ `ClientSessions` and therefore require an active session.
+
+`MongoTransactionManager` is the gateway to the well known Spring transaction support. It allows applications to use 
+[managed transaction features of Spring](http://docs.spring.io/spring/docs/current/spring-framework-reference/html/transaction.html).
+The `MongoTransactionManager` binds a `ClientSession` to the thread. `MongoTemplate` automatically detects those and operates on them accordingly.
+
+```java
+@Configuration
+static class Config extends AbstractMongoConfiguration {
+
+	@Bean
+	MongoTransactionManager transactionManager(MongoDbFactory dbFactory) {
+		return new MongoTransactionManager(dbFactory);
+	}
+
+	// ...
+}
+
+@Component
+public class StateService {
+
+	@Transactional
+	void someBusinessFunction(Step step) {
+
+		template.insert(step);
+
+		process(step);
+
+		template.update(Step.class).apply(Update.set("state", // ...
+	};
+});
+```
+
+## Contributing to Spring Data
+
+Here are some ways for you to get involved in the community:
+
+* Get involved with the Spring community on Stackoverflow and help out on the [spring-data-mongodb](http://stackoverflow.com/questions/tagged/spring-data-mongodb) tag by responding to questions and joining the debate.
+* Create [JIRA](https://jira.spring.io/browse/DATAMONGO) tickets for bugs and new features and comment and vote on the ones that you are interested in.  
+* Github is for social coding: if you want to write code, we encourage contributions through pull requests from [forks of this repository](http://help.github.com/forking/). If you want to contribute code this way, please reference a JIRA ticket as well covering the specific issue you are addressing.
+* Watch for upcoming articles on Spring by [subscribing](http://spring.io/blog) to spring.io.
+
+Before we accept a non-trivial patch or pull request we will need you to [sign the Contributor License Agreement](https://cla.pivotal.io/sign/spring). Signing the contributor’s agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do. If you forget to do so, you'll be reminded when you submit a pull request. Active contributors might be asked to join the core team, and given the ability to merge pull requests.

SECURITY.adoc

@@ -1,9 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Please see the https://spring.io/projects/spring-data-mongodb[Spring Data MongoDB] project page for supported versions.
-
-## Reporting a Vulnerability
-
-Please don't raise security vulnerabilities here. Head over to https://pivotal.io/security to learn how to disclose them responsibly.

ci/README.adoc

@@ -1,39 +0,0 @@
-== Running CI tasks locally
-
-Since Concourse is built on top of Docker, it's easy to:
-
-* Debug what went wrong on your local machine.
-* Test out a a tweak to your `test.sh` script before sending it out.
-* Experiment against a new image before submitting your pull request.
-
-All of these use cases are great reasons to essentially run what Concourse does on your local machine.
-
-IMPORTANT: To do this you must have Docker installed on your machine.
-
-1. `docker run -it --mount type=bind,source="$(pwd)",target=/spring-data-mongodb-github springci/spring-data-8-jdk-with-mongodb /bin/bash`
-+
-This will launch the Docker image and mount your source code at `spring-data-mongodb-github`.
-+
-Next, run the `test.sh` script from inside the container:
-+
-2. `PROFILE=none spring-data-mongodb-github/ci/test.sh`
-
-Since the container is binding to your source, you can make edits from your IDE and continue to run build jobs.
-
-If you need to test the `build.sh` script, do this:
-
-1. `mkdir /tmp/spring-data-mongodb-artifactory`
-2. `docker run -it --mount type=bind,source="$(pwd)",target=/spring-data-mongodb-github --mount type=bind,source="/tmp/spring-data-mongodb-artifactory",target=/spring-data-mongodb-artifactory springci/spring-data-8-jdk-with-mongodb /bin/bash`
-+
-This will launch the Docker image and mount your source code at `spring-data-mongodb-github` and the temporary
-artifactory output directory at `spring-data-mongodb-artifactory`.
-+
-Next, run the `build.sh` script from inside the container:
-+
-3. `spring-data-mongodb-github/ci/build.sh`
-
-IMPORTANT: `build.sh` doesn't actually push to Artifactory so don't worry about accidentally deploying anything.
-It just deploys to a local folder. That way, the `artifactory-resource` later in the pipeline can pick up these artifacts
-and deliver them to artifactory.
-
-NOTE: Docker containers can eat up disk space fast! From time to time, run `docker system prune` to clean out old images.

ci/openjdk8-mongodb-4.0/Dockerfile

@@ -1,14 +0,0 @@
-FROM adoptopenjdk/openjdk8:latest
-
-RUN apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2
-
-RUN apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4
-
-RUN echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.0.list
-
-RUN apt-get update
-
-RUN apt-get install -y mongodb-org=4.0.9 mongodb-org-server=4.0.9 mongodb-org-shell=4.0.9 mongodb-org-mongos=4.0.9 mongodb-org-tools=4.0.9
-
-RUN apt-get clean \
- && rm -rf /var/lib/apt/lists/*

ci/openjdk8-mongodb-4.1/Dockerfile

@@ -1,14 +0,0 @@
-FROM adoptopenjdk/openjdk8:latest
-
-RUN apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2
-
-RUN apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 4B7C549A058F8B6B
-
-RUN echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.1 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.1.list
-
-RUN apt-get update
-
-RUN apt-get install -y mongodb-org-unstable=4.1.13 mongodb-org-unstable-server=4.1.13 mongodb-org-unstable-shell=4.1.13 mongodb-org-unstable-mongos=4.1.13 mongodb-org-unstable-tools=4.1.13
-
-RUN apt-get clean \
- && rm -rf /var/lib/apt/lists/*

mvnw

@@ -1,286 +0,0 @@
-#!/bin/sh
-# ----------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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
-#
-#    https://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.
-# ----------------------------------------------------------------------------
-
-# ----------------------------------------------------------------------------
-# Maven2 Start Up Batch script
-#
-# Required ENV vars:
-# ------------------
-#   JAVA_HOME - location of a JDK home dir
-#
-# Optional ENV vars
-# -----------------
-#   M2_HOME - location of maven2's installed home dir
-#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
-#     e.g. to debug Maven itself, use
-#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-# ----------------------------------------------------------------------------
-
-if [ -z "$MAVEN_SKIP_RC" ] ; then
-
-  if [ -f /etc/mavenrc ] ; then
-    . /etc/mavenrc
-  fi
-
-  if [ -f "$HOME/.mavenrc" ] ; then
-    . "$HOME/.mavenrc"
-  fi
-
-fi
-
-# OS specific support.  $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
-mingw=false
-case "`uname`" in
-  CYGWIN*) cygwin=true ;;
-  MINGW*) mingw=true;;
-  Darwin*) darwin=true
-    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
-    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
-    if [ -z "$JAVA_HOME" ]; then
-      if [ -x "/usr/libexec/java_home" ]; then
-        export JAVA_HOME="`/usr/libexec/java_home`"
-      else
-        export JAVA_HOME="/Library/Java/Home"
-      fi
-    fi
-    ;;
-esac
-
-if [ -z "$JAVA_HOME" ] ; then
-  if [ -r /etc/gentoo-release ] ; then
-    JAVA_HOME=`java-config --jre-home`
-  fi
-fi
-
-if [ -z "$M2_HOME" ] ; then
-  ## resolve links - $0 may be a link to maven's home
-  PRG="$0"
-
-  # need this for relative symlinks
-  while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-      PRG="$link"
-    else
-      PRG="`dirname "$PRG"`/$link"
-    fi
-  done
-
-  saveddir=`pwd`
-
-  M2_HOME=`dirname "$PRG"`/..
-
-  # make it fully qualified
-  M2_HOME=`cd "$M2_HOME" && pwd`
-
-  cd "$saveddir"
-  # echo Using m2 at $M2_HOME
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME=`cygpath --unix "$M2_HOME"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
-fi
-
-# For Mingw, ensure paths are in UNIX format before anything is touched
-if $mingw ; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME="`(cd "$M2_HOME"; pwd)`"
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
-  # TODO classpath?
-fi
-
-if [ -z "$JAVA_HOME" ]; then
-  javaExecutable="`which javac`"
-  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
-    # readlink(1) is not available as standard on Solaris 10.
-    readLink=`which readlink`
-    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
-      if $darwin ; then
-        javaHome="`dirname \"$javaExecutable\"`"
-        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
-      else
-        javaExecutable="`readlink -f \"$javaExecutable\"`"
-      fi
-      javaHome="`dirname \"$javaExecutable\"`"
-      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
-      JAVA_HOME="$javaHome"
-      export JAVA_HOME
-    fi
-  fi
-fi
-
-if [ -z "$JAVACMD" ] ; then
-  if [ -n "$JAVA_HOME"  ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-      # IBM's JDK on AIX uses strange locations for the executables
-      JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-      JAVACMD="$JAVA_HOME/bin/java"
-    fi
-  else
-    JAVACMD="`which java`"
-  fi
-fi
-
-if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly." >&2
-  echo "  We cannot execute $JAVACMD" >&2
-  exit 1
-fi
-
-if [ -z "$JAVA_HOME" ] ; then
-  echo "Warning: JAVA_HOME environment variable is not set."
-fi
-
-CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
-
-# traverses directory structure from process work directory to filesystem root
-# first directory with .mvn subdirectory is considered project base directory
-find_maven_basedir() {
-
-  if [ -z "$1" ]
-  then
-    echo "Path not specified to find_maven_basedir"
-    return 1
-  fi
-
-  basedir="$1"
-  wdir="$1"
-  while [ "$wdir" != '/' ] ; do
-    if [ -d "$wdir"/.mvn ] ; then
-      basedir=$wdir
-      break
-    fi
-    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
-    if [ -d "${wdir}" ]; then
-      wdir=`cd "$wdir/.."; pwd`
-    fi
-    # end of workaround
-  done
-  echo "${basedir}"
-}
-
-# concatenates all lines of a file
-concat_lines() {
-  if [ -f "$1" ]; then
-    echo "$(tr -s '\n' ' ' < "$1")"
-  fi
-}
-
-BASE_DIR=`find_maven_basedir "$(pwd)"`
-if [ -z "$BASE_DIR" ]; then
-  exit 1;
-fi
-
-##########################################################################################
-# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-# This allows using the maven wrapper in projects that prohibit checking in binary data.
-##########################################################################################
-if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Found .mvn/wrapper/maven-wrapper.jar"
-    fi
-else
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
-    fi
-    jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
-    while IFS="=" read key value; do
-      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
-      esac
-    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Downloading from: $jarUrl"
-    fi
-    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
-
-    if command -v wget > /dev/null; then
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Found wget ... using wget"
-        fi
-        wget "$jarUrl" -O "$wrapperJarPath"
-    elif command -v curl > /dev/null; then
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Found curl ... using curl"
-        fi
-        curl -o "$wrapperJarPath" "$jarUrl"
-    else
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Falling back to using Java to download"
-        fi
-        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
-        if [ -e "$javaClass" ]; then
-            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
-                if [ "$MVNW_VERBOSE" = true ]; then
-                  echo " - Compiling MavenWrapperDownloader.java ..."
-                fi
-                # Compiling the Java class
-                ("$JAVA_HOME/bin/javac" "$javaClass")
-            fi
-            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
-                # Running the downloader
-                if [ "$MVNW_VERBOSE" = true ]; then
-                  echo " - Running MavenWrapperDownloader.java ..."
-                fi
-                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
-            fi
-        fi
-    fi
-fi
-##########################################################################################
-# End of extension
-##########################################################################################
-
-export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
-if [ "$MVNW_VERBOSE" = true ]; then
-  echo $MAVEN_PROJECTBASEDIR
-fi
-MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME=`cygpath --path --windows "$M2_HOME"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
-  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
-    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
-fi
-
-WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-exec "$JAVACMD" \
-  $MAVEN_OPTS \
-  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
-  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
-  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

mvnw.cmd

@@ -1,161 +0,0 @@
-@REM ----------------------------------------------------------------------------
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements.  See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership.  The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License.  You may obtain a copy of the License at
-@REM
-@REM    https://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied.  See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM ----------------------------------------------------------------------------
-
-@REM ----------------------------------------------------------------------------
-@REM Maven2 Start Up Batch script
-@REM
-@REM Required ENV vars:
-@REM JAVA_HOME - location of a JDK home dir
-@REM
-@REM Optional ENV vars
-@REM M2_HOME - location of maven2's installed home dir
-@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
-@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
-@REM     e.g. to debug Maven itself, use
-@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-@REM ----------------------------------------------------------------------------
-
-@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
-@echo off
-@REM set title of command window
-title %0
-@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
-@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
-
-@REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
-
-@REM Execute a user defined script before this one
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
-@REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
-if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
-:skipRcPre
-
-@setlocal
-
-set ERROR_CODE=0
-
-@REM To isolate internal variables from possible post scripts, we use another setlocal
-@setlocal
-
-@REM ==== START VALIDATION ====
-if not "%JAVA_HOME%" == "" goto OkJHome
-
-echo.
-echo Error: JAVA_HOME not found in your environment. >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-:OkJHome
-if exist "%JAVA_HOME%\bin\java.exe" goto init
-
-echo.
-echo Error: JAVA_HOME is set to an invalid directory. >&2
-echo JAVA_HOME = "%JAVA_HOME%" >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-@REM ==== END VALIDATION ====
-
-:init
-
-@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
-@REM Fallback to current working directory if not found.
-
-set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
-IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
-
-set EXEC_DIR=%CD%
-set WDIR=%EXEC_DIR%
-:findBaseDir
-IF EXIST "%WDIR%"\.mvn goto baseDirFound
-cd ..
-IF "%WDIR%"=="%CD%" goto baseDirNotFound
-set WDIR=%CD%
-goto findBaseDir
-
-:baseDirFound
-set MAVEN_PROJECTBASEDIR=%WDIR%
-cd "%EXEC_DIR%"
-goto endDetectBaseDir
-
-:baseDirNotFound
-set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
-cd "%EXEC_DIR%"
-
-:endDetectBaseDir
-
-IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
-
-@setlocal EnableExtensions EnableDelayedExpansion
-for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
-@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
-
-:endReadAdditionalConfig
-
-SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
-set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
-FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO (
-	IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B 
-)
-
-@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
-if exist %WRAPPER_JAR% (
-    echo Found %WRAPPER_JAR%
-) else (
-    echo Couldn't find %WRAPPER_JAR%, downloading it ...
-	echo Downloading from: %DOWNLOAD_URL%
-    powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"
-    echo Finished downloading %WRAPPER_JAR%
-)
-@REM End of extension
-
-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
-if ERRORLEVEL 1 goto error
-goto end
-
-:error
-set ERROR_CODE=1
-
-:end
-@endlocal & set ERROR_CODE=%ERROR_CODE%
-
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
-@REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
-if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
-:skipRcPost
-
-@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%" == "on" pause
-
-if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
-
-exit /B %ERROR_CODE%

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-mongodb-parent</artifactId>
-	<version>2.2.0.RC1</version>
+	<version>2.1.6.RELEASE</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data MongoDB</name>
@@ -15,20 +15,21 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>2.2.0.RC1</version>
+		<version>2.1.6.RELEASE</version>
 	</parent>
 
 	<modules>
 		<module>spring-data-mongodb</module>
+		<module>spring-data-mongodb-cross-store</module>
 		<module>spring-data-mongodb-distribution</module>
 	</modules>
 
 	<properties>
 		<project.type>multi</project.type>
 		<dist.id>spring-data-mongodb</dist.id>
-		<springdata.commons>2.2.0.RC1</springdata.commons>
-		<mongo>3.11.0-beta3</mongo>
-		<mongo.reactivestreams>1.11.0</mongo.reactivestreams>
+		<springdata.commons>2.1.6.RELEASE</springdata.commons>
+		<mongo>3.8.2</mongo>
+		<mongo.reactivestreams>1.9.2</mongo.reactivestreams>
 		<jmh.version>1.19</jmh.version>
 	</properties>
 
@@ -114,46 +115,6 @@
 
 	<profiles>
 
-		<profile>
-			<id>snapshot</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.jfrog.buildinfo</groupId>
-						<artifactId>artifactory-maven-plugin</artifactId>
-						<version>2.6.1</version>
-						<inherited>false</inherited>
-						<executions>
-							<execution>
-								<id>build-info</id>
-								<goals>
-									<goal>publish</goal>
-								</goals>
-								<configuration>
-									<buildInfo>
-										<buildUrl>{{BUILD_URL}}</buildUrl>
-									</buildInfo>
-									<deployProperties>
-										<zip.name>spring-data-mongodb</zip.name>
-										<zip.displayname>spring-data-mongodb</zip.displayname>
-										<zip.deployed>false</zip.deployed>
-										<archives>*:*:*:*@zip</archives>
-									</deployProperties>
-									<publisher>
-										<contextUrl>https://repo.spring.io</contextUrl>
-										<username>{{ARTIFACTORY_USR}}</username>
-										<password>{{ARTIFACTORY_PSW}}</password>
-										<repoKey>libs-snapshot-local</repoKey>
-										<snapshotRepoKey>libs-snapshot-local</snapshotRepoKey>
-									</publisher>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-
 		<profile>
 			<id>release</id>
 			<build>
@@ -171,10 +132,30 @@
 			<id>benchmarks</id>
 			<modules>
 				<module>spring-data-mongodb</module>
+				<module>spring-data-mongodb-cross-store</module>
 				<module>spring-data-mongodb-distribution</module>
 				<module>spring-data-mongodb-benchmarks</module>
 			</modules>
 		</profile>
+
+		<profile>
+			<id>distribute</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.asciidoctor</groupId>
+						<artifactId>asciidoctor-maven-plugin</artifactId>
+						<configuration>
+							<attributes>
+								<mongo-reactivestreams>${mongo.reactivestreams}</mongo-reactivestreams>
+								<reactor>${reactor}</reactor>
+							</attributes>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
 	</profiles>
 
 	<dependencies>
@@ -188,8 +169,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-benchmarks/README.md

@@ -1,6 +1,6 @@
 # Benchmarks
 
-Benchmarks are based on [JMH](https://openjdk.java.net/projects/code-tools/jmh/).
+Benchmarks are based on [JMH](http://openjdk.java.net/projects/code-tools/jmh/).
 
 # Running Benchmarks
 

spring-data-mongodb-benchmarks/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>2.2.0.RC1</version>
+		<version>2.1.6.RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -87,7 +87,6 @@
 			<plugin>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<configuration>
-					<useSystemClassLoader>false</useSystemClassLoader>
 					<testSourceDirectory>${project.build.sourceDirectory}</testSourceDirectory>
 					<testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
 					<excludes>

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

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

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

@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.springframework.data</groupId>
+		<artifactId>spring-data-mongodb-parent</artifactId>
+		<version>2.1.6.RELEASE</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>spring-data-mongodb-cross-store</artifactId>
+	<name>Spring Data MongoDB - Cross-Store Support</name>
+
+	<properties>
+		<jpa>2.1.1</jpa>
+		<hibernate>5.2.1.Final</hibernate>
+		<java-module-name>spring.data.mongodb.cross.store</java-module-name>
+		<project.root>${basedir}/..</project.root>
+	</properties>
+
+	<dependencies>
+
+		<!-- Spring -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-beans</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-tx</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-aspects</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-orm</artifactId>
+		</dependency>
+
+		<!-- Spring Data -->
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-mongodb</artifactId>
+			<version>2.1.6.RELEASE</version>
+		</dependency>
+
+		<!-- reactive -->
+		<dependency>
+		 	<groupId>io.projectreactor</groupId>
+			<artifactId>reactor-core</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjrt</artifactId>
+			<version>${aspectj}</version>
+		</dependency>
+
+		<!-- JPA -->
+		<dependency>
+			<groupId>org.eclipse.persistence</groupId>
+			<artifactId>javax.persistence</artifactId>
+			<version>${jpa}</version>
+			<optional>true</optional>
+		</dependency>
+
+		<!-- For Tests -->
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-entitymanager</artifactId>
+			<version>${hibernate}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+			<version>1.8.0.10</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
+			<version>${validation}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>5.2.4.Final</version>
+			<scope>test</scope>
+		</dependency>
+
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>aspectj-maven-plugin</artifactId>
+				<version>1.6</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.aspectj</groupId>
+						<artifactId>aspectjrt</artifactId>
+						<version>${aspectj}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.aspectj</groupId>
+						<artifactId>aspectjtools</artifactId>
+						<version>${aspectj}</version>
+					</dependency>
+				</dependencies>
+				<executions>
+					<execution>
+						<goals>
+							<goal>compile</goal>
+							<goal>test-compile</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<outxml>true</outxml>
+					<aspectLibraries>
+						<aspectLibrary>
+							<groupId>org.springframework</groupId>
+							<artifactId>spring-aspects</artifactId>
+						</aspectLibrary>
+					</aspectLibraries>
+					<complianceLevel>${source.level}</complianceLevel>
+					<source>${source.level}</source>
+					<target>${source.level}</target>
+					<xmlConfigured>aop.xml</xmlConfigured>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.mongodb.repository;
+package org.springframework.data.mongodb.crossstore;
 
-import lombok.Value;
+import org.springframework.data.crossstore.ChangeSetBacked;
 
 /**
- * @author Christoph Strobl
+ * @author Thomas Risberg
+ * @author Oliver Gierke
+ * @deprecated will be removed without replacement.
  */
-@Value
-class SumAge {
+@Deprecated
+public interface DocumentBacked extends ChangeSetBacked {
 
-	private Long total;
 }

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

@@ -0,0 +1,214 @@
+/*
+ * Copyright 2011-2019 the original author 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
+ *
+ *      https://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.crossstore;
+
+import javax.persistence.EntityManagerFactory;
+
+import org.bson.Document;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.dao.DataAccessException;
+import org.springframework.dao.DataAccessResourceFailureException;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.data.crossstore.ChangeSet;
+import org.springframework.data.crossstore.ChangeSetBacked;
+import org.springframework.data.crossstore.ChangeSetPersister;
+import org.springframework.data.mongodb.core.CollectionCallback;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.util.ClassUtils;
+
+import com.mongodb.MongoException;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.model.Filters;
+import com.mongodb.client.result.DeleteResult;
+
+/**
+ * @author Thomas Risberg
+ * @author Oliver Gierke
+ * @author Alex Vengrovsk
+ * @author Mark Paluch
+ * @deprecated will be removed without replacement.
+ */
+@Deprecated
+public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
+
+	private static final String ENTITY_CLASS = "_entity_class";
+	private static final String ENTITY_ID = "_entity_id";
+	private static final String ENTITY_FIELD_NAME = "_entity_field_name";
+	private static final String ENTITY_FIELD_CLASS = "_entity_field_class";
+
+	private final Logger log = LoggerFactory.getLogger(getClass());
+
+	private MongoTemplate mongoTemplate;
+	private EntityManagerFactory entityManagerFactory;
+
+	public void setMongoTemplate(MongoTemplate mongoTemplate) {
+		this.mongoTemplate = mongoTemplate;
+	}
+
+	public void setEntityManagerFactory(EntityManagerFactory entityManagerFactory) {
+		this.entityManagerFactory = entityManagerFactory;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.crossstore.ChangeSetPersister#getPersistentState(java.lang.Class, java.lang.Object, org.springframework.data.crossstore.ChangeSet)
+	 */
+	public void getPersistentState(Class<? extends ChangeSetBacked> entityClass, Object id, final ChangeSet changeSet)
+			throws DataAccessException, NotFoundException {
+
+		if (id == null) {
+			log.debug("Unable to load MongoDB data for null id");
+			return;
+		}
+
+		String collName = getCollectionNameForEntity(entityClass);
+
+		final Document dbk = new Document();
+		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)) {
+					String key = (String) dbo.get(ENTITY_FIELD_NAME);
+					if (log.isDebugEnabled()) {
+						log.debug("Processing key: {}", key);
+					}
+					if (!changeSet.getValues().containsKey(key)) {
+						String className = (String) dbo.get(ENTITY_FIELD_CLASS);
+						if (className == null) {
+							throw new DataIntegrityViolationException(
+									"Unble to convert property " + key + ": Invalid metadata, " + ENTITY_FIELD_CLASS + " not available");
+						}
+						Class<?> clazz = ClassUtils.resolveClassName(className, ClassUtils.getDefaultClassLoader());
+						Object value = mongoTemplate.getConverter().read(clazz, dbo);
+						if (log.isDebugEnabled()) {
+							log.debug("Adding to ChangeSet: {}", key);
+						}
+						changeSet.set(key, value);
+					}
+				}
+				return null;
+			}
+		});
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.crossstore.ChangeSetPersister#getPersistentId(org.springframework.data.crossstore.ChangeSetBacked, org.springframework.data.crossstore.ChangeSet)
+	 */
+	public Object getPersistentId(ChangeSetBacked entity, ChangeSet cs) throws DataAccessException {
+		if (log.isDebugEnabled()) {
+			log.debug("getPersistentId called on {}", entity);
+		}
+		if (entityManagerFactory == null) {
+			throw new DataAccessResourceFailureException("EntityManagerFactory cannot be null");
+		}
+
+		return entityManagerFactory.getPersistenceUnitUtil().getIdentifier(entity);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.crossstore.ChangeSetPersister#persistState(org.springframework.data.crossstore.ChangeSetBacked, org.springframework.data.crossstore.ChangeSet)
+	 */
+	public Object persistState(ChangeSetBacked entity, ChangeSet cs) throws DataAccessException {
+		if (cs == null) {
+			log.debug("Flush: changeset was null, nothing to flush.");
+			return 0L;
+		}
+
+		if (log.isDebugEnabled()) {
+			log.debug("Flush: changeset: {}", cs.getValues());
+		}
+
+		String collName = getCollectionNameForEntity(entity.getClass());
+		if (mongoTemplate.getCollection(collName) == null) {
+			mongoTemplate.createCollection(collName);
+		}
+
+		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();
+				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;
+					}
+				});
+
+				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);
+							return null;
+						}
+					});
+				} else {
+					final Document dbDoc = new Document();
+					dbDoc.putAll(dbQuery);
+					if (log.isDebugEnabled()) {
+						log.debug("Flush: saving: {}", dbQuery);
+					}
+					mongoTemplate.getConverter().write(value, dbDoc);
+					dbDoc.put(ENTITY_FIELD_CLASS, value.getClass().getName());
+					if (dbId != null) {
+						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);
+							}
+							return null;
+						}
+					});
+				}
+			}
+		}
+		return 0L;
+	}
+
+	/**
+	 * Returns the collection the given entity type shall be persisted to.
+	 *
+	 * @param entityClass must not be {@literal null}.
+	 * @return
+	 */
+	private String getCollectionNameForEntity(Class<? extends ChangeSetBacked> entityClass) {
+		return mongoTemplate.getCollectionName(entityClass);
+	}
+}

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

@@ -0,0 +1,272 @@
+/*
+ * Copyright 2011-2019 the original author 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
+ *
+ *      https://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.crossstore;
+
+import java.lang.reflect.Field;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Transient;
+import javax.persistence.Entity;
+
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.reflect.FieldSignature;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.dao.DataAccessException;
+import org.springframework.data.mongodb.crossstore.RelatedDocument;
+import org.springframework.data.mongodb.crossstore.DocumentBacked;
+import org.springframework.data.crossstore.ChangeSetBackedTransactionSynchronization;
+import org.springframework.data.crossstore.ChangeSet;
+import org.springframework.data.crossstore.ChangeSetPersister;
+import org.springframework.data.crossstore.ChangeSetPersister.NotFoundException;
+import org.springframework.data.crossstore.HashMapChangeSet;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
+
+/**
+ * Aspect to turn an object annotated with @Document into a persistent document using Mongo.
+ * 
+ * @author Thomas Risberg
+ * @deprecated will be removed without replacement.
+ */
+@Deprecated
+public aspect MongoDocumentBacking {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(MongoDocumentBacking.class);
+
+	// Aspect shared config
+	private ChangeSetPersister<Object> changeSetPersister;
+
+	public void setChangeSetPersister(ChangeSetPersister<Object> changeSetPersister) {
+		this.changeSetPersister = changeSetPersister;
+	}
+
+	// ITD to introduce N state to Annotated objects
+	declare parents : (@Entity *) implements DocumentBacked;
+
+	// The annotated fields that will be persisted in MongoDB rather than with JPA
+	declare @field: @RelatedDocument * (@Entity+ *).*:@Transient;
+
+	// -------------------------------------------------------------------------
+	// Advise user-defined constructors of ChangeSetBacked objects to create a new
+	// backing ChangeSet
+	// -------------------------------------------------------------------------
+	pointcut arbitraryUserConstructorOfChangeSetBackedObject(DocumentBacked entity) : 
+		execution((DocumentBacked+).new(..)) &&
+		!execution((DocumentBacked+).new(ChangeSet)) &&
+		this(entity);
+
+	pointcut finderConstructorOfChangeSetBackedObject(DocumentBacked entity, ChangeSet cs) : 
+		execution((DocumentBacked+).new(ChangeSet)) &&
+		this(entity) && 
+		args(cs);
+
+	protected pointcut entityFieldGet(DocumentBacked entity) :
+        get(@RelatedDocument * DocumentBacked+.*) &&
+        this(entity) &&
+        !get(* DocumentBacked.*);
+
+	protected pointcut entityFieldSet(DocumentBacked entity, Object newVal) :
+        set(@RelatedDocument * DocumentBacked+.*) &&
+        this(entity) &&
+        args(newVal) &&
+        !set(* DocumentBacked.*);
+
+	// intercept EntityManager.merge calls
+	public pointcut entityManagerMerge(EntityManager em, Object entity) : 
+    call(* EntityManager.merge(Object)) &&
+    target(em) &&
+    args(entity);
+
+	// intercept EntityManager.remove calls
+	// public pointcut entityManagerRemove(EntityManager em, Object entity) :
+	// call(* EntityManager.remove(Object)) &&
+	// target(em) &&
+	// args(entity);
+
+	// move changeSet from detached entity to the newly merged persistent object
+	Object around(EntityManager em, Object entity) : entityManagerMerge(em, entity) {
+		Object mergedEntity = proceed(em, entity);
+		if (entity instanceof DocumentBacked && mergedEntity instanceof DocumentBacked) {
+			((DocumentBacked) mergedEntity).changeSet = ((DocumentBacked) entity).getChangeSet();
+		}
+		return mergedEntity;
+	}
+
+	// clear changeSet from removed entity
+	// Object around(EntityManager em, Object entity) : entityManagerRemove(em, entity) {
+	// if (entity instanceof DocumentBacked) {
+	// removeChangeSetValues((DocumentBacked)entity);
+	// }
+	// return proceed(em, entity);
+	// }
+
+	private static void removeChangeSetValues(DocumentBacked entity) {
+		LOGGER.debug("Removing all change-set values for " + entity);
+		ChangeSet nulledCs = new HashMapChangeSet();
+		DocumentBacked documentEntity = (DocumentBacked) entity;
+		@SuppressWarnings("unchecked")
+		ChangeSetPersister<Object> changeSetPersister = (ChangeSetPersister<Object>) documentEntity.itdChangeSetPersister;
+		try {
+			changeSetPersister.getPersistentState(documentEntity.getClass(), documentEntity.get_persistent_id(),
+					documentEntity.getChangeSet());
+		} catch (DataAccessException e) {
+		} catch (NotFoundException e) {
+		}
+		for (String key : entity.getChangeSet().getValues().keySet()) {
+			nulledCs.set(key, null);
+		}
+		entity.setChangeSet(nulledCs);
+	}
+
+	before(DocumentBacked entity) : arbitraryUserConstructorOfChangeSetBackedObject(entity) {
+		LOGGER.debug("User-defined constructor called on DocumentBacked object of class " + entity.getClass());
+		// Populate all ITD fields
+		entity.setChangeSet(new HashMapChangeSet());
+		entity.itdChangeSetPersister = changeSetPersister;
+		entity.itdTransactionSynchronization = new ChangeSetBackedTransactionSynchronization(changeSetPersister, entity);
+		// registerTransactionSynchronization(entity);
+	}
+
+	private static void registerTransactionSynchronization(DocumentBacked entity) {
+		if (TransactionSynchronizationManager.isSynchronizationActive()) {
+			if (!TransactionSynchronizationManager.getSynchronizations().contains(entity.itdTransactionSynchronization)) {
+				if (LOGGER.isDebugEnabled()) {
+					LOGGER.debug("Adding transaction synchronization for " + entity);
+				}
+				TransactionSynchronizationManager.registerSynchronization(entity.itdTransactionSynchronization);
+			} else {
+				if (LOGGER.isDebugEnabled()) {
+					LOGGER.debug("Transaction synchronization already active for " + entity);
+				}
+			}
+		} else {
+			if (LOGGER.isDebugEnabled()) {
+				LOGGER.debug("Transaction synchronization is not active for " + entity);
+			}
+		}
+	}
+
+	// -------------------------------------------------------------------------
+	// ChangeSet-related mixins
+	// -------------------------------------------------------------------------
+	// Introduced field
+	@Transient
+	private ChangeSet DocumentBacked.changeSet;
+
+	@Transient
+	private ChangeSetPersister<?> DocumentBacked.itdChangeSetPersister;
+
+	@Transient
+	private ChangeSetBackedTransactionSynchronization DocumentBacked.itdTransactionSynchronization;
+
+	public void DocumentBacked.setChangeSet(ChangeSet cs) {
+		this.changeSet = cs;
+	}
+
+	public ChangeSet DocumentBacked.getChangeSet() {
+		return changeSet;
+	}
+
+	// Flush the entity state to the persistent store
+	public void DocumentBacked.flush() {
+		Object id = itdChangeSetPersister.getPersistentId(this, this.changeSet);
+		itdChangeSetPersister.persistState(this, this.changeSet);
+	}
+
+	public Object DocumentBacked.get_persistent_id() {
+		return itdChangeSetPersister.getPersistentId(this, this.changeSet);
+	}
+
+	// lifecycle methods
+	@javax.persistence.PostPersist
+	public void DocumentBacked.itdPostPersist() {
+		if (LOGGER.isDebugEnabled()) {
+			LOGGER.debug("JPA lifecycle event PrePersist: " + this.getClass().getName());
+		}
+		registerTransactionSynchronization(this);
+	}
+
+	@javax.persistence.PreUpdate
+	public void DocumentBacked.itdPreUpdate() {
+		if (LOGGER.isDebugEnabled()) {
+			LOGGER.debug("JPA lifecycle event PreUpdate: " + this.getClass().getName() + " :: " + this);
+		}
+		registerTransactionSynchronization(this);
+	}
+
+	@javax.persistence.PostUpdate
+	public void DocumentBacked.itdPostUpdate() {
+		if (LOGGER.isDebugEnabled()) {
+			LOGGER.debug("JPA lifecycle event PostUpdate: " + this.getClass().getName() + " :: " + this);
+		}
+		registerTransactionSynchronization(this);
+	}
+
+	@javax.persistence.PostRemove
+	public void DocumentBacked.itdPostRemove() {
+		if (LOGGER.isDebugEnabled()) {
+			LOGGER.debug("JPA lifecycle event PostRemove: " + this.getClass().getName() + " :: " + this);
+		}
+		registerTransactionSynchronization(this);
+		removeChangeSetValues(this);
+	}
+
+	@javax.persistence.PostLoad
+	public void DocumentBacked.itdPostLoad() {
+		if (LOGGER.isDebugEnabled()) {
+			LOGGER.debug("JPA lifecycle event PostLoad: " + this.getClass().getName() + " :: " + this);
+		}
+		registerTransactionSynchronization(this);
+	}
+
+	/**
+	 * delegates field reads to the state accessors instance
+	 */
+	Object around(DocumentBacked entity): entityFieldGet(entity) {
+		Field f = field(thisJoinPoint);
+		String propName = f.getName();
+		LOGGER.trace("GET " + f + " -> ChangeSet value property [" + propName + "] using: " + entity.getChangeSet());
+		if (entity.getChangeSet().getValues().get(propName) == null) {
+			try {
+				this.changeSetPersister
+						.getPersistentState(entity.getClass(), entity.get_persistent_id(), entity.getChangeSet());
+			} catch (NotFoundException e) {
+			}
+		}
+		Object fValue = entity.getChangeSet().getValues().get(propName);
+		if (fValue != null) {
+			return fValue;
+		}
+		return proceed(entity);
+	}
+
+	/**
+	 * delegates field writes to the state accessors instance
+	 */
+	Object around(DocumentBacked entity, Object newVal) : entityFieldSet(entity, newVal) {
+		Field f = field(thisJoinPoint);
+		String propName = f.getName();
+		LOGGER.trace("SET " + f + " -> ChangeSet number value property [" + propName + "] with value=[" + newVal + "]");
+		entity.getChangeSet().set(propName, newVal);
+		return proceed(entity, newVal);
+	}
+
+	Field field(JoinPoint joinPoint) {
+		FieldSignature fieldSignature = (FieldSignature) joinPoint.getSignature();
+		return fieldSignature.getField();
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,24 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.mongodb.util.json;
+package org.springframework.data.mongodb.crossstore;
 
-import org.springframework.lang.Nullable;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
- * A value provider to retrieve bindable values by their parameter index.
- *
- * @author Christoph Strobl
- * @since 2.2
+ * @author Thomas Risberg
+ * @deprecated will be removed without replacement.
  */
-@FunctionalInterface
-public interface ValueProvider {
-
-	/**
-	 * @param index parameter index to use.
-	 * @return can be {@literal null}.
-	 * @throws RuntimeException if the requested element does not exist.
-	 */
-	@Nullable
-	Object getBindableValue(int index);
+@Deprecated
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.FIELD })
+public @interface RelatedDocument {
 }

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

@@ -0,0 +1,5 @@
+/**
+ * Infrastructure for Spring Data's MongoDB cross store support.
+ */
+package org.springframework.data.mongodb.crossstore;
+

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

@@ -0,0 +1,195 @@
+/*
+ * Copyright 2011-2019 the original author 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
+ *
+ *      https://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.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;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.crossstore.test.Address;
+import org.springframework.data.mongodb.crossstore.test.Person;
+import org.springframework.data.mongodb.crossstore.test.Resume;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionCallback;
+import org.springframework.transaction.support.TransactionTemplate;
+
+/**
+ * Integration tests for MongoDB cross-store persistence (mainly {@link MongoChangeSetPersister}).
+ *
+ * @author Thomas Risberg
+ * @author Oliver Gierke
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("classpath:/META-INF/spring/applicationContext.xml")
+public class CrossStoreMongoTests {
+
+	@Autowired MongoTemplate mongoTemplate;
+
+	@PersistenceContext EntityManager entityManager;
+
+	@Autowired PlatformTransactionManager transactionManager;
+	TransactionTemplate txTemplate;
+
+	@Before
+	public void setUp() {
+
+		txTemplate = new TransactionTemplate(transactionManager);
+
+		clearData(Person.class);
+
+		Address address = new Address(12, "MAin St.", "Boston", "MA", "02101");
+
+		Resume resume = new Resume();
+		resume.addEducation("Skanstulls High School, 1975");
+		resume.addEducation("Univ. of Stockholm, 1980");
+		resume.addJob("DiMark, DBA, 1990-2000");
+		resume.addJob("VMware, Developer, 2007-");
+
+		final Person person = new Person("Thomas", 20);
+		person.setAddress(address);
+		person.setResume(resume);
+		person.setId(1L);
+
+		txTemplate.execute(new TransactionCallback<Void>() {
+			public Void doInTransaction(TransactionStatus status) {
+				entityManager.persist(person);
+				return null;
+			}
+		});
+	}
+
+	@After
+	public void tearDown() {
+		txTemplate.execute(new TransactionCallback<Void>() {
+			public Void doInTransaction(TransactionStatus status) {
+				entityManager.remove(entityManager.find(Person.class, 1L));
+				return null;
+			}
+		});
+	}
+
+	private void clearData(Class<?> domainType) {
+
+		String collectionName = mongoTemplate.getCollectionName(domainType);
+		mongoTemplate.dropCollection(collectionName);
+	}
+
+	@Test
+	@Transactional
+	public void testReadJpaToMongoEntityRelationship() {
+
+		Person found = entityManager.find(Person.class, 1L);
+		Assert.assertNotNull(found);
+		Assert.assertEquals(Long.valueOf(1), found.getId());
+		Assert.assertNotNull(found);
+		Assert.assertEquals(Long.valueOf(1), found.getId());
+		Assert.assertNotNull(found.getResume());
+		Assert.assertEquals("DiMark, DBA, 1990-2000" + "; " + "VMware, Developer, 2007-", found.getResume().getJobs());
+	}
+
+	@Test
+	@Transactional
+	public void testUpdatedJpaToMongoEntityRelationship() {
+
+		Person found = entityManager.find(Person.class, 1L);
+		found.setAge(44);
+		found.getResume().addJob("SpringDeveloper.com, Consultant, 2005-2006");
+
+		entityManager.merge(found);
+
+		Assert.assertNotNull(found);
+		Assert.assertEquals(Long.valueOf(1), found.getId());
+		Assert.assertNotNull(found);
+		Assert.assertEquals(Long.valueOf(1), found.getId());
+		Assert.assertNotNull(found.getResume());
+		Assert.assertEquals("DiMark, DBA, 1990-2000" + "; " + "VMware, Developer, 2007-" + "; "
+				+ "SpringDeveloper.com, Consultant, 2005-2006", found.getResume().getJobs());
+	}
+
+	@Test
+	public void testMergeJpaEntityWithMongoDocument() {
+
+		final Person detached = entityManager.find(Person.class, 1L);
+		entityManager.detach(detached);
+		detached.getResume().addJob("TargetRx, Developer, 2000-2005");
+
+		Person merged = txTemplate.execute(new TransactionCallback<Person>() {
+			public Person doInTransaction(TransactionStatus status) {
+				Person result = entityManager.merge(detached);
+				entityManager.flush();
+				return result;
+			}
+		});
+
+		Assert.assertTrue(detached.getResume().getJobs().contains("TargetRx, Developer, 2000-2005"));
+		Assert.assertTrue(merged.getResume().getJobs().contains("TargetRx, Developer, 2000-2005"));
+		final Person updated = entityManager.find(Person.class, 1L);
+		Assert.assertTrue(updated.getResume().getJobs().contains("TargetRx, Developer, 2000-2005"));
+	}
+
+	@Test
+	public void testRemoveJpaEntityWithMongoDocument() {
+
+		txTemplate.execute(new TransactionCallback<Person>() {
+			public Person doInTransaction(TransactionStatus status) {
+				Person p2 = new Person("Thomas", 20);
+				Resume r2 = new Resume();
+				r2.addEducation("Skanstulls High School, 1975");
+				r2.addJob("DiMark, DBA, 1990-2000");
+				p2.setResume(r2);
+				p2.setId(2L);
+				entityManager.persist(p2);
+				Person p3 = new Person("Thomas", 20);
+				Resume r3 = new Resume();
+				r3.addEducation("Univ. of Stockholm, 1980");
+				r3.addJob("VMware, Developer, 2007-");
+				p3.setResume(r3);
+				p3.setId(3L);
+				entityManager.persist(p3);
+				return null;
+			}
+		});
+		txTemplate.execute(new TransactionCallback<Person>() {
+			public Person doInTransaction(TransactionStatus status) {
+				final Person found2 = entityManager.find(Person.class, 2L);
+				entityManager.remove(found2);
+				return null;
+			}
+		});
+
+		boolean weFound3 = false;
+
+		for (Document 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;
+			}
+		}
+		Assert.assertTrue(weFound3);
+	}
+
+}

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

@@ -0,0 +1,75 @@
+/*
+ * Copyright 2011-2019 the original author 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
+ *
+ *      https://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.crossstore.test;
+
+public class Address {
+
+	private Integer streetNumber;
+	private String streetName;
+	private String city;
+	private String state;
+	private String zip;
+
+	public Address(Integer streetNumber, String streetName, String city, String state, String zip) {
+		super();
+		this.streetNumber = streetNumber;
+		this.streetName = streetName;
+		this.city = city;
+		this.state = state;
+		this.zip = zip;
+	}
+
+	public Integer getStreetNumber() {
+		return streetNumber;
+	}
+
+	public void setStreetNumber(Integer streetNumber) {
+		this.streetNumber = streetNumber;
+	}
+
+	public String getStreetName() {
+		return streetName;
+	}
+
+	public void setStreetName(String streetName) {
+		this.streetName = streetName;
+	}
+
+	public String getCity() {
+		return city;
+	}
+
+	public void setCity(String city) {
+		this.city = city;
+	}
+
+	public String getState() {
+		return state;
+	}
+
+	public void setState(String state) {
+		this.state = state;
+	}
+
+	public String getZip() {
+		return zip;
+	}
+
+	public void setZip(String zip) {
+		this.zip = zip;
+	}
+
+}

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

@@ -0,0 +1,102 @@
+/*
+ * Copyright 2011-2019 the original author 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
+ *
+ *      https://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.crossstore.test;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+import org.springframework.data.mongodb.crossstore.RelatedDocument;
+
+@Entity
+public class Person {
+
+	@Id
+	Long id;
+
+	private String name;
+
+	private int age;
+
+	private java.util.Date birthDate;
+
+	@RelatedDocument
+	private Address address;
+
+	@RelatedDocument
+	private Resume resume;
+
+	public Person() {
+	}
+
+	public Person(String name, int age) {
+		this.name = name;
+		this.age = age;
+		this.birthDate = new java.util.Date();
+	}
+
+	public void birthday() {
+		++age;
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public int getAge() {
+		return age;
+	}
+
+	public void setAge(int age) {
+		this.age = age;
+	}
+
+	public java.util.Date getBirthDate() {
+		return birthDate;
+	}
+
+	public void setBirthDate(java.util.Date birthDate) {
+		this.birthDate = birthDate;
+	}
+
+	public Resume getResume() {
+		return resume;
+	}
+
+	public void setResume(Resume resume) {
+		this.resume = resume;
+	}
+
+	public Address getAddress() {
+		return address;
+	}
+
+	public void setAddress(Address address) {
+		this.address = address;
+	}
+
+}

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

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2011-2019 the original author 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
+ *
+ *      https://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.crossstore.test;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.bson.types.ObjectId;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+@Document
+public class Resume {
+
+	private static final Log LOGGER = LogFactory.getLog(Resume.class);
+
+	@Id
+	private ObjectId id;
+
+	private String education = "";
+
+	private String jobs = "";
+
+	public String getId() {
+		return id.toString();
+	}
+
+	public String getEducation() {
+		return education;
+	}
+
+	public void addEducation(String education) {
+		LOGGER.debug("Adding education " + education);
+		this.education = this.education + (this.education.length() > 0 ? "; " : "") + education;
+	}
+
+	public String getJobs() {
+		return jobs;
+	}
+
+	public void addJob(String job) {
+		LOGGER.debug("Adding job " + job);
+		this.jobs = this.jobs + (this.jobs.length() > 0 ? "; " : "") + job;
+	}
+
+	@Override
+	public String toString() {
+		return "Resume [education=" + education + ", jobs=" + jobs + "]";
+	}
+
+}

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             version="2.0"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+  <persistence-unit name="test" transaction-type="RESOURCE_LOCAL">
+    <provider>org.hibernate.ejb.HibernatePersistence</provider>
+    <class>org.springframework.data.mongodb.crossstore.test.Person</class>
+    <properties>
+      <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
+      <!--value='create' to build a new database on each run; value='update' to modify an existing database; value='create-drop' means the same as 'create' but also drops tables when Hibernate closes; value='validate' makes no changes to the database-->
+      <property name="hibernate.hbm2ddl.auto" value="update"/>
+      <property name="hibernate.ejb.naming_strategy" value="org.hibernate.cfg.ImprovedNamingStrategy"/>
+    </properties>
+  </persistence-unit>
+</persistence>

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

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:tx="http://www.springframework.org/schema/tx"
+	xmlns:jdbc="http://www.springframework.org/schema/jdbc"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mongo="http://www.springframework.org/schema/data/mongo"
+	xsi:schemaLocation="http://www.springframework.org/schema/data/mongo http://www.springframework.org/schema/data/mongo/spring-mongo.xsd
+		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+
+  <context:spring-configured/>
+
+  <context:component-scan base-package="org.springframework.persistence.mongodb.test">
+    <context:exclude-filter expression="org.springframework.stereotype.Controller" type="annotation"/>
+  </context:component-scan>
+
+  <mongo:mapping-converter/>
+  
+  <!--  Mongo config -->
+  <bean id="mongoClient" class="org.springframework.data.mongodb.core.MongoClientFactoryBean">
+    <property name="host" value="localhost"/>
+    <property name="port" value="27017"/>
+  </bean>
+
+  <bean id="mongoDbFactory" class="org.springframework.data.mongodb.core.SimpleMongoDbFactory">
+  	<constructor-arg name="mongoClient" ref="mongoClient"/>
+  	<constructor-arg name="databaseName" value="database"/>
+  </bean>
+
+  <bean id="mongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
+    <constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
+    <constructor-arg name="mongoConverter" ref="mappingConverter"/>
+  </bean>
+
+  <bean class="org.springframework.data.mongodb.core.MongoExceptionTranslator"/>
+
+  <!--  Mongo aspect config -->
+  <bean class="org.springframework.data.mongodb.crossstore.MongoDocumentBacking"
+        factory-method="aspectOf">
+    <property name="changeSetPersister" ref="mongoChangeSetPersister"/>
+  </bean>
+  <bean id="mongoChangeSetPersister" 
+      class="org.springframework.data.mongodb.crossstore.MongoChangeSetPersister">
+    <property name="mongoTemplate" ref="mongoTemplate"/>
+    <property name="entityManagerFactory" ref="entityManagerFactory"/>
+  </bean>
+
+  <jdbc:embedded-database id="dataSource" type="HSQL">
+  </jdbc:embedded-database>
+
+  <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
+    <property name="entityManagerFactory" ref="entityManagerFactory"/>
+  </bean>
+
+  <tx:annotation-driven mode="aspectj" transaction-manager="transactionManager"/>
+
+  <bean class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean" id="entityManagerFactory">
+    <property name="persistenceUnitName" value="test"/>
+    <property name="dataSource" ref="dataSource"/>
+    <property name="jpaVendorAdapter">
+      <bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
+        <property name="showSql" value="true"/>
+        <property name="generateDdl" value="true"/>
+        <property name="databasePlatform" value="org.hibernate.dialect.HSQLDialect"/>
+      </bean>
+    </property>
+  </bean>
+
+</beans>

spring-data-mongodb-cross-store/src/test/resources/logback.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d %5p %40.40c:%4L - %m%n</pattern>
+		</encoder>
+	</appender>
+
+	<!-- 
+	<logger name="org.springframework" level="debug" />
+	 -->
+
+	<root level="error">
+		<appender-ref ref="console" />
+	</root>
+
+</configuration>

spring-data-mongodb-distribution/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>2.2.0.RC1</version>
+		<version>2.1.6.RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -36,15 +35,8 @@
 			<plugin>
 				<groupId>org.asciidoctor</groupId>
 				<artifactId>asciidoctor-maven-plugin</artifactId>
-				<configuration>
-					<attributes>
-						<mongo-reactivestreams>${mongo.reactivestreams}</mongo-reactivestreams>
-						<reactor>${reactor}</reactor>
-					</attributes>
-				</configuration>
 			</plugin>
 		</plugins>
-
 	</build>
 
 </project>

spring-data-mongodb/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>2.2.0.RC1</version>
+		<version>2.1.6.RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -83,14 +83,14 @@
 
 		<!-- reactive -->
 		<dependency>
-			<groupId>org.mongodb</groupId>
+		 	<groupId>org.mongodb</groupId>
 			<artifactId>mongodb-driver-reactivestreams</artifactId>
 			<version>${mongo.reactivestreams}</version>
 			<optional>true</optional>
 		</dependency>
 
 		<dependency>
-			<groupId>org.mongodb</groupId>
+		 	<groupId>org.mongodb</groupId>
 			<artifactId>mongodb-driver-async</artifactId>
 			<version>${mongo}</version>
 			<optional>true</optional>
@@ -107,7 +107,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>io.projectreactor</groupId>
+		 	<groupId>io.projectreactor</groupId>
 			<artifactId>reactor-core</artifactId>
 			<optional>true</optional>
 		</dependency>
@@ -119,14 +119,14 @@
 		</dependency>
 
 		<dependency>
-			<groupId>io.reactivex</groupId>
+		 	<groupId>io.reactivex</groupId>
 			<artifactId>rxjava</artifactId>
 			<version>${rxjava}</version>
 			<optional>true</optional>
 		</dependency>
 
 		<dependency>
-			<groupId>io.reactivex</groupId>
+		 	<groupId>io.reactivex</groupId>
 			<artifactId>rxjava-reactive-streams</artifactId>
 			<version>${rxjava-reactive-streams}</version>
 			<optional>true</optional>
@@ -264,27 +264,20 @@
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
 			<artifactId>kotlin-stdlib</artifactId>
+			<version>${kotlin}</version>
 			<optional>true</optional>
 		</dependency>
-
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
 			<artifactId>kotlin-reflect</artifactId>
+			<version>${kotlin}</version>
 			<optional>true</optional>
 		</dependency>
-
 		<dependency>
-			<groupId>org.jetbrains.kotlinx</groupId>
-			<artifactId>kotlinx-coroutines-core</artifactId>
-			<version>${kotlin-coroutines}</version>
-			<optional>true</optional>
-		</dependency>
-
-		<dependency>
-			<groupId>org.jetbrains.kotlinx</groupId>
-			<artifactId>kotlinx-coroutines-reactor</artifactId>
-			<version>${kotlin-coroutines}</version>
-			<optional>true</optional>
+			<groupId>org.jetbrains.kotlin</groupId>
+			<artifactId>kotlin-test</artifactId>
+			<version>${kotlin}</version>
+			<scope>test</scope>
 		</dependency>
 
 		<dependency>
@@ -329,7 +322,6 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<configuration>
-					<useSystemClassLoader>false</useSystemClassLoader>
 					<useFile>false</useFile>
 					<includes>
 						<include>**/*Tests.java</include>

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

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2010-2019 the original author 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
+ *
+ *      https://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.DataAccessResourceFailureException;
+import org.springframework.data.authentication.UserCredentials;
+import org.springframework.lang.Nullable;
+
+/**
+ * Exception being thrown in case we cannot connect to a MongoDB instance.
+ *
+ * @author Oliver Gierke
+ * @author Mark Paluch
+ */
+public class CannotGetMongoDbConnectionException extends DataAccessResourceFailureException {
+
+	private final UserCredentials credentials;
+	private final @Nullable String database;
+
+	private static final long serialVersionUID = 1172099106475265589L;
+
+	public CannotGetMongoDbConnectionException(String msg, Throwable cause) {
+		super(msg, cause);
+		this.database = null;
+		this.credentials = UserCredentials.NO_CREDENTIALS;
+	}
+
+	public CannotGetMongoDbConnectionException(String msg) {
+		this(msg, null, UserCredentials.NO_CREDENTIALS);
+	}
+
+	public CannotGetMongoDbConnectionException(String msg, @Nullable String database, UserCredentials credentials) {
+		super(msg);
+		this.database = database;
+		this.credentials = credentials;
+	}
+
+	/**
+	 * Returns the {@link UserCredentials} that were used when trying to connect to the MongoDB instance.
+	 *
+	 * @return
+	 */
+	public UserCredentials getCredentials() {
+		return this.credentials;
+	}
+
+	/**
+	 * Returns the name of the database trying to be accessed.
+	 *
+	 * @return
+	 */
+	@Nullable
+	public String getDatabase() {
+		return database;
+	}
+}

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

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.data.mongodb;
 
 import reactor.core.publisher.Mono;
@@ -87,16 +88,4 @@ public interface ReactiveMongoDatabaseFactory extends CodecRegistryProvider {
 	 * @since 2.1
 	 */
 	ReactiveMongoDatabaseFactory withSession(ClientSession session);
-
-	/**
-	 * Returns if the given {@link ReactiveMongoDatabaseFactory} is bound to a
-	 * {@link com.mongodb.reactivestreams.client.ClientSession} that has an
-	 * {@link com.mongodb.reactivestreams.client.ClientSession#hasActiveTransaction() active transaction}.
-	 *
-	 * @return {@literal true} if there's an active transaction, {@literal false} otherwise.
-	 * @since 2.2
-	 */
-	default boolean isTransactionActive() {
-		return false;
-	}
 }

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

@@ -1,278 +0,0 @@
-/*
- * Copyright 2019 the original author 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
- *
- *      https://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 reactor.core.publisher.Mono;
-import reactor.util.context.Context;
-
-import org.springframework.lang.Nullable;
-import org.springframework.transaction.NoTransactionException;
-import org.springframework.transaction.reactive.ReactiveResourceSynchronization;
-import org.springframework.transaction.reactive.TransactionSynchronization;
-import org.springframework.transaction.reactive.TransactionSynchronizationManager;
-import org.springframework.transaction.support.ResourceHolderSynchronization;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
-import com.mongodb.ClientSessionOptions;
-import com.mongodb.reactivestreams.client.ClientSession;
-import com.mongodb.reactivestreams.client.MongoCollection;
-import com.mongodb.reactivestreams.client.MongoDatabase;
-
-/**
- * Helper class for managing reactive {@link MongoDatabase} instances via {@link ReactiveMongoDatabaseFactory}. Used for
- * obtaining {@link ClientSession session bound} resources, such as {@link MongoDatabase} and {@link MongoCollection}
- * suitable for transactional usage.
- * <p />
- * <strong>Note:</strong> Intended for internal usage only.
- *
- * @author Mark Paluch
- * @author Christoph Strobl
- * @since 2.2
- */
-public class ReactiveMongoDatabaseUtils {
-
-	/**
-	 * Check if the {@link ReactiveMongoDatabaseFactory} is actually bound to a
-	 * {@link com.mongodb.reactivestreams.client.ClientSession} that has an active transaction, or if a
-	 * {@link org.springframework.transaction.reactive.TransactionSynchronization} has been registered for the
-	 * {@link ReactiveMongoDatabaseFactory resource} and if the associated
-	 * {@link com.mongodb.reactivestreams.client.ClientSession} has an
-	 * {@link com.mongodb.reactivestreams.client.ClientSession#hasActiveTransaction() active transaction}.
-	 *
-	 * @param databaseFactory the resource to check transactions for. Must not be {@literal null}.
-	 * @return a {@link Mono} emitting {@literal true} if the factory has an ongoing transaction.
-	 */
-	public static Mono<Boolean> isTransactionActive(ReactiveMongoDatabaseFactory databaseFactory) {
-
-		if (databaseFactory.isTransactionActive()) {
-			return Mono.just(true);
-		}
-
-		return TransactionSynchronizationManager.forCurrentTransaction() //
-				.map(it -> {
-
-					ReactiveMongoResourceHolder holder = (ReactiveMongoResourceHolder) it.getResource(databaseFactory);
-					return holder != null && holder.hasActiveTransaction();
-				}) //
-				.onErrorResume(NoTransactionException.class, e -> Mono.just(false));
-	}
-
-	/**
-	 * Obtain the default {@link MongoDatabase database} form the given {@link ReactiveMongoDatabaseFactory factory} using
-	 * {@link SessionSynchronization#ON_ACTUAL_TRANSACTION native session synchronization}.
-	 * <p />
-	 * Registers a {@link MongoSessionSynchronization MongoDB specific transaction synchronization} within the subscriber
-	 * {@link Context} if {@link TransactionSynchronizationManager#isSynchronizationActive() synchronization is active}.
-	 *
-	 * @param factory the {@link ReactiveMongoDatabaseFactory} to get the {@link MongoDatabase} from.
-	 * @return the {@link MongoDatabase} that is potentially associated with a transactional {@link ClientSession}.
-	 */
-	public static Mono<MongoDatabase> getDatabase(ReactiveMongoDatabaseFactory factory) {
-		return doGetMongoDatabase(null, factory, SessionSynchronization.ON_ACTUAL_TRANSACTION);
-	}
-
-	/**
-	 * Obtain the default {@link MongoDatabase database} form the given {@link ReactiveMongoDatabaseFactory factory}.
-	 * <p />
-	 * Registers a {@link MongoSessionSynchronization MongoDB specific transaction synchronization} within the subscriber
-	 * {@link Context} if {@link TransactionSynchronizationManager#isSynchronizationActive() synchronization is active}.
-	 *
-	 * @param factory the {@link ReactiveMongoDatabaseFactory} to get the {@link MongoDatabase} from.
-	 * @param sessionSynchronization the synchronization to use. Must not be {@literal null}.
-	 * @return the {@link MongoDatabase} that is potentially associated with a transactional {@link ClientSession}.
-	 */
-	public static Mono<MongoDatabase> getDatabase(ReactiveMongoDatabaseFactory factory,
-			SessionSynchronization sessionSynchronization) {
-		return doGetMongoDatabase(null, factory, sessionSynchronization);
-	}
-
-	/**
-	 * Obtain the {@link MongoDatabase database} with given name form the given {@link ReactiveMongoDatabaseFactory
-	 * factory} using {@link SessionSynchronization#ON_ACTUAL_TRANSACTION native session synchronization}.
-	 * <p />
-	 * Registers a {@link MongoSessionSynchronization MongoDB specific transaction synchronization} within the subscriber
-	 * {@link Context} if {@link TransactionSynchronizationManager#isSynchronizationActive() synchronization is active}.
-	 *
-	 * @param dbName the name of the {@link MongoDatabase} to get.
-	 * @param factory the {@link ReactiveMongoDatabaseFactory} to get the {@link MongoDatabase} from.
-	 * @return the {@link MongoDatabase} that is potentially associated with a transactional {@link ClientSession}.
-	 */
-	public static Mono<MongoDatabase> getDatabase(String dbName, ReactiveMongoDatabaseFactory factory) {
-		return doGetMongoDatabase(dbName, factory, SessionSynchronization.ON_ACTUAL_TRANSACTION);
-	}
-
-	/**
-	 * Obtain the {@link MongoDatabase database} with given name form the given {@link ReactiveMongoDatabaseFactory
-	 * factory}.
-	 * <p />
-	 * Registers a {@link MongoSessionSynchronization MongoDB specific transaction synchronization} within the subscriber
-	 * {@link Context} if {@link TransactionSynchronizationManager#isSynchronizationActive() synchronization is active}.
-	 *
-	 * @param dbName the name of the {@link MongoDatabase} to get.
-	 * @param factory the {@link ReactiveMongoDatabaseFactory} to get the {@link MongoDatabase} from.
-	 * @param sessionSynchronization the synchronization to use. Must not be {@literal null}.
-	 * @return the {@link MongoDatabase} that is potentially associated with a transactional {@link ClientSession}.
-	 */
-	public static Mono<MongoDatabase> getDatabase(String dbName, ReactiveMongoDatabaseFactory factory,
-			SessionSynchronization sessionSynchronization) {
-		return doGetMongoDatabase(dbName, factory, sessionSynchronization);
-	}
-
-	private static Mono<MongoDatabase> doGetMongoDatabase(@Nullable String dbName, ReactiveMongoDatabaseFactory factory,
-			SessionSynchronization sessionSynchronization) {
-
-		Assert.notNull(factory, "DatabaseFactory must not be null!");
-
-		return TransactionSynchronizationManager.forCurrentTransaction()
-				.filter(TransactionSynchronizationManager::isSynchronizationActive) //
-				.flatMap(synchronizationManager -> {
-
-					return doGetSession(synchronizationManager, factory, sessionSynchronization) //
-							.map(it -> getMongoDatabaseOrDefault(dbName, factory.withSession(it)));
-				})
-				.onErrorResume(NoTransactionException.class,
-						e -> Mono.fromSupplier(() -> getMongoDatabaseOrDefault(dbName, factory)))
-				.defaultIfEmpty(getMongoDatabaseOrDefault(dbName, factory));
-	}
-
-	private static MongoDatabase getMongoDatabaseOrDefault(@Nullable String dbName,
-			ReactiveMongoDatabaseFactory factory) {
-		return StringUtils.hasText(dbName) ? factory.getMongoDatabase(dbName) : factory.getMongoDatabase();
-	}
-
-	private static Mono<ClientSession> doGetSession(TransactionSynchronizationManager synchronizationManager,
-			ReactiveMongoDatabaseFactory dbFactory, SessionSynchronization sessionSynchronization) {
-
-		final ReactiveMongoResourceHolder registeredHolder = (ReactiveMongoResourceHolder) synchronizationManager
-				.getResource(dbFactory);
-
-		// check for native MongoDB transaction
-		if (registeredHolder != null
-				&& (registeredHolder.hasSession() || registeredHolder.isSynchronizedWithTransaction())) {
-
-			return registeredHolder.hasSession() ? Mono.just(registeredHolder.getSession())
-					: createClientSession(dbFactory).map(registeredHolder::setSessionIfAbsent);
-		}
-
-		if (SessionSynchronization.ON_ACTUAL_TRANSACTION.equals(sessionSynchronization)) {
-			return Mono.empty();
-		}
-
-		// init a non native MongoDB transaction by registering a MongoSessionSynchronization
-		return createClientSession(dbFactory).map(session -> {
-
-			ReactiveMongoResourceHolder newHolder = new ReactiveMongoResourceHolder(session, dbFactory);
-			newHolder.getRequiredSession().startTransaction();
-
-			synchronizationManager
-					.registerSynchronization(new MongoSessionSynchronization(synchronizationManager, newHolder, dbFactory));
-			newHolder.setSynchronizedWithTransaction(true);
-			synchronizationManager.bindResource(dbFactory, newHolder);
-
-			return newHolder.getSession();
-		});
-	}
-
-	private static Mono<ClientSession> createClientSession(ReactiveMongoDatabaseFactory dbFactory) {
-		return dbFactory.getSession(ClientSessionOptions.builder().causallyConsistent(true).build());
-	}
-
-	/**
-	 * MongoDB specific {@link ResourceHolderSynchronization} for resource cleanup at the end of a transaction when
-	 * participating in a non-native MongoDB transaction, such as a R2CBC transaction.
-	 *
-	 * @author Mark Paluch
-	 * @since 2.2
-	 */
-	private static class MongoSessionSynchronization
-			extends ReactiveResourceSynchronization<ReactiveMongoResourceHolder, Object> {
-
-		private final ReactiveMongoResourceHolder resourceHolder;
-
-		MongoSessionSynchronization(TransactionSynchronizationManager synchronizationManager,
-				ReactiveMongoResourceHolder resourceHolder, ReactiveMongoDatabaseFactory dbFactory) {
-
-			super(resourceHolder, dbFactory, synchronizationManager);
-			this.resourceHolder = resourceHolder;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.transaction.reactive.ReactiveResourceSynchronization#shouldReleaseBeforeCompletion()
-		 */
-		@Override
-		protected boolean shouldReleaseBeforeCompletion() {
-			return false;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.transaction.reactive.ReactiveResourceSynchronization#processResourceAfterCommit(java.lang.Object)
-		 */
-		@Override
-		protected Mono<Void> processResourceAfterCommit(ReactiveMongoResourceHolder resourceHolder) {
-
-			if (isTransactionActive(resourceHolder)) {
-				return Mono.from(resourceHolder.getRequiredSession().commitTransaction());
-			}
-
-			return Mono.empty();
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.transaction.reactive.ReactiveResourceSynchronization#afterCompletion(int)
-		 */
-		@Override
-		public Mono<Void> afterCompletion(int status) {
-
-			return Mono.defer(() -> {
-
-				if (status == TransactionSynchronization.STATUS_ROLLED_BACK && isTransactionActive(this.resourceHolder)) {
-
-					return Mono.from(resourceHolder.getRequiredSession().abortTransaction()) //
-							.then(super.afterCompletion(status));
-				}
-
-				return super.afterCompletion(status);
-			});
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.transaction.reactive.ReactiveResourceSynchronization#releaseResource(java.lang.Object, java.lang.Object)
-		 */
-		@Override
-		protected Mono<Void> releaseResource(ReactiveMongoResourceHolder resourceHolder, Object resourceKey) {
-
-			return Mono.fromRunnable(() -> {
-				if (resourceHolder.hasActiveSession()) {
-					resourceHolder.getRequiredSession().close();
-				}
-			});
-		}
-
-		private boolean isTransactionActive(ReactiveMongoResourceHolder resourceHolder) {
-
-			if (!resourceHolder.hasSession()) {
-				return false;
-			}
-
-			return resourceHolder.getRequiredSession().hasActiveTransaction();
-		}
-	}
-}

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

@@ -1,155 +0,0 @@
-/*
- * Copyright 2019 the original author 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
- *
- *      https://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.data.mongodb.core.ReactiveMongoTemplate;
-import org.springframework.lang.Nullable;
-import org.springframework.transaction.support.ResourceHolderSupport;
-
-import com.mongodb.reactivestreams.client.ClientSession;
-
-/**
- * MongoDB specific resource holder, wrapping a {@link ClientSession}. {@link ReactiveMongoTransactionManager} binds
- * instances of this class to the subscriber context.
- * <p />
- * <strong>Note:</strong> Intended for internal usage only.
- *
- * @author Mark Paluch
- * @author Christoph Strobl
- * @since 2.2
- * @see ReactiveMongoTransactionManager
- * @see ReactiveMongoTemplate
- */
-class ReactiveMongoResourceHolder extends ResourceHolderSupport {
-
-	private @Nullable ClientSession session;
-	private ReactiveMongoDatabaseFactory databaseFactory;
-
-	/**
-	 * Create a new {@link ReactiveMongoResourceHolder} for a given {@link ClientSession session}.
-	 *
-	 * @param session the associated {@link ClientSession}. Can be {@literal null}.
-	 * @param databaseFactory the associated {@link MongoDbFactory}. must not be {@literal null}.
-	 */
-	ReactiveMongoResourceHolder(@Nullable ClientSession session, ReactiveMongoDatabaseFactory databaseFactory) {
-
-		this.session = session;
-		this.databaseFactory = databaseFactory;
-	}
-
-	/**
-	 * @return the associated {@link ClientSession}. Can be {@literal null}.
-	 */
-	@Nullable
-	ClientSession getSession() {
-		return session;
-	}
-
-	/**
-	 * @return the required associated {@link ClientSession}.
-	 * @throws IllegalStateException if no session is associated.
-	 */
-	ClientSession getRequiredSession() {
-
-		ClientSession session = getSession();
-
-		if (session == null) {
-			throw new IllegalStateException("No ClientSession associated");
-		}
-		return session;
-	}
-
-	/**
-	 * @return the associated {@link ReactiveMongoDatabaseFactory}.
-	 */
-	public ReactiveMongoDatabaseFactory getDatabaseFactory() {
-		return databaseFactory;
-	}
-
-	/**
-	 * Set the {@link ClientSession} to guard.
-	 *
-	 * @param session can be {@literal null}.
-	 */
-	public void setSession(@Nullable ClientSession session) {
-		this.session = session;
-	}
-
-	/**
-	 * @return {@literal true} if session is not {@literal null}.
-	 */
-	boolean hasSession() {
-		return session != null;
-	}
-
-	/**
-	 * If the {@link ReactiveMongoResourceHolder} is {@link #hasSession() not already associated} with a
-	 * {@link ClientSession} the given value is {@link #setSession(ClientSession) set} and returned, otherwise the current
-	 * bound session is returned.
-	 * 
-	 * @param session
-	 * @return
-	 */
-	@Nullable
-	public ClientSession setSessionIfAbsent(@Nullable ClientSession session) {
-
-		if (!hasSession()) {
-			setSession(session);
-		}
-
-		return session;
-	}
-
-	/**
-	 * @return {@literal true} if the session is active and has not been closed.
-	 */
-	boolean hasActiveSession() {
-
-		if (!hasSession()) {
-			return false;
-		}
-
-		return hasServerSession() && !getRequiredSession().getServerSession().isClosed();
-	}
-
-	/**
-	 * @return {@literal true} if the session has an active transaction.
-	 * @see #hasActiveSession()
-	 */
-	boolean hasActiveTransaction() {
-
-		if (!hasActiveSession()) {
-			return false;
-		}
-
-		return getRequiredSession().hasActiveTransaction();
-	}
-
-	/**
-	 * @return {@literal true} if the {@link ClientSession} has a {@link com.mongodb.session.ServerSession} associated
-	 *         that is accessible via {@link ClientSession#getServerSession()}.
-	 */
-	boolean hasServerSession() {
-
-		try {
-			return getRequiredSession().getServerSession() != null;
-		} catch (IllegalStateException serverSessionClosed) {
-			// ignore
-		}
-
-		return false;
-	}
-}

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

@@ -1,530 +0,0 @@
-/*
- * Copyright 2019 the original author 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
- *
- *      https://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 reactor.core.publisher.Mono;
-
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.lang.Nullable;
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.TransactionException;
-import org.springframework.transaction.TransactionSystemException;
-import org.springframework.transaction.reactive.AbstractReactiveTransactionManager;
-import org.springframework.transaction.reactive.GenericReactiveTransaction;
-import org.springframework.transaction.reactive.TransactionSynchronizationManager;
-import org.springframework.transaction.support.SmartTransactionObject;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-
-import com.mongodb.ClientSessionOptions;
-import com.mongodb.MongoException;
-import com.mongodb.TransactionOptions;
-import com.mongodb.reactivestreams.client.ClientSession;
-
-/**
- * A {@link org.springframework.transaction.ReactiveTransactionManager} implementation that manages
- * {@link com.mongodb.reactivestreams.client.ClientSession} based transactions for a single
- * {@link org.springframework.data.mongodb.ReactiveMongoDatabaseFactory}.
- * <p />
- * Binds a {@link ClientSession} from the specified
- * {@link org.springframework.data.mongodb.ReactiveMongoDatabaseFactory} to the subscriber
- * {@link reactor.util.context.Context}.
- * <p />
- * {@link org.springframework.transaction.TransactionDefinition#isReadOnly() Readonly} transactions operate on a
- * {@link ClientSession} and enable causal consistency, and also {@link ClientSession#startTransaction() start},
- * {@link com.mongodb.reactivestreams.client.ClientSession#commitTransaction() commit} or
- * {@link ClientSession#abortTransaction() abort} a transaction.
- * <p />
- * Application code is required to retrieve the {@link com.mongodb.reactivestreams.client.MongoDatabase} via
- * {@link org.springframework.data.mongodb.ReactiveMongoDatabaseUtils#getDatabase(ReactiveMongoDatabaseFactory)} instead
- * of a standard {@link org.springframework.data.mongodb.ReactiveMongoDatabaseFactory#getMongoDatabase()} call. Spring
- * classes such as {@link org.springframework.data.mongodb.core.ReactiveMongoTemplate} use this strategy implicitly.
- * <p />
- * By default failure of a {@literal commit} operation raises a {@link TransactionSystemException}. You can override
- * {@link #doCommit(TransactionSynchronizationManager, ReactiveMongoTransactionObject)} to implement the
- * <a href="https://docs.mongodb.com/manual/core/transactions/#retry-commit-operation">Retry Commit Operation</a>
- * behavior as outlined in the MongoDB reference manual.
- *
- * @author Christoph Strobl
- * @author Mark Paluch
- * @since 2.2
- * @see <a href="https://www.mongodb.com/transactions">MongoDB Transaction Documentation</a>
- * @see ReactiveMongoDatabaseUtils#getDatabase(ReactiveMongoDatabaseFactory, SessionSynchronization)
- */
-public class ReactiveMongoTransactionManager extends AbstractReactiveTransactionManager implements InitializingBean {
-
-	private @Nullable ReactiveMongoDatabaseFactory databaseFactory;
-	private @Nullable TransactionOptions options;
-
-	/**
-	 * Create a new {@link ReactiveMongoTransactionManager} for bean-style usage.
-	 * <p />
-	 * <strong>Note:</strong>The {@link org.springframework.data.mongodb.ReactiveMongoDatabaseFactory db factory} has to
-	 * be {@link #setDatabaseFactory(ReactiveMongoDatabaseFactory)} set} before using the instance. Use this constructor
-	 * to prepare a {@link ReactiveMongoTransactionManager} via a {@link org.springframework.beans.factory.BeanFactory}.
-	 * <p />
-	 * Optionally it is possible to set default {@link TransactionOptions transaction options} defining
-	 * {@link com.mongodb.ReadConcern} and {@link com.mongodb.WriteConcern}.
-	 *
-	 * @see #setDatabaseFactory(ReactiveMongoDatabaseFactory)
-	 */
-	public ReactiveMongoTransactionManager() {}
-
-	/**
-	 * Create a new {@link ReactiveMongoTransactionManager} obtaining sessions from the given
-	 * {@link ReactiveMongoDatabaseFactory}.
-	 *
-	 * @param databaseFactory must not be {@literal null}.
-	 */
-	public ReactiveMongoTransactionManager(ReactiveMongoDatabaseFactory databaseFactory) {
-		this(databaseFactory, null);
-	}
-
-	/**
-	 * Create a new {@link ReactiveMongoTransactionManager} obtaining sessions from the given
-	 * {@link ReactiveMongoDatabaseFactory} applying the given {@link TransactionOptions options}, if present, when
-	 * starting a new transaction.
-	 *
-	 * @param databaseFactory must not be {@literal null}.
-	 * @param options can be {@literal null}.
-	 */
-	public ReactiveMongoTransactionManager(ReactiveMongoDatabaseFactory databaseFactory,
-			@Nullable TransactionOptions options) {
-
-		Assert.notNull(databaseFactory, "DatabaseFactory must not be null!");
-
-		this.databaseFactory = databaseFactory;
-		this.options = options;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.transaction.reactive.AbstractReactiveTransactionManager#doGetTransaction(org.springframework.transaction.reactive.TransactionSynchronizationManager)
-	 */
-	@Override
-	protected Object doGetTransaction(TransactionSynchronizationManager synchronizationManager)
-			throws TransactionException {
-
-		ReactiveMongoResourceHolder resourceHolder = (ReactiveMongoResourceHolder) synchronizationManager
-				.getResource(getRequiredDatabaseFactory());
-		return new ReactiveMongoTransactionObject(resourceHolder);
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.transaction.reactive.AbstractReactiveTransactionManager#isExistingTransaction(java.lang.Object)
-	 */
-	@Override
-	protected boolean isExistingTransaction(Object transaction) throws TransactionException {
-		return extractMongoTransaction(transaction).hasResourceHolder();
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.transaction.reactive.AbstractReactiveTransactionManager#doBegin(org.springframework.transaction.reactive.TransactionSynchronizationManager, java.lang.Object, org.springframework.transaction.TransactionDefinition)
-	 */
-	@Override
-	protected Mono<Void> doBegin(TransactionSynchronizationManager synchronizationManager, Object transaction,
-			TransactionDefinition definition) throws TransactionException {
-
-		return Mono.defer(() -> {
-
-			ReactiveMongoTransactionObject mongoTransactionObject = extractMongoTransaction(transaction);
-
-			Mono<ReactiveMongoResourceHolder> holder = newResourceHolder(definition,
-					ClientSessionOptions.builder().causallyConsistent(true).build());
-
-			return holder.doOnNext(resourceHolder -> {
-
-				mongoTransactionObject.setResourceHolder(resourceHolder);
-
-				if (logger.isDebugEnabled()) {
-					logger.debug(
-							String.format("About to start transaction for session %s.", debugString(resourceHolder.getSession())));
-				}
-
-			}).doOnNext(resourceHolder -> {
-
-				mongoTransactionObject.startTransaction(options);
-
-				if (logger.isDebugEnabled()) {
-					logger.debug(String.format("Started transaction for session %s.", debugString(resourceHolder.getSession())));
-				}
-
-			})//
-					.onErrorMap(
-							ex -> new TransactionSystemException(String.format("Could not start Mongo transaction for session %s.",
-									debugString(mongoTransactionObject.getSession())), ex))
-					.doOnSuccess(resourceHolder -> {
-
-						synchronizationManager.bindResource(getRequiredDatabaseFactory(), resourceHolder);
-					}).then();
-		});
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.transaction.reactive.AbstractReactiveTransactionManager#doSuspend(org.springframework.transaction.reactive.TransactionSynchronizationManager, java.lang.Object)
-	 */
-	@Override
-	protected Mono<Object> doSuspend(TransactionSynchronizationManager synchronizationManager, Object transaction)
-			throws TransactionException {
-
-		return Mono.fromSupplier(() -> {
-
-			ReactiveMongoTransactionObject mongoTransactionObject = extractMongoTransaction(transaction);
-			mongoTransactionObject.setResourceHolder(null);
-
-			return synchronizationManager.unbindResource(getRequiredDatabaseFactory());
-		});
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.transaction.reactive.AbstractReactiveTransactionManager#doResume(org.springframework.transaction.reactive.TransactionSynchronizationManager, java.lang.Object, java.lang.Object)
-	 */
-	@Override
-	protected Mono<Void> doResume(TransactionSynchronizationManager synchronizationManager, @Nullable Object transaction,
-			Object suspendedResources) {
-		return Mono
-				.fromRunnable(() -> synchronizationManager.bindResource(getRequiredDatabaseFactory(), suspendedResources));
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.transaction.reactive.AbstractReactiveTransactionManager#doCommit(org.springframework.transaction.reactive.TransactionSynchronizationManager, org.springframework.transaction.reactive.GenericReactiveTransaction)
-	 */
-	@Override
-	protected final Mono<Void> doCommit(TransactionSynchronizationManager synchronizationManager,
-			GenericReactiveTransaction status) throws TransactionException {
-
-		return Mono.defer(() -> {
-
-			ReactiveMongoTransactionObject mongoTransactionObject = extractMongoTransaction(status);
-
-			if (logger.isDebugEnabled()) {
-				logger.debug(String.format("About to commit transaction for session %s.",
-						debugString(mongoTransactionObject.getSession())));
-			}
-
-			return doCommit(synchronizationManager, mongoTransactionObject).onErrorMap(ex -> {
-				return new TransactionSystemException(String.format("Could not commit Mongo transaction for session %s.",
-						debugString(mongoTransactionObject.getSession())), ex);
-			});
-		});
-	}
-
-	/**
-	 * Customization hook to perform an actual commit of the given transaction.<br />
-	 * If a commit operation encounters an error, the MongoDB driver throws a {@link MongoException} holding
-	 * {@literal error labels}. <br />
-	 * By default those labels are ignored, nevertheless one might check for
-	 * {@link MongoException#UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL transient commit errors labels} and retry the the
-	 * commit.
-	 *
-	 * @param synchronizationManager reactive synchronization manager.
-	 * @param transactionObject never {@literal null}.
-	 */
-	protected Mono<Void> doCommit(TransactionSynchronizationManager synchronizationManager,
-			ReactiveMongoTransactionObject transactionObject) {
-		return transactionObject.commitTransaction();
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.transaction.reactive.AbstractReactiveTransactionManager#doRollback(org.springframework.transaction.reactive.TransactionSynchronizationManager, org.springframework.transaction.reactive.GenericReactiveTransaction)
-	 */
-	@Override
-	protected Mono<Void> doRollback(TransactionSynchronizationManager synchronizationManager,
-			GenericReactiveTransaction status) {
-
-		return Mono.defer(() -> {
-
-			ReactiveMongoTransactionObject mongoTransactionObject = extractMongoTransaction(status);
-
-			if (logger.isDebugEnabled()) {
-				logger.debug(String.format("About to abort transaction for session %s.",
-						debugString(mongoTransactionObject.getSession())));
-			}
-
-			return mongoTransactionObject.abortTransaction().onErrorResume(MongoException.class, ex -> {
-				return Mono
-						.error(new TransactionSystemException(String.format("Could not abort Mongo transaction for session %s.",
-								debugString(mongoTransactionObject.getSession())), ex));
-			});
-		});
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.transaction.reactive.AbstractReactiveTransactionManager#doSetRollbackOnly(org.springframework.transaction.reactive.TransactionSynchronizationManager, org.springframework.transaction.reactive.GenericReactiveTransaction)
-	 */
-	@Override
-	protected Mono<Void> doSetRollbackOnly(TransactionSynchronizationManager synchronizationManager,
-			GenericReactiveTransaction status) throws TransactionException {
-
-		return Mono.fromRunnable(() -> {
-			ReactiveMongoTransactionObject transactionObject = extractMongoTransaction(status);
-			transactionObject.getRequiredResourceHolder().setRollbackOnly();
-		});
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.transaction.reactive.AbstractReactiveTransactionManager#doCleanupAfterCompletion(org.springframework.transaction.reactive.TransactionSynchronizationManager, java.lang.Object)
-	 */
-	@Override
-	protected Mono<Void> doCleanupAfterCompletion(TransactionSynchronizationManager synchronizationManager,
-			Object transaction) {
-
-		Assert.isInstanceOf(ReactiveMongoTransactionObject.class, transaction,
-				() -> String.format("Expected to find a %s but it turned out to be %s.", ReactiveMongoTransactionObject.class,
-						transaction.getClass()));
-
-		return Mono.fromRunnable(() -> {
-			ReactiveMongoTransactionObject mongoTransactionObject = (ReactiveMongoTransactionObject) transaction;
-
-			// Remove the connection holder from the thread.
-			synchronizationManager.unbindResource(getRequiredDatabaseFactory());
-			mongoTransactionObject.getRequiredResourceHolder().clear();
-
-			if (logger.isDebugEnabled()) {
-				logger.debug(String.format("About to release Session %s after transaction.",
-						debugString(mongoTransactionObject.getSession())));
-			}
-
-			mongoTransactionObject.closeSession();
-		});
-	}
-
-	/**
-	 * Set the {@link ReactiveMongoDatabaseFactory} that this instance should manage transactions for.
-	 *
-	 * @param databaseFactory must not be {@literal null}.
-	 */
-	public void setDatabaseFactory(ReactiveMongoDatabaseFactory databaseFactory) {
-
-		Assert.notNull(databaseFactory, "DatabaseFactory must not be null!");
-		this.databaseFactory = databaseFactory;
-	}
-
-	/**
-	 * Set the {@link TransactionOptions} to be applied when starting transactions.
-	 *
-	 * @param options can be {@literal null}.
-	 */
-	public void setOptions(@Nullable TransactionOptions options) {
-		this.options = options;
-	}
-
-	/**
-	 * Get the {@link ReactiveMongoDatabaseFactory} that this instance manages transactions for.
-	 *
-	 * @return can be {@literal null}.
-	 */
-	@Nullable
-	public ReactiveMongoDatabaseFactory getDatabaseFactory() {
-		return databaseFactory;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-	 */
-	@Override
-	public void afterPropertiesSet() {
-		getRequiredDatabaseFactory();
-	}
-
-	private Mono<ReactiveMongoResourceHolder> newResourceHolder(TransactionDefinition definition,
-			ClientSessionOptions options) {
-
-		ReactiveMongoDatabaseFactory dbFactory = getRequiredDatabaseFactory();
-
-		return dbFactory.getSession(options).map(session -> new ReactiveMongoResourceHolder(session, dbFactory));
-	}
-
-	/**
-	 * @throws IllegalStateException if {@link #databaseFactory} is {@literal null}.
-	 */
-	private ReactiveMongoDatabaseFactory getRequiredDatabaseFactory() {
-
-		Assert.state(databaseFactory != null,
-				"ReactiveMongoTransactionManager operates upon a ReactiveMongoDatabaseFactory. Did you forget to provide one? It's required.");
-
-		return databaseFactory;
-	}
-
-	private static ReactiveMongoTransactionObject extractMongoTransaction(Object transaction) {
-
-		Assert.isInstanceOf(ReactiveMongoTransactionObject.class, transaction,
-				() -> String.format("Expected to find a %s but it turned out to be %s.", ReactiveMongoTransactionObject.class,
-						transaction.getClass()));
-
-		return (ReactiveMongoTransactionObject) transaction;
-	}
-
-	private static ReactiveMongoTransactionObject extractMongoTransaction(GenericReactiveTransaction status) {
-
-		Assert.isInstanceOf(ReactiveMongoTransactionObject.class, status.getTransaction(),
-				() -> String.format("Expected to find a %s but it turned out to be %s.", ReactiveMongoTransactionObject.class,
-						status.getTransaction().getClass()));
-
-		return (ReactiveMongoTransactionObject) status.getTransaction();
-	}
-
-	private static String debugString(@Nullable ClientSession session) {
-
-		if (session == null) {
-			return "null";
-		}
-
-		String debugString = String.format("[%s@%s ", ClassUtils.getShortName(session.getClass()),
-				Integer.toHexString(session.hashCode()));
-
-		try {
-			if (session.getServerSession() != null) {
-				debugString += String.format("id = %s, ", session.getServerSession().getIdentifier());
-				debugString += String.format("causallyConsistent = %s, ", session.isCausallyConsistent());
-				debugString += String.format("txActive = %s, ", session.hasActiveTransaction());
-				debugString += String.format("txNumber = %d, ", session.getServerSession().getTransactionNumber());
-				debugString += String.format("closed = %d, ", session.getServerSession().isClosed());
-				debugString += String.format("clusterTime = %s", session.getClusterTime());
-			} else {
-				debugString += "id = n/a";
-				debugString += String.format("causallyConsistent = %s, ", session.isCausallyConsistent());
-				debugString += String.format("txActive = %s, ", session.hasActiveTransaction());
-				debugString += String.format("clusterTime = %s", session.getClusterTime());
-			}
-		} catch (RuntimeException e) {
-			debugString += String.format("error = %s", e.getMessage());
-		}
-
-		debugString += "]";
-
-		return debugString;
-	}
-
-	/**
-	 * MongoDB specific transaction object, representing a {@link MongoResourceHolder}. Used as transaction object by
-	 * {@link ReactiveMongoTransactionManager}.
-	 *
-	 * @author Christoph Strobl
-	 * @author Mark Paluch
-	 * @since 2.2
-	 * @see ReactiveMongoResourceHolder
-	 */
-	protected static class ReactiveMongoTransactionObject implements SmartTransactionObject {
-
-		private @Nullable ReactiveMongoResourceHolder resourceHolder;
-
-		ReactiveMongoTransactionObject(@Nullable ReactiveMongoResourceHolder resourceHolder) {
-			this.resourceHolder = resourceHolder;
-		}
-
-		/**
-		 * Set the {@link MongoResourceHolder}.
-		 *
-		 * @param resourceHolder can be {@literal null}.
-		 */
-		void setResourceHolder(@Nullable ReactiveMongoResourceHolder resourceHolder) {
-			this.resourceHolder = resourceHolder;
-		}
-
-		/**
-		 * @return {@literal true} if a {@link MongoResourceHolder} is set.
-		 */
-		final boolean hasResourceHolder() {
-			return resourceHolder != null;
-		}
-
-		/**
-		 * Start a MongoDB transaction optionally given {@link TransactionOptions}.
-		 *
-		 * @param options can be {@literal null}
-		 */
-		void startTransaction(@Nullable TransactionOptions options) {
-
-			ClientSession session = getRequiredSession();
-			if (options != null) {
-				session.startTransaction(options);
-			} else {
-				session.startTransaction();
-			}
-		}
-
-		/**
-		 * Commit the transaction.
-		 */
-		public Mono<Void> commitTransaction() {
-			return Mono.from(getRequiredSession().commitTransaction());
-		}
-
-		/**
-		 * Rollback (abort) the transaction.
-		 */
-		public Mono<Void> abortTransaction() {
-			return Mono.from(getRequiredSession().abortTransaction());
-		}
-
-		/**
-		 * Close a {@link ClientSession} without regard to its transactional state.
-		 */
-		void closeSession() {
-
-			ClientSession session = getRequiredSession();
-			if (session.getServerSession() != null && !session.getServerSession().isClosed()) {
-				session.close();
-			}
-		}
-
-		@Nullable
-		public ClientSession getSession() {
-			return resourceHolder != null ? resourceHolder.getSession() : null;
-		}
-
-		private ReactiveMongoResourceHolder getRequiredResourceHolder() {
-
-			Assert.state(resourceHolder != null, "ReactiveMongoResourceHolder is required but not present. o_O");
-			return resourceHolder;
-		}
-
-		private ClientSession getRequiredSession() {
-
-			ClientSession session = getSession();
-			Assert.state(session != null, "A Session is required but it turned out to be null.");
-			return session;
-		}
-
-		/* 
-		 * (non-Javadoc)
-		 * @see org.springframework.transaction.support.SmartTransactionObject#isRollbackOnly()
-		 */
-		@Override
-		public boolean isRollbackOnly() {
-			return this.resourceHolder != null && this.resourceHolder.isRollbackOnly();
-		}
-
-		/* 
-		 * (non-Javadoc)
-		 * @see org.springframework.transaction.support.SmartTransactionObject#flush()
-		 */
-		@Override
-		public void flush() {
-			throw new UnsupportedOperationException("flush() not supported");
-		}
-	}
-}

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

@@ -51,6 +51,7 @@ import org.springframework.core.type.filter.AssignableTypeFilter;
 import org.springframework.core.type.filter.TypeFilter;
 import org.springframework.data.annotation.Persistent;
 import org.springframework.data.config.BeanComponentDefinitionBuilder;
+import org.springframework.data.mapping.context.MappingContextIsNewStrategyFactory;
 import org.springframework.data.mapping.model.CamelCaseAbbreviatingFieldNamingStrategy;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
@@ -101,6 +102,8 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 		BeanDefinition conversionsDefinition = getCustomConversions(element, parserContext);
 		String ctxRef = potentiallyCreateMappingContext(element, parserContext, conversionsDefinition, id);
 
+		createIsNewStrategyFactoryBeanDefinition(ctxRef, parserContext, element);
+
 		// Need a reference to a Mongo instance
 		String dbFactoryRef = element.getAttribute("db-factory-ref");
 		if (!StringUtils.hasText(dbFactoryRef)) {
@@ -345,6 +348,20 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 		return null;
 	}
 
+	public static String createIsNewStrategyFactoryBeanDefinition(String mappingContextRef, ParserContext context,
+			Element element) {
+
+		BeanDefinitionBuilder mappingContextStrategyFactoryBuilder = BeanDefinitionBuilder
+				.rootBeanDefinition(MappingContextIsNewStrategyFactory.class);
+		mappingContextStrategyFactoryBuilder.addConstructorArgReference(mappingContextRef);
+
+		BeanComponentDefinitionBuilder builder = new BeanComponentDefinitionBuilder(element, context);
+		context.registerBeanComponent(
+				builder.getComponent(mappingContextStrategyFactoryBuilder, IS_NEW_STRATEGY_FACTORY_BEAN_NAME));
+
+		return IS_NEW_STRATEGY_FACTORY_BEAN_NAME;
+	}
+
 	/**
 	 * {@link TypeFilter} that returns {@literal false} in case any of the given delegates matches.
 	 *

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

@@ -18,7 +18,6 @@ package org.springframework.data.mongodb.config;
 import static org.springframework.data.config.ParsingUtils.*;
 import static org.springframework.data.mongodb.config.BeanNames.*;
 
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.RootBeanDefinition;
@@ -27,33 +26,25 @@ import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.data.auditing.config.IsNewAwareAuditingHandlerBeanDefinitionParser;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
-import org.springframework.data.mongodb.core.mapping.event.AuditingEntityCallback;
-import org.springframework.data.mongodb.core.mapping.event.ReactiveAuditingEntityCallback;
-import org.springframework.lang.Nullable;
-import org.springframework.util.ClassUtils;
+import org.springframework.data.mongodb.core.mapping.event.AuditingEventListener;
 import org.springframework.util.StringUtils;
-
 import org.w3c.dom.Element;
 
 /**
- * {@link BeanDefinitionParser} to register a {@link AuditingEntityCallback} to transparently set auditing information
- * on an entity.
+ * {@link BeanDefinitionParser} to register a {@link AuditingEventListener} to transparently set auditing information on
+ * an entity.
  *
  * @author Oliver Gierke
- * @author Mark Paluch
  */
 public class MongoAuditingBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
 
-	private static boolean PROJECT_REACTOR_AVAILABLE = ClassUtils.isPresent("reactor.core.publisher.Mono",
-			MongoAuditingRegistrar.class.getClassLoader());
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser#getBeanClass(org.w3c.dom.Element)
 	 */
 	@Override
 	protected Class<?> getBeanClass(Element element) {
-		return AuditingEntityCallback.class;
+		return AuditingEventListener.class;
 	}
 
 	/*
@@ -89,24 +80,7 @@ public class MongoAuditingBeanDefinitionParser extends AbstractSingleBeanDefinit
 				mappingContextRef);
 		parser.parse(element, parserContext);
 
-		AbstractBeanDefinition isNewAwareAuditingHandler = getObjectFactoryBeanDefinition(parser.getResolvedBeanName(),
-				parserContext.extractSource(element));
-		builder.addConstructorArgValue(isNewAwareAuditingHandler);
-
-		if (PROJECT_REACTOR_AVAILABLE) {
-			registerReactiveAuditingEntityCallback(parserContext.getRegistry(), isNewAwareAuditingHandler,
-					parserContext.extractSource(element));
-		}
-	}
-
-	private void registerReactiveAuditingEntityCallback(BeanDefinitionRegistry registry,
-			AbstractBeanDefinition isNewAwareAuditingHandler, @Nullable Object source) {
-
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(ReactiveAuditingEntityCallback.class);
-
-		builder.addConstructorArgValue(isNewAwareAuditingHandler);
-		builder.getRawBeanDefinition().setSource(source);
-
-		registry.registerBeanDefinition(ReactiveAuditingEntityCallback.class.getName(), builder.getBeanDefinition());
+		builder.addConstructorArgValue(getObjectFactoryBeanDefinition(parser.getResolvedBeanName(),
+				parserContext.extractSource(element)));
 	}
 }

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

@@ -32,23 +32,17 @@ 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.event.AuditingEntityCallback;
-import org.springframework.data.mongodb.core.mapping.event.ReactiveAuditingEntityCallback;
+import org.springframework.data.mongodb.core.mapping.event.AuditingEventListener;
 import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
 
 /**
  * {@link ImportBeanDefinitionRegistrar} to enable {@link EnableMongoAuditing} annotation.
  *
  * @author Thomas Darimont
  * @author Oliver Gierke
- * @author Mark Paluch
  */
 class MongoAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
 
-	private static boolean PROJECT_REACTOR_AVAILABLE = ClassUtils.isPresent("reactor.core.publisher.Mono",
-			MongoAuditingRegistrar.class.getClassLoader());
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#getAnnotation()
@@ -110,27 +104,12 @@ class MongoAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
 		Assert.notNull(registry, "BeanDefinitionRegistry must not be null!");
 
 		BeanDefinitionBuilder listenerBeanDefinitionBuilder = BeanDefinitionBuilder
-				.rootBeanDefinition(AuditingEntityCallback.class);
+				.rootBeanDefinition(AuditingEventListener.class);
 		listenerBeanDefinitionBuilder
 				.addConstructorArgValue(ParsingUtils.getObjectFactoryBeanDefinition(getAuditingHandlerBeanName(), registry));
 
 		registerInfrastructureBeanWithId(listenerBeanDefinitionBuilder.getBeanDefinition(),
-				AuditingEntityCallback.class.getName(), registry);
-
-		if (PROJECT_REACTOR_AVAILABLE) {
-			registerReactiveAuditingEntityCallback(registry, auditingHandlerDefinition.getSource());
-		}
-	}
-
-	private void registerReactiveAuditingEntityCallback(BeanDefinitionRegistry registry, Object source) {
-
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(ReactiveAuditingEntityCallback.class);
-
-		builder.addConstructorArgValue(ParsingUtils.getObjectFactoryBeanDefinition(getAuditingHandlerBeanName(), registry));
-		builder.getRawBeanDefinition().setSource(source);
-
-		registerInfrastructureBeanWithId(builder.getBeanDefinition(), ReactiveAuditingEntityCallback.class.getName(),
-				registry);
+				AuditingEventListener.class.getName(), registry);
 	}
 
 	/**

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

@@ -15,6 +15,7 @@
  */
 package org.springframework.data.mongodb.config;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -27,12 +28,17 @@ import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.data.annotation.Persistent;
 import org.springframework.data.convert.CustomConversions;
+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.core.convert.MongoCustomConversions;
 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;
 
@@ -81,11 +87,23 @@ public abstract class MongoConfigurationSupport {
 		mappingContext.setInitialEntitySet(getInitialEntitySet());
 		mappingContext.setSimpleTypeHolder(customConversions().getSimpleTypeHolder());
 		mappingContext.setFieldNamingStrategy(fieldNamingStrategy());
-		mappingContext.setAutoIndexCreation(autoIndexCreation());
 
 		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
@@ -172,16 +190,4 @@ public abstract class MongoConfigurationSupport {
 		return abbreviateFieldNames() ? new CamelCaseAbbreviatingFieldNamingStrategy()
 				: PropertyNameFieldNamingStrategy.INSTANCE;
 	}
-
-	/**
-	 * Configure whether to automatically create indices for domain types by deriving the
-	 * {@link org.springframework.data.mongodb.core.index.IndexDefinition} from the entity or not.
-	 *
-	 * @return {@literal true} by default. <br />
-	 *         <strong>INFO</strong>: As of 3.x the default will be set to {@literal false}.
-	 * @since 2.2
-	 */
-	protected boolean autoIndexCreation() {
-		return true;
-	}
 }

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

@@ -17,7 +17,6 @@ package org.springframework.data.mongodb.config;
 
 import java.beans.PropertyEditorSupport;
 import java.io.UnsupportedEncodingException;
-import java.lang.reflect.Method;
 import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,7 +26,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.springframework.lang.Nullable;
-import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 
 import com.mongodb.MongoCredential;
@@ -80,23 +78,12 @@ public class MongoCredentialPropertyEditor extends PropertyEditorSupport {
 
 						verifyUserNamePresent(userNameAndPassword);
 						credentials.add(MongoCredential.createGSSAPICredential(userNameAndPassword[0]));
-					} else if ("MONGODB-CR".equals(authMechanism)) {
+					} else if (MongoCredential.MONGODB_CR_MECHANISM.equals(authMechanism)) {
 
 						verifyUsernameAndPasswordPresent(userNameAndPassword);
 						verifyDatabasePresent(database);
-
-						Method createCRCredentialMethod = ReflectionUtils.findMethod(MongoCredential.class,
-								"createMongoCRCredential", String.class, String.class, char[].class);
-
-						if (createCRCredentialMethod == null) {
-							throw new IllegalArgumentException("MONGODB-CR is no longer supported.");
-						}
-
-						MongoCredential credential = MongoCredential.class
-								.cast(ReflectionUtils.invokeMethod(createCRCredentialMethod, null, userNameAndPassword[0], database,
-										userNameAndPassword[1].toCharArray()));
-						credentials.add(credential);
-
+						credentials.add(MongoCredential.createMongoCRCredential(userNameAndPassword[0], database,
+								userNameAndPassword[1].toCharArray()));
 					} else if (MongoCredential.MONGODB_X509_MECHANISM.equals(authMechanism)) {
 
 						verifyUserNamePresent(userNameAndPassword);

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

@@ -31,7 +31,6 @@ import com.mongodb.bulk.BulkWriteResult;
  *
  * @author Tobias Trelle
  * @author Oliver Gierke
- * @author Minsu Kim
  * @since 1.9
  */
 public interface BulkOperations {
@@ -136,29 +135,6 @@ public interface BulkOperations {
 	 */
 	BulkOperations remove(List<Query> removes);
 
-	/**
-	 * Add a single replace operation to the bulk operation.
-	 *
-	 * @param query Update criteria.
-	 * @param replacement the replacement document. Must not be {@literal null}.
-	 * @return the current {@link BulkOperations} instance with the replace added, will never be {@literal null}.
-	 * @since 2.2
-	 */
-	default BulkOperations replaceOne(Query query, Object replacement) {
-		return replaceOne(query, replacement, FindAndReplaceOptions.empty());
-	}
-
-	/**
-	 * Add a single replace operation to the bulk operation.
-	 *
-	 * @param query Update criteria.
-	 * @param replacement the replacement document. Must not be {@literal null}.
-	 * @param options the {@link FindAndModifyOptions} holding additional information. Must not be {@literal null}.
-	 * @return the current {@link BulkOperations} instance with the replace added, will never be {@literal null}.
-	 * @since 2.2
-	 */
-	BulkOperations replaceOne(Query query, Object replacement, FindAndReplaceOptions options);
-
 	/**
 	 * Execute all bulk operations using the default write concern.
 	 *

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

@@ -20,7 +20,6 @@ import lombok.EqualsAndHashCode;
 import java.time.Instant;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
-import org.bson.BsonTimestamp;
 import org.bson.BsonValue;
 import org.bson.Document;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
@@ -85,19 +84,8 @@ public class ChangeStreamEvent<T> {
 	@Nullable
 	public Instant getTimestamp() {
 
-		return getBsonTimestamp() != null ? converter.getConversionService().convert(raw.getClusterTime(), Instant.class)
-				: null;
-	}
-
-	/**
-	 * Get the {@link ChangeStreamDocument#getClusterTime() cluster time}.
-	 *
-	 * @return can be {@literal null}.
-	 * @since 2.2
-	 */
-	@Nullable
-	public BsonTimestamp getBsonTimestamp() {
-		return raw != null ? raw.getClusterTime() : null;
+		return raw != null && raw.getClusterTime() != null
+				? converter.getConversionService().convert(raw.getClusterTime(), Instant.class) : null;
 	}
 
 	/**

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

@@ -21,17 +21,12 @@ import java.time.Instant;
 import java.util.Arrays;
 import java.util.Optional;
 
-import org.bson.BsonDocument;
-import org.bson.BsonTimestamp;
 import org.bson.BsonValue;
 import org.bson.Document;
-
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.ObjectUtils;
 
 import com.mongodb.client.model.changestream.ChangeStreamDocument;
 import com.mongodb.client.model.changestream.FullDocument;
@@ -52,8 +47,7 @@ public class ChangeStreamOptions {
 	private @Nullable BsonValue resumeToken;
 	private @Nullable FullDocument fullDocumentLookup;
 	private @Nullable Collation collation;
-	private @Nullable Object resumeTimestamp;
-	private Resume resume = Resume.UNDEFINED;
+	private @Nullable Instant resumeTimestamp;
 
 	protected ChangeStreamOptions() {}
 
@@ -89,31 +83,7 @@ public class ChangeStreamOptions {
 	 * @return {@link Optional#empty()} if not set.
 	 */
 	public Optional<Instant> getResumeTimestamp() {
-		return Optional.ofNullable(resumeTimestamp).map(timestamp -> asTimestampOfType(timestamp, Instant.class));
-	}
-
-	/**
-	 * @return {@link Optional#empty()} if not set.
-	 * @since 2.2
-	 */
-	public Optional<BsonTimestamp> getResumeBsonTimestamp() {
-		return Optional.ofNullable(resumeTimestamp).map(timestamp -> asTimestampOfType(timestamp, BsonTimestamp.class));
-	}
-
-	/**
-	 * @return {@literal true} if the change stream should be started after the {@link #getResumeToken() token}.
-	 * @since 2.2
-	 */
-	public boolean isStartAfter() {
-		return Resume.START_AFTER.equals(resume);
-	}
-
-	/**
-	 * @return {@literal true} if the change stream should be resumed after the {@link #getResumeToken() token}.
-	 * @since 2.2
-	 */
-	public boolean isResumeAfter() {
-		return Resume.RESUME_AFTER.equals(resume);
+		return Optional.ofNullable(resumeTimestamp);
 	}
 
 	/**
@@ -133,48 +103,6 @@ public class ChangeStreamOptions {
 		return new ChangeStreamOptionsBuilder();
 	}
 
-	private static <T> T asTimestampOfType(Object timestamp, Class<T> targetType) {
-		return targetType.cast(doGetTimestamp(timestamp, targetType));
-	}
-
-	private static <T> Object doGetTimestamp(Object timestamp, Class<T> targetType) {
-
-		if (ClassUtils.isAssignableValue(targetType, timestamp)) {
-			return timestamp;
-		}
-
-		if (timestamp instanceof Instant) {
-			return new BsonTimestamp((int) ((Instant) timestamp).getEpochSecond(), 0);
-		}
-
-		if (timestamp instanceof BsonTimestamp) {
-			return Instant.ofEpochSecond(((BsonTimestamp) timestamp).getTime());
-		}
-
-		throw new IllegalArgumentException(
-				"o_O that should actually not happen. The timestamp should be an Instant or a BsonTimestamp but was "
-						+ ObjectUtils.nullSafeClassName(timestamp));
-	}
-
-	/**
-	 * @author Christoph Strobl
-	 * @since 2.2
-	 */
-	enum Resume {
-
-		UNDEFINED,
-
-		/**
-		 * @see com.mongodb.client.ChangeStreamIterable#startAfter(BsonDocument)
-		 */
-		START_AFTER,
-
-		/**
-		 * @see com.mongodb.client.ChangeStreamIterable#resumeAfter(BsonDocument)
-		 */
-		RESUME_AFTER
-	}
-
 	/**
 	 * Builder for creating {@link ChangeStreamOptions}.
 	 *
@@ -187,8 +115,7 @@ public class ChangeStreamOptions {
 		private @Nullable BsonValue resumeToken;
 		private @Nullable FullDocument fullDocumentLookup;
 		private @Nullable Collation collation;
-		private @Nullable Object resumeTimestamp;
-		private Resume resume = Resume.UNDEFINED;
+		private @Nullable Instant resumeTimestamp;
 
 		private ChangeStreamOptionsBuilder() {}
 
@@ -256,11 +183,6 @@ public class ChangeStreamOptions {
 			Assert.notNull(resumeToken, "ResumeToken must not be null!");
 
 			this.resumeToken = resumeToken;
-
-			if (this.resume == Resume.UNDEFINED) {
-				this.resume = Resume.RESUME_AFTER;
-			}
-
 			return this;
 		}
 
@@ -302,51 +224,6 @@ public class ChangeStreamOptions {
 			return this;
 		}
 
-		/**
-		 * Set the cluster time to resume from.
-		 *
-		 * @param resumeTimestamp must not be {@literal null}.
-		 * @return this.
-		 * @since 2.2
-		 */
-		public ChangeStreamOptionsBuilder resumeAt(BsonTimestamp resumeTimestamp) {
-
-			Assert.notNull(resumeTimestamp, "ResumeTimestamp must not be null!");
-
-			this.resumeTimestamp = resumeTimestamp;
-			return this;
-		}
-
-		/**
-		 * Set the resume token after which to continue emitting notifications.
-		 *
-		 * @param resumeToken must not be {@literal null}.
-		 * @return this.
-		 * @since 2.2
-		 */
-		public ChangeStreamOptionsBuilder resumeAfter(BsonValue resumeToken) {
-
-			resumeToken(resumeToken);
-			this.resume = Resume.RESUME_AFTER;
-
-			return this;
-		}
-
-		/**
-		 * Set the resume token after which to start emitting notifications.
-		 *
-		 * @param resumeToken must not be {@literal null}.
-		 * @return this.
-		 * @since 2.2
-		 */
-		public ChangeStreamOptionsBuilder startAfter(BsonValue resumeToken) {
-
-			resumeToken(resumeToken);
-			this.resume = Resume.START_AFTER;
-
-			return this;
-		}
-
 		/**
 		 * @return the built {@link ChangeStreamOptions}
 		 */
@@ -354,12 +231,11 @@ public class ChangeStreamOptions {
 
 			ChangeStreamOptions options = new ChangeStreamOptions();
 
-			options.filter = this.filter;
-			options.resumeToken = this.resumeToken;
-			options.fullDocumentLookup = this.fullDocumentLookup;
-			options.collation = this.collation;
-			options.resumeTimestamp = this.resumeTimestamp;
-			options.resume = this.resume;
+			options.filter = filter;
+			options.resumeToken = resumeToken;
+			options.fullDocumentLookup = fullDocumentLookup;
+			options.collation = collation;
+			options.resumeTimestamp = resumeTimestamp;
 
 			return options;
 		}

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

@@ -15,6 +15,9 @@
  */
 package org.springframework.data.mongodb.core;
 
+import lombok.NonNull;
+import lombok.Value;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -23,18 +26,11 @@ import java.util.stream.Collectors;
 
 import org.bson.Document;
 import org.bson.conversions.Bson;
-import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.dao.DataAccessException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
-import org.springframework.data.mapping.callback.EntityCallbacks;
 import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.convert.UpdateMapper;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
-import org.springframework.data.mongodb.core.mapping.event.AfterSaveEvent;
-import org.springframework.data.mongodb.core.mapping.event.BeforeConvertCallback;
-import org.springframework.data.mongodb.core.mapping.event.BeforeConvertEvent;
-import org.springframework.data.mongodb.core.mapping.event.BeforeSaveCallback;
-import org.springframework.data.mongodb.core.mapping.event.BeforeSaveEvent;
-import org.springframework.data.mongodb.core.mapping.event.MongoMappingEvent;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
@@ -42,13 +38,18 @@ import org.springframework.data.util.Pair;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
+import com.mongodb.BulkWriteException;
 import com.mongodb.WriteConcern;
-import com.mongodb.bulk.BulkWriteResult;
 import com.mongodb.client.MongoCollection;
-import com.mongodb.client.model.*;
-
-import lombok.NonNull;
-import lombok.Value;
+import com.mongodb.client.model.BulkWriteOptions;
+import com.mongodb.client.model.DeleteManyModel;
+import com.mongodb.client.model.DeleteOneModel;
+import com.mongodb.client.model.DeleteOptions;
+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}.
@@ -57,8 +58,6 @@ import lombok.Value;
  * @author Oliver Gierke
  * @author Christoph Strobl
  * @author Mark Paluch
- * @author Minsu Kim
- * @author Jens Schauder
  * @since 1.9
  */
 class DefaultBulkOperations implements BulkOperations {
@@ -66,7 +65,7 @@ class DefaultBulkOperations implements BulkOperations {
 	private final MongoOperations mongoOperations;
 	private final String collectionName;
 	private final BulkOperationContext bulkOperationContext;
-	private final List<SourceAwareWriteModelHolder> models = new ArrayList<>();
+	private final List<WriteModel<Document>> models = new ArrayList<>();
 
 	private PersistenceExceptionTranslator exceptionTranslator;
 	private @Nullable WriteConcern defaultWriteConcern;
@@ -123,9 +122,16 @@ class DefaultBulkOperations implements BulkOperations {
 
 		Assert.notNull(document, "Document must not be null!");
 
-		maybeEmitEvent(new BeforeConvertEvent<>(document, collectionName));
-		Object source = maybeInvokeBeforeConvertCallback(document);
-		addModel(source, new InsertOneModel<>(getMappedObject(source)));
+		if (document instanceof Document) {
+
+			models.add(new InsertOneModel<>((Document) document));
+			return this;
+		}
+
+		Document sink = new Document();
+		mongoOperations.getConverter().write(document, sink);
+
+		models.add(new InsertOneModel<>(sink));
 
 		return this;
 	}
@@ -239,7 +245,7 @@ class DefaultBulkOperations implements BulkOperations {
 		DeleteOptions deleteOptions = new DeleteOptions();
 		query.getCollation().map(Collation::toMongoCollation).ifPresent(deleteOptions::collation);
 
-		addModel(query, new DeleteManyModel<>(query.getQueryObject(), deleteOptions));
+		models.add(new DeleteManyModel<>(query.getQueryObject(), deleteOptions));
 
 		return this;
 	}
@@ -260,29 +266,6 @@ class DefaultBulkOperations implements BulkOperations {
 		return this;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.BulkOperations#replaceOne(org.springframework.data.mongodb.core.query.Query, java.lang.Object, org.springframework.data.mongodb.core.FindAndReplaceOptions)
-	 */
-	@Override
-	public BulkOperations replaceOne(Query query, Object replacement, FindAndReplaceOptions options) {
-
-		Assert.notNull(query, "Query must not be null!");
-		Assert.notNull(replacement, "Replacement must not be null!");
-		Assert.notNull(options, "Options must not be null!");
-
-		ReplaceOptions replaceOptions = new ReplaceOptions();
-		replaceOptions.upsert(options.isUpsert());
-		query.getCollation().map(Collation::toMongoCollation).ifPresent(replaceOptions::collation);
-
-		maybeEmitEvent(new BeforeConvertEvent<>(replacement, collectionName));
-		Object source = maybeInvokeBeforeConvertCallback(replacement);
-		addModel(source,
-				new ReplaceOneModel<>(getMappedQuery(query.getQueryObject()), getMappedObject(source), replaceOptions));
-
-		return this;
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.BulkOperations#executeBulk()
@@ -291,45 +274,15 @@ class DefaultBulkOperations implements BulkOperations {
 	public com.mongodb.bulk.BulkWriteResult execute() {
 
 		try {
-
-			com.mongodb.bulk.BulkWriteResult result = mongoOperations.execute(collectionName, this::bulkWriteTo);
-
-			Assert.state(result != null, "Result must not be null.");
-
-			models.forEach(this::maybeEmitAfterSaveEvent);
-
-			return result;
+			
+			return mongoOperations.execute(collectionName, collection -> {
+				return collection.bulkWrite(models.stream().map(this::mapWriteModel).collect(Collectors.toList()), bulkOptions);
+			});
 		} finally {
 			this.bulkOptions = getBulkWriteOptions(bulkOperationContext.getBulkMode());
 		}
 	}
 
-	private BulkWriteResult bulkWriteTo(MongoCollection<Document> collection) {
-
-		return collection.bulkWrite( //
-				models.stream() //
-						.map(this::extractAndMapWriteModel) //
-						.collect(Collectors.toList()), //
-				bulkOptions);
-	}
-
-	private WriteModel<Document> extractAndMapWriteModel(SourceAwareWriteModelHolder it) {
-
-		maybeEmitBeforeSaveEvent(it);
-
-		if (it.getModel() instanceof InsertOneModel) {
-
-			Document target = ((InsertOneModel<Document>) it.getModel()).getDocument();
-			maybeInvokeBeforeSaveCallback(it.getSource(), target);
-		} else if (it.getModel() instanceof ReplaceOneModel) {
-
-			Document target = ((ReplaceOneModel<Document>) it.getModel()).getReplacement();
-			maybeInvokeBeforeSaveCallback(it.getSource(), target);
-		}
-
-		return mapWriteModel(it.getModel());
-	}
-
 	/**
 	 * Performs update and upsert bulk operations.
 	 *
@@ -349,9 +302,9 @@ class DefaultBulkOperations implements BulkOperations {
 		query.getCollation().map(Collation::toMongoCollation).ifPresent(options::collation);
 
 		if (multi) {
-			addModel(update, new UpdateManyModel<>(query.getQueryObject(), update.getUpdateObject(), options));
+			models.add(new UpdateManyModel<>(query.getQueryObject(), update.getUpdateObject(), options));
 		} else {
-			addModel(update, new UpdateOneModel<>(query.getQueryObject(), update.getUpdateObject(), options));
+			models.add(new UpdateOneModel<>(query.getQueryObject(), update.getUpdateObject(), options));
 		}
 
 		return this;
@@ -400,76 +353,6 @@ class DefaultBulkOperations implements BulkOperations {
 		return bulkOperationContext.getQueryMapper().getMappedObject(query, bulkOperationContext.getEntity());
 	}
 
-	private Document getMappedObject(Object source) {
-
-		if (source instanceof Document) {
-			return (Document) source;
-		}
-
-		Document sink = new Document();
-
-		mongoOperations.getConverter().write(source, sink);
-		return sink;
-	}
-
-	private void addModel(Object source, WriteModel<Document> model) {
-		models.add(new SourceAwareWriteModelHolder(source, model));
-	}
-
-	private void maybeEmitBeforeSaveEvent(SourceAwareWriteModelHolder it) {
-
-		if (it.getModel() instanceof InsertOneModel) {
-
-			Document target = ((InsertOneModel<Document>) it.getModel()).getDocument();
-			maybeEmitEvent(new BeforeSaveEvent<>(it.getSource(), target, collectionName));
-		} else if (it.getModel() instanceof ReplaceOneModel) {
-
-			Document target = ((ReplaceOneModel<Document>) it.getModel()).getReplacement();
-			maybeEmitEvent(new BeforeSaveEvent<>(it.getSource(), target, collectionName));
-		}
-	}
-
-	private void maybeEmitAfterSaveEvent(SourceAwareWriteModelHolder it) {
-
-		if (it.getModel() instanceof InsertOneModel) {
-
-			Document target = ((InsertOneModel<Document>) it.getModel()).getDocument();
-			maybeEmitEvent(new AfterSaveEvent<>(it.getSource(), target, collectionName));
-		} else if (it.getModel() instanceof ReplaceOneModel) {
-
-			Document target = ((ReplaceOneModel<Document>) it.getModel()).getReplacement();
-			maybeEmitEvent(new AfterSaveEvent<>(it.getSource(), target, collectionName));
-		}
-	}
-
-	private <E extends MongoMappingEvent<T>, T> E maybeEmitEvent(E event) {
-
-		if (null != bulkOperationContext.getEventPublisher()) {
-			bulkOperationContext.getEventPublisher().publishEvent(event);
-		}
-
-		return event;
-	}
-
-	private Object maybeInvokeBeforeConvertCallback(Object value) {
-
-		if (bulkOperationContext.getEntityCallbacks() == null) {
-			return value;
-		}
-
-		return bulkOperationContext.getEntityCallbacks().callback(BeforeConvertCallback.class, value, collectionName);
-	}
-
-	private Object maybeInvokeBeforeSaveCallback(Object value, Document mappedDocument) {
-
-		if (bulkOperationContext.getEntityCallbacks() == null) {
-			return value;
-		}
-
-		return bulkOperationContext.getEntityCallbacks().callback(BeforeSaveCallback.class, value, mappedDocument,
-				collectionName);
-	}
-
 	private static BulkWriteOptions getBulkWriteOptions(BulkMode bulkMode) {
 
 		BulkWriteOptions options = new BulkWriteOptions();
@@ -499,20 +382,5 @@ class DefaultBulkOperations implements BulkOperations {
 		@NonNull Optional<? extends MongoPersistentEntity<?>> entity;
 		@NonNull QueryMapper queryMapper;
 		@NonNull UpdateMapper updateMapper;
-		ApplicationEventPublisher eventPublisher;
-		EntityCallbacks entityCallbacks;
-	}
-
-	/**
-	 * Value object chaining together an actual source with its {@link WriteModel} representation.
-	 *
-	 * @since 2.2
-	 * @author Christoph Strobl
-	 */
-	@Value
-	private static class SourceAwareWriteModelHolder {
-
-		Object source;
-		WriteModel<Document> model;
 	}
 }

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

@@ -120,15 +120,19 @@ public class DefaultIndexOperations implements IndexOperations {
 
 		return execute(collection -> {
 
-			MongoPersistentEntity<?> entity = lookupPersistentEntity(type, collectionName);
+			Document indexOptions = indexDefinition.getIndexOptions();
 
-			IndexOptions indexOptions = IndexConverters.indexDefinitionToIndexOptionsConverter().convert(indexDefinition);
+			IndexOptions ops = IndexConverters.indexDefinitionToIndexOptionsConverter().convert(indexDefinition);
 
-			indexOptions = addPartialFilterIfPresent(indexOptions, indexDefinition.getIndexOptions(), entity);
-			indexOptions = addDefaultCollationIfRequired(indexOptions, entity);
+			if (indexOptions.containsKey(PARTIAL_FILTER_EXPRESSION_KEY)) {
 
-			Document mappedKeys = mapper.getMappedObject(indexDefinition.getIndexKeys(), entity);
-			return collection.createIndex(mappedKeys, indexOptions);
+				Assert.isInstanceOf(Document.class, indexOptions.get(PARTIAL_FILTER_EXPRESSION_KEY));
+
+				ops.partialFilterExpression(mapper.getMappedObject((Document) indexOptions.get(PARTIAL_FILTER_EXPRESSION_KEY),
+						lookupPersistentEntity(type, collectionName)));
+			}
+
+			return collection.createIndex(indexDefinition.getIndexKeys(), ops);
 		});
 	}
 
@@ -188,7 +192,7 @@ public class DefaultIndexOperations implements IndexOperations {
 
 			private List<IndexInfo> getIndexData(MongoCursor<Document> cursor) {
 
-				List<IndexInfo> indexInfoList = new ArrayList<>();
+				List<IndexInfo> indexInfoList = new ArrayList<IndexInfo>();
 
 				while (cursor.hasNext()) {
 
@@ -213,25 +217,4 @@ public class DefaultIndexOperations implements IndexOperations {
 
 		return mongoOperations.execute(collectionName, callback);
 	}
-
-	private IndexOptions addPartialFilterIfPresent(IndexOptions ops, Document sourceOptions,
-			@Nullable MongoPersistentEntity<?> entity) {
-
-		if (!sourceOptions.containsKey(PARTIAL_FILTER_EXPRESSION_KEY)) {
-			return ops;
-		}
-
-		Assert.isInstanceOf(Document.class, sourceOptions.get(PARTIAL_FILTER_EXPRESSION_KEY));
-		return ops.partialFilterExpression(
-				mapper.getMappedObject((Document) sourceOptions.get(PARTIAL_FILTER_EXPRESSION_KEY), entity));
-	}
-
-	private static IndexOptions addDefaultCollationIfRequired(IndexOptions ops, MongoPersistentEntity<?> entity) {
-
-		if (ops.getCollation() != null || entity == null || !entity.hasCollation()) {
-			return ops;
-		}
-
-		return ops.collation(entity.getCollation().toMongoCollation());
-	}
 }

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

@@ -94,16 +94,23 @@ public class DefaultReactiveIndexOperations implements ReactiveIndexOperations {
 
 		return mongoOperations.execute(collectionName, collection -> {
 
-			MongoPersistentEntity<?> entity = type
-					.map(val -> (MongoPersistentEntity) queryMapper.getMappingContext().getRequiredPersistentEntity(val))
-					.orElseGet(() -> lookupPersistentEntity(collectionName));
+			Document indexOptions = indexDefinition.getIndexOptions();
 
-			IndexOptions indexOptions = IndexConverters.indexDefinitionToIndexOptionsConverter().convert(indexDefinition);
+			IndexOptions ops = IndexConverters.indexDefinitionToIndexOptionsConverter().convert(indexDefinition);
 
-			indexOptions = addPartialFilterIfPresent(indexOptions, indexDefinition.getIndexOptions(), entity);
-			indexOptions = addDefaultCollationIfRequired(indexOptions, entity);
+			if (indexOptions.containsKey(PARTIAL_FILTER_EXPRESSION_KEY)) {
 
-			return collection.createIndex(indexDefinition.getIndexKeys(), indexOptions);
+				Assert.isInstanceOf(Document.class, indexOptions.get(PARTIAL_FILTER_EXPRESSION_KEY));
+
+				MongoPersistentEntity<?> entity = type
+						.map(val -> (MongoPersistentEntity) queryMapper.getMappingContext().getRequiredPersistentEntity(val))
+						.orElseGet(() -> lookupPersistentEntity(collectionName));
+
+				ops = ops.partialFilterExpression(
+						queryMapper.getMappedObject(indexOptions.get(PARTIAL_FILTER_EXPRESSION_KEY, Document.class), entity));
+			}
+
+			return collection.createIndex(indexDefinition.getIndexKeys(), ops);
 
 		}).next();
 	}
@@ -119,24 +126,21 @@ public class DefaultReactiveIndexOperations implements ReactiveIndexOperations {
 				.orElse(null);
 	}
 
-	/*
-	 * (non-Javadoc)
+	/* (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.index.ReactiveIndexOperations#dropIndex(java.lang.String)
 	 */
 	public Mono<Void> dropIndex(final String name) {
 		return mongoOperations.execute(collectionName, collection -> collection.dropIndex(name)).then();
 	}
 
-	/*
-	 * (non-Javadoc)
+	/* (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.index.ReactiveIndexOperations#dropAllIndexes()
 	 */
 	public Mono<Void> dropAllIndexes() {
 		return dropIndex("*");
 	}
 
-	/*
-	 * (non-Javadoc)
+	/* (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.index.ReactiveIndexOperations#getIndexInfo()
 	 */
 	public Flux<IndexInfo> getIndexInfo() {
@@ -144,25 +148,4 @@ public class DefaultReactiveIndexOperations implements ReactiveIndexOperations {
 		return mongoOperations.execute(collectionName, collection -> collection.listIndexes(Document.class)) //
 				.map(IndexConverters.documentToIndexInfoConverter()::convert);
 	}
-
-	private IndexOptions addPartialFilterIfPresent(IndexOptions ops, Document sourceOptions,
-			@Nullable MongoPersistentEntity<?> entity) {
-
-		if (!sourceOptions.containsKey(PARTIAL_FILTER_EXPRESSION_KEY)) {
-			return ops;
-		}
-
-		Assert.isInstanceOf(Document.class, sourceOptions.get(PARTIAL_FILTER_EXPRESSION_KEY));
-		return ops.partialFilterExpression(
-				queryMapper.getMappedObject((Document) sourceOptions.get(PARTIAL_FILTER_EXPRESSION_KEY), entity));
-	}
-
-	private static IndexOptions addDefaultCollationIfRequired(IndexOptions ops, MongoPersistentEntity<?> entity) {
-
-		if (ops.getCollation() != null || entity == null || !entity.hasCollation()) {
-			return ops;
-		}
-
-		return ops.collation(entity.getCollation().toMongoCollation());
-	}
 }

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

@@ -42,15 +42,13 @@ import com.mongodb.MongoException;
 import com.mongodb.client.MongoDatabase;
 
 /**
- * Default implementation of {@link ScriptOperations} capable of saving and executing {@link ExecutableMongoScript}.
+ * Default implementation of {@link ScriptOperations} capable of saving and executing {@link ServerSideJavaScript}.
  *
  * @author Christoph Strobl
  * @author Oliver Gierke
  * @author Mark Paluch
  * @since 1.7
- * @deprecated since 2.2. The {@code eval} command has been removed in MongoDB Server 4.2.0.
  */
-@Deprecated
 class DefaultScriptOperations implements ScriptOperations {
 
 	private static final String SCRIPT_COLLECTION_NAME = "system.js";

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

@@ -21,14 +21,12 @@ import lombok.RequiredArgsConstructor;
 
 import java.util.Collection;
 import java.util.Map;
-import java.util.Optional;
 
 import org.bson.Document;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.mapping.IdentifierAccessor;
 import org.springframework.data.mapping.MappingException;
-import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.model.ConvertingPropertyAccessor;
@@ -36,21 +34,20 @@ import org.springframework.data.mongodb.core.convert.MongoWriter;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.core.mapping.MongoSimpleTypes;
-import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
+import com.mongodb.util.JSONParseException;
+
 /**
  * Common operations performed on an entity in the context of it's mapping metadata.
  *
  * @author Oliver Gierke
  * @author Mark Paluch
- * @author Christoph Strobl
  * @since 2.1
  * @see MongoTemplate
  * @see ReactiveMongoTemplate
@@ -164,59 +161,15 @@ class EntityOperations {
 		return ID_FIELD;
 	}
 
-	/**
-	 * Return the name used for {@code $geoNear.distanceField} avoiding clashes with potentially existing properties.
-	 *
-	 * @param domainType must not be {@literal null}.
-	 * @return the name of the distanceField to use. {@literal dis} by default.
-	 * @since 2.2
-	 */
-	public String nearQueryDistanceFieldName(Class<?> domainType) {
-
-		MongoPersistentEntity<?> persistentEntity = context.getPersistentEntity(domainType);
-		if (persistentEntity == null || persistentEntity.getPersistentProperty("dis") == null) {
-			return "dis";
-		}
-
-		String distanceFieldName = "calculated-distance";
-		int counter = 0;
-		while (persistentEntity.getPersistentProperty(distanceFieldName) != null) {
-			distanceFieldName += "-" + (counter++);
-		}
-
-		return distanceFieldName;
-	}
-
 	private static Document parse(String source) {
 
 		try {
 			return Document.parse(source);
-		} catch (org.bson.json.JsonParseException o_O) {
+		} catch (JSONParseException | org.bson.json.JsonParseException o_O) {
 			throw new MappingException("Could not parse given String to save into a JSON document!", o_O);
-		} catch (RuntimeException o_O) {
-
-			// legacy 3.x exception
-			if (ClassUtils.matchesTypeName(o_O.getClass(), "JSONParseException")) {
-				throw new MappingException("Could not parse given String to save into a JSON document!", o_O);
-			}
-			throw o_O;
 		}
 	}
 
-	public <T> TypedOperations<T> forType(@Nullable Class<T> entityClass) {
-
-		if (entityClass != null) {
-
-			MongoPersistentEntity<?> entity = context.getPersistentEntity(entityClass);
-
-			if (entity != null) {
-				return new TypedEntityOperations(entity);
-			}
-
-		}
-		return UntypedOperations.instance();
-	}
-
 	/**
 	 * A representation of information about an entity.
 	 *
@@ -246,16 +199,6 @@ class EntityOperations {
 		 */
 		Query getByIdQuery();
 
-		/**
-		 * Returns the {@link Query} to remove an entity by its {@literal id} and if applicable {@literal version}.
-		 *
-		 * @return the {@link Query} to use for removing the entity. Never {@literal null}.
-		 * @since 2.2
-		 */
-		default Query getRemoveByQuery() {
-			return isVersionedEntity() ? getQueryForVersion() : getByIdQuery();
-		}
-
 		/**
 		 * Returns the {@link Query} to find the entity in its current version.
 		 *
@@ -286,11 +229,9 @@ class EntityOperations {
 		}
 
 		/**
-		 * Returns the value of the version if the entity {@link #isVersionedEntity() has a version property}.
+		 * Returns the value of the version if the entity has a version property, {@literal null} otherwise.
 		 *
-		 * @return the entity version. Can be {@literal null}.
-		 * @throws IllegalStateException if the entity does not define a {@literal version} property. Make sure to check
-		 *           {@link #isVersionedEntity()}.
+		 * @return
 		 */
 		@Nullable
 		Object getVersion();
@@ -304,7 +245,7 @@ class EntityOperations {
 
 		/**
 		 * Returns whether the entity is considered to be new.
-		 *
+		 * 
 		 * @return
 		 * @since 2.1.2
 		 */
@@ -346,8 +287,8 @@ class EntityOperations {
 		/**
 		 * Returns the current version value if the entity has a version property.
 		 *
-		 * @return the current version or {@literal null} in case it's uninitialized.
-		 * @throws IllegalStateException if the entity does not define a {@literal version} property.
+		 * @return the current version or {@literal null} in case it's uninitialized or the entity doesn't expose a version
+		 *         property.
 		 */
 		@Nullable
 		Number getVersion();
@@ -455,7 +396,7 @@ class EntityOperations {
 			return map;
 		}
 
-		/*
+		/* 
 		 * (non-Javadoc)
 		 * @see org.springframework.data.mongodb.core.EntityOperations.Entity#isNew()
 		 */
@@ -549,10 +490,10 @@ class EntityOperations {
 		public Query getQueryForVersion() {
 
 			MongoPersistentProperty idProperty = entity.getRequiredIdProperty();
-			MongoPersistentProperty versionProperty = entity.getRequiredVersionProperty();
+			MongoPersistentProperty property = entity.getRequiredVersionProperty();
 
 			return new Query(Criteria.where(idProperty.getName()).is(getId())//
-					.and(versionProperty.getName()).is(getVersion()));
+					.and(property.getName()).is(getVersion()));
 		}
 
 		/*
@@ -626,7 +567,7 @@ class EntityOperations {
 			return propertyAccessor.getBean();
 		}
 
-		/*
+		/* 
 		 * (non-Javadoc)
 		 * @see org.springframework.data.mongodb.core.EntityOperations.Entity#isNew()
 		 */
@@ -673,19 +614,22 @@ class EntityOperations {
 		public T populateIdIfNecessary(@Nullable Object id) {
 
 			if (id == null) {
-				return propertyAccessor.getBean();
+				return null;
 			}
 
+			T bean = propertyAccessor.getBean();
 			MongoPersistentProperty idProperty = entity.getIdProperty();
+
 			if (idProperty == null) {
-				return propertyAccessor.getBean();
+				return bean;
 			}
 
 			if (identifierAccessor.getIdentifier() != null) {
-				return propertyAccessor.getBean();
+				return bean;
 			}
 
 			propertyAccessor.setProperty(idProperty, id);
+
 			return propertyAccessor.getBean();
 		}
 
@@ -736,102 +680,4 @@ class EntityOperations {
 			return propertyAccessor.getBean();
 		}
 	}
-
-	/**
-	 * Type-specific operations abstraction.
-	 *
-	 * @author Mark Paluch
-	 * @param <T>
-	 * @since 2.2
-	 */
-	interface TypedOperations<T> {
-
-		/**
-		 * Return the optional {@link Collation} for the underlying entity.
-		 *
-		 * @return
-		 */
-		Optional<Collation> getCollation();
-
-		/**
-		 * Return the optional {@link Collation} from the given {@link Query} and fall back to the collation configured for
-		 * the underlying entity.
-		 *
-		 * @return
-		 */
-		Optional<Collation> getCollation(Query query);
-	}
-
-	/**
-	 * {@link TypedOperations} for generic entities that are not represented with {@link PersistentEntity} (e.g. custom
-	 * conversions).
-	 */
-	@RequiredArgsConstructor
-	enum UntypedOperations implements TypedOperations<Object> {
-
-		INSTANCE;
-
-		@SuppressWarnings({ "unchecked", "rawtypes" })
-		public static <T> TypedOperations<T> instance() {
-			return (TypedOperations) INSTANCE;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.TypedOperations#getCollation()
-		 */
-		@Override
-		public Optional<Collation> getCollation() {
-			return Optional.empty();
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.TypedOperations#getCollation(org.springframework.data.mongodb.core.query.Query)
-		 */
-		@Override
-		public Optional<Collation> getCollation(Query query) {
-
-			if (query == null) {
-				return Optional.empty();
-			}
-
-			return query.getCollation();
-		}
-	}
-
-	/**
-	 * {@link TypedOperations} backed by {@link MongoPersistentEntity}.
-	 *
-	 * @param <T>
-	 */
-	@RequiredArgsConstructor
-	static class TypedEntityOperations<T> implements TypedOperations<T> {
-
-		private final @NonNull MongoPersistentEntity<T> entity;
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.TypedOperations#getCollation()
-		 */
-		@Override
-		public Optional<Collation> getCollation() {
-			return Optional.ofNullable(entity.getCollation());
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.TypedOperations#getCollation(org.springframework.data.mongodb.core.query.Query)
-		 */
-		@Override
-		public Optional<Collation> getCollation(Query query) {
-
-			if (query.getCollation().isPresent()) {
-				return query.getCollation();
-			}
-
-			return Optional.ofNullable(entity.getCollation());
-		}
-	}
-
 }

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

@@ -33,31 +33,6 @@ public class FindAndModifyOptions {
 
 	private @Nullable Collation collation;
 
-	private static final FindAndModifyOptions NONE = new FindAndModifyOptions() {
-
-		private static final String ERROR_MSG = "FindAndModifyOptions.none() cannot be changed. Please use FindAndModifyOptions.options() instead.";
-
-		@Override
-		public FindAndModifyOptions returnNew(boolean returnNew) {
-			throw new UnsupportedOperationException(ERROR_MSG);
-		}
-
-		@Override
-		public FindAndModifyOptions upsert(boolean upsert) {
-			throw new UnsupportedOperationException(ERROR_MSG);
-		}
-
-		@Override
-		public FindAndModifyOptions remove(boolean remove) {
-			throw new UnsupportedOperationException(ERROR_MSG);
-		}
-
-		@Override
-		public FindAndModifyOptions collation(@Nullable Collation collation) {
-			throw new UnsupportedOperationException(ERROR_MSG);
-		}
-	};
-
 	/**
 	 * Static factory method to create a FindAndModifyOptions instance
 	 *
@@ -67,19 +42,9 @@ public class FindAndModifyOptions {
 		return new FindAndModifyOptions();
 	}
 
-	/**
-	 * Static factory method returning an unmodifiable {@link FindAndModifyOptions} instance.
-	 *
-	 * @return unmodifiable {@link FindAndModifyOptions} instance.
-	 * @since 2.2
-	 */
-	public static FindAndModifyOptions none() {
-		return NONE;
-	}
-
 	/**
 	 * Create new {@link FindAndModifyOptions} based on option of given {@litearl source}.
-	 *
+	 * 
 	 * @param source can be {@literal null}.
 	 * @return new instance of {@link FindAndModifyOptions}.
 	 * @since 2.0

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

@@ -36,21 +36,6 @@ public class FindAndReplaceOptions {
 	private boolean returnNew;
 	private boolean upsert;
 
-	private static final FindAndReplaceOptions NONE = new FindAndReplaceOptions() {
-
-		private static final String ERROR_MSG = "FindAndReplaceOptions.none() cannot be changed. Please use FindAndReplaceOptions.options() instead.";
-
-		@Override
-		public FindAndReplaceOptions returnNew() {
-			throw new UnsupportedOperationException(ERROR_MSG);
-		}
-
-		@Override
-		public FindAndReplaceOptions upsert() {
-			throw new UnsupportedOperationException(ERROR_MSG);
-		}
-	};
-
 	/**
 	 * Static factory method to create a {@link FindAndReplaceOptions} instance.
 	 * <dl>
@@ -66,16 +51,6 @@ public class FindAndReplaceOptions {
 		return new FindAndReplaceOptions();
 	}
 
-	/**
-	 * Static factory method returning an unmodifiable {@link FindAndReplaceOptions} instance.
-	 *
-	 * @return unmodifiable {@link FindAndReplaceOptions} instance.
-	 * @since 2.2
-	 */
-	public static FindAndReplaceOptions none() {
-		return NONE;
-	}
-
 	/**
 	 * Static factory method to create a {@link FindAndReplaceOptions} instance with
 	 * <dl>

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

@@ -92,7 +92,7 @@ public class MappedDocument {
 	 * mapped to the specific domain type.
 	 *
 	 * @author Christoph Strobl
-	 * @since 2.2
+	 * @since 2.1.4
 	 */
 	class MappedUpdate implements UpdateDefinition {
 
@@ -137,14 +137,5 @@ public class MappedDocument {
 		public Boolean isIsolated() {
 			return delegate.isIsolated();
 		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.query.UpdateDefinition#getArrayFilters()
-		 */
-		@Override
-		public List<ArrayFilter> getArrayFilters() {
-			return delegate.getArrayFilters();
-		}
 	}
 }

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

@@ -1,210 +0,0 @@
-/*
- * Copyright 2019 the original author 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
- *
- *      https://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.Collection;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.List;
-
-import org.springframework.data.mapping.PersistentProperty;
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.mongodb.core.convert.MongoConverter;
-import org.springframework.data.mongodb.core.mapping.Field;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.data.mongodb.core.schema.IdentifiableJsonSchemaProperty.ObjectJsonSchemaProperty;
-import org.springframework.data.mongodb.core.schema.JsonSchemaObject;
-import org.springframework.data.mongodb.core.schema.JsonSchemaObject.Type;
-import org.springframework.data.mongodb.core.schema.JsonSchemaProperty;
-import org.springframework.data.mongodb.core.schema.MongoJsonSchema;
-import org.springframework.data.mongodb.core.schema.MongoJsonSchema.MongoJsonSchemaBuilder;
-import org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-
-/**
- * {@link MongoJsonSchemaCreator} implementation using both {@link MongoConverter} and {@link MappingContext} to obtain
- * domain type meta information which considers {@link org.springframework.data.mongodb.core.mapping.Field field names}
- * and {@link org.springframework.data.mongodb.core.convert.MongoCustomConversions custom conversions}.
- *
- * @author Christoph Strobl
- * @author Mark Paluch
- * @since 2.2
- */
-class MappingMongoJsonSchemaCreator implements MongoJsonSchemaCreator {
-
-	private final MongoConverter converter;
-	private final MappingContext<MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
-
-	/**
-	 * Create a new instance of {@link MappingMongoJsonSchemaCreator}.
-	 *
-	 * @param converter must not be {@literal null}.
-	 */
-	@SuppressWarnings("unchecked")
-	MappingMongoJsonSchemaCreator(MongoConverter converter) {
-
-		Assert.notNull(converter, "Converter must not be null!");
-		this.converter = converter;
-		this.mappingContext = (MappingContext<MongoPersistentEntity<?>, MongoPersistentProperty>) converter
-				.getMappingContext();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * org.springframework.data.mongodb.core.MongoJsonSchemaCreator#createSchemaFor(java.lang.Class)
-	 */
-	@Override
-	public MongoJsonSchema createSchemaFor(Class<?> type) {
-
-		MongoPersistentEntity<?> entity = mappingContext.getRequiredPersistentEntity(type);
-		MongoJsonSchemaBuilder schemaBuilder = MongoJsonSchema.builder();
-
-		List<JsonSchemaProperty> schemaProperties = computePropertiesForEntity(Collections.emptyList(), entity);
-		schemaBuilder.properties(schemaProperties.toArray(new JsonSchemaProperty[0]));
-
-		return schemaBuilder.build();
-
-	}
-
-	private List<JsonSchemaProperty> computePropertiesForEntity(List<MongoPersistentProperty> path,
-			MongoPersistentEntity<?> entity) {
-
-		List<JsonSchemaProperty> schemaProperties = new ArrayList<>();
-
-		for (MongoPersistentProperty nested : entity) {
-
-			List<MongoPersistentProperty> currentPath = new ArrayList<>(path);
-
-			if (path.contains(nested)) { // cycle guard
-				schemaProperties.add(createSchemaProperty(computePropertyFieldName(CollectionUtils.lastElement(currentPath)),
-						Object.class, false));
-				break;
-			}
-
-			currentPath.add(nested);
-			schemaProperties.add(computeSchemaForProperty(currentPath));
-		}
-
-		return schemaProperties;
-	}
-
-	private JsonSchemaProperty computeSchemaForProperty(List<MongoPersistentProperty> path) {
-
-		MongoPersistentProperty property = CollectionUtils.lastElement(path);
-
-		boolean required = isRequiredProperty(property);
-		Class<?> rawTargetType = computeTargetType(property); // target type before conversion
-		Class<?> targetType = converter.getTypeMapper().getWriteTargetTypeFor(rawTargetType); // conversion target type
-
-		if (property.isEntity() && ObjectUtils.nullSafeEquals(rawTargetType, targetType)) {
-			return createObjectSchemaPropertyForEntity(path, property, required);
-		}
-
-		String fieldName = computePropertyFieldName(property);
-
-		if (property.isCollectionLike()) {
-			return createSchemaProperty(fieldName, targetType, required);
-		} else if (property.isMap()) {
-			return createSchemaProperty(fieldName, Type.objectType(), required);
-		} else if (ClassUtils.isAssignable(Enum.class, targetType)) {
-			return createEnumSchemaProperty(fieldName, targetType, required);
-		}
-
-		return createSchemaProperty(fieldName, targetType, required);
-	}
-
-	private JsonSchemaProperty createObjectSchemaPropertyForEntity(List<MongoPersistentProperty> path,
-			MongoPersistentProperty property, boolean required) {
-
-		ObjectJsonSchemaProperty target = JsonSchemaProperty.object(property.getName());
-		List<JsonSchemaProperty> nestedProperties = computePropertiesForEntity(path,
-				mappingContext.getRequiredPersistentEntity(property));
-
-		return createPotentiallyRequiredSchemaProperty(
-				target.properties(nestedProperties.toArray(new JsonSchemaProperty[0])), required);
-	}
-
-	private JsonSchemaProperty createEnumSchemaProperty(String fieldName, Class<?> targetType, boolean required) {
-
-		List<Object> possibleValues = new ArrayList<>();
-
-		for (Object enumValue : EnumSet.allOf((Class) targetType)) {
-			possibleValues.add(converter.convertToMongoType(enumValue));
-		}
-
-		targetType = possibleValues.isEmpty() ? targetType : possibleValues.iterator().next().getClass();
-		return createSchemaProperty(fieldName, targetType, required, possibleValues);
-	}
-
-	JsonSchemaProperty createSchemaProperty(String fieldName, Object type, boolean required) {
-		return createSchemaProperty(fieldName, type, required, Collections.emptyList());
-	}
-
-	JsonSchemaProperty createSchemaProperty(String fieldName, Object type, boolean required,
-			Collection<?> possibleValues) {
-
-		TypedJsonSchemaObject schemaObject = type instanceof Type ? JsonSchemaObject.of(Type.class.cast(type))
-				: JsonSchemaObject.of(Class.class.cast(type));
-
-		if (!CollectionUtils.isEmpty(possibleValues)) {
-			schemaObject = schemaObject.possibleValues(possibleValues);
-		}
-
-		return createPotentiallyRequiredSchemaProperty(JsonSchemaProperty.named(fieldName).with(schemaObject), required);
-	}
-
-	private String computePropertyFieldName(PersistentProperty property) {
-
-		return property instanceof MongoPersistentProperty ? ((MongoPersistentProperty) property).getFieldName()
-				: property.getName();
-	}
-
-	private boolean isRequiredProperty(PersistentProperty property) {
-		return property.getType().isPrimitive();
-	}
-
-	private Class<?> computeTargetType(PersistentProperty<?> property) {
-
-		if (!(property instanceof MongoPersistentProperty)) {
-			return property.getType();
-		}
-
-		MongoPersistentProperty mongoProperty = (MongoPersistentProperty) property;
-		if (!mongoProperty.isIdProperty()) {
-			return mongoProperty.getFieldType();
-		}
-
-		if (mongoProperty.hasExplicitWriteTarget()) {
-			return mongoProperty.getRequiredAnnotation(Field.class).targetType().getJavaClass();
-		}
-
-		return mongoProperty.getFieldType() != mongoProperty.getActualType() ? Object.class : mongoProperty.getFieldType();
-	}
-
-	static JsonSchemaProperty createPotentiallyRequiredSchemaProperty(JsonSchemaProperty property, boolean required) {
-
-		if (!required) {
-			return property;
-		}
-
-		return JsonSchemaProperty.required(property);
-	}
-}

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

@@ -41,8 +41,7 @@ public class MongoClientOptionsFactoryBean extends AbstractFactoryBean<MongoClie
 
 	private static final MongoClientOptions DEFAULT_MONGO_OPTIONS = MongoClientOptions.builder().build();
 
-	// TODO: Mongo Driver 4 - use application name insetad of description if not available
-	private @Nullable String description = DEFAULT_MONGO_OPTIONS.getApplicationName();
+	private @Nullable String description = DEFAULT_MONGO_OPTIONS.getDescription();
 	private int minConnectionsPerHost = DEFAULT_MONGO_OPTIONS.getMinConnectionsPerHost();
 	private int connectionsPerHost = DEFAULT_MONGO_OPTIONS.getConnectionsPerHost();
 	private int threadsAllowedToBlockForConnectionMultiplier = DEFAULT_MONGO_OPTIONS
@@ -52,8 +51,6 @@ public class MongoClientOptionsFactoryBean extends AbstractFactoryBean<MongoClie
 	private int maxConnectionLifeTime = DEFAULT_MONGO_OPTIONS.getMaxConnectionLifeTime();
 	private int connectTimeout = DEFAULT_MONGO_OPTIONS.getConnectTimeout();
 	private int socketTimeout = DEFAULT_MONGO_OPTIONS.getSocketTimeout();
-
-	// TODO: Mongo Driver 4 - check if available
 	private boolean socketKeepAlive = DEFAULT_MONGO_OPTIONS.isSocketKeepAlive();
 	private @Nullable ReadPreference readPreference = DEFAULT_MONGO_OPTIONS.getReadPreference();
 	private DBDecoderFactory dbDecoderFactory = DEFAULT_MONGO_OPTIONS.getDbDecoderFactory();
@@ -61,8 +58,6 @@ public class MongoClientOptionsFactoryBean extends AbstractFactoryBean<MongoClie
 	private @Nullable WriteConcern writeConcern = DEFAULT_MONGO_OPTIONS.getWriteConcern();
 	private @Nullable SocketFactory socketFactory = DEFAULT_MONGO_OPTIONS.getSocketFactory();
 	private boolean cursorFinalizerEnabled = DEFAULT_MONGO_OPTIONS.isCursorFinalizerEnabled();
-
-	// TODO: Mongo Driver 4 - remove this option
 	private boolean alwaysUseMBeans = DEFAULT_MONGO_OPTIONS.isAlwaysUseMBeans();
 	private int heartbeatFrequency = DEFAULT_MONGO_OPTIONS.getHeartbeatFrequency();
 	private int minHeartbeatFrequency = DEFAULT_MONGO_OPTIONS.getMinHeartbeatFrequency();
@@ -79,7 +74,6 @@ public class MongoClientOptionsFactoryBean extends AbstractFactoryBean<MongoClie
 	 *
 	 * @param description
 	 */
-	// TODO: Mongo Driver 4 - deprecate that one and add application name
 	public void setDescription(@Nullable String description) {
 		this.description = description;
 	}
@@ -241,7 +235,7 @@ public class MongoClientOptionsFactoryBean extends AbstractFactoryBean<MongoClie
 	}
 
 	/**
-	 * This controls if the driver should us an SSL connection. Defaults to {@literal false}.
+	 * This controls if the driver should us an SSL connection. Defaults to |@literal false}.
 	 *
 	 * @param ssl
 	 */
@@ -291,7 +285,7 @@ public class MongoClientOptionsFactoryBean extends AbstractFactoryBean<MongoClie
 				.cursorFinalizerEnabled(cursorFinalizerEnabled) //
 				.dbDecoderFactory(dbDecoderFactory) //
 				.dbEncoderFactory(dbEncoderFactory) //
-				.applicationName(description) // TODO: Mongo Driver 4 - use application name if description not available
+				.description(description) //
 				.heartbeatConnectTimeout(heartbeatConnectTimeout) //
 				.heartbeatFrequency(heartbeatFrequency) //
 				.heartbeatSocketTimeout(heartbeatSocketTimeout) //
@@ -303,9 +297,8 @@ public class MongoClientOptionsFactoryBean extends AbstractFactoryBean<MongoClie
 				.readPreference(readPreference) //
 				.requiredReplicaSetName(requiredReplicaSetName) //
 				.serverSelectionTimeout(serverSelectionTimeout) //
-				.sslEnabled(ssl) //
-				.socketFactory(socketFactoryToUse) // TODO: Mongo Driver 4 - remove if not available
-				.socketKeepAlive(socketKeepAlive) // TODO: Mongo Driver 4 - remove if not available
+				.socketFactory(socketFactoryToUse) //
+				.socketKeepAlive(socketKeepAlive) //
 				.socketTimeout(socketTimeout) //
 				.threadsAllowedToBlockForConnectionMultiplier(threadsAllowedToBlockForConnectionMultiplier) //
 				.writeConcern(writeConcern).build();

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

@@ -1,75 +0,0 @@
-/*
- * Copyright 2019 the original author 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
- *
- *      https://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.core.convert.MongoConverter;
-import org.springframework.data.mongodb.core.schema.MongoJsonSchema;
-import org.springframework.util.Assert;
-
-/**
- * {@link MongoJsonSchemaCreator} extracts the {@link MongoJsonSchema} for a given {@link Class} by applying the
- * following mapping rules.
- * <p>
- * <strong>Required Properties</strong>
- * <ul>
- * <li>Properties of primitive type</li>
- * </ul>
- * <strong>Ignored Properties</strong>
- * <ul>
- * <li>All properties annotated with {@link org.springframework.data.annotation.Transient}</li>
- * </ul>
- * <strong>Property Type Mapping</strong>
- * <ul>
- * <li>{@link java.lang.Object} -> {@code type : 'object'}</li>
- * <li>{@link java.util.Arrays} -> {@code type : 'array'}</li>
- * <li>{@link java.util.Collection} -> {@code type : 'array'}</li>
- * <li>{@link java.util.Map} -> {@code type : 'object'}</li>
- * <li>{@link java.lang.Enum} -> {@code type : 'string', enum : [the enum values]}</li>
- * <li>Simple Types -> {@code type : 'the corresponding bson type' }</li>
- * <li>Domain Types -> {@code type : 'object', properties : &#123;the types properties&#125; }</li>
- * </ul>
- * <br />
- * {@link org.springframework.data.annotation.Id _id} properties using types that can be converted into
- * {@link org.bson.types.ObjectId} like {@link String} will be mapped to {@code type : 'object'} unless there is more
- * specific information available via the {@link org.springframework.data.mongodb.core.mapping.MongoId} annotation.
- * </p>
- *
- * @author Christoph Strobl
- * @since 2.2
- */
-public interface MongoJsonSchemaCreator {
-
-	/**
-	 * Create the {@link MongoJsonSchema} for the given {@link Class type}.
-	 *
-	 * @param type must not be {@literal null}.
-	 * @return never {@literal null}.
-	 */
-	MongoJsonSchema createSchemaFor(Class<?> type);
-
-	/**
-	 * Creates a new {@link MongoJsonSchemaCreator} that is aware of conversions applied by the given
-	 * {@link MongoConverter}.
-	 *
-	 * @param mongoConverter must not be {@literal null}.
-	 * @return new instance of {@link MongoJsonSchemaCreator}.
-	 */
-	static MongoJsonSchemaCreator create(MongoConverter mongoConverter) {
-
-		Assert.notNull(mongoConverter, "MongoConverter must not be null!");
-		return new MappingMongoJsonSchemaCreator(mongoConverter);
-	}
-}

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

@@ -57,10 +57,6 @@ import com.mongodb.client.result.UpdateResult;
  * Interface that specifies a basic set of MongoDB operations. Implemented by {@link MongoTemplate}. 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).
- * <p />
- * <strong>NOTE:</strong> Some operations cannot be executed within a MongoDB transaction. Please refer to the MongoDB
- * specific documentation to learn more about <a href="https://docs.mongodb.com/manual/core/transactions/">Multi
- * Document Transactions</a>.
  *
  * @author Thomas Risberg
  * @author Mark Pollack
@@ -293,15 +289,12 @@ public interface MongoOperations extends FluentMongoOperations {
 	Set<String> getCollectionNames();
 
 	/**
-	 * Get a {@link MongoCollection} by its name. The returned collection may not exists yet (except in local memory) and
-	 * is created on first interaction with the server. Collections can be explicitly created via
-	 * {@link #createCollection(Class)}. Please make sure to check if the collection {@link #collectionExists(Class)
-	 * exists} first.
+	 * Get a collection by name, creating it if it doesn't exist.
 	 * <p/>
 	 * Translate any exceptions as necessary.
 	 *
 	 * @param collectionName name of the collection. Must not be {@literal null}.
-	 * @return an existing collection or one created on first server interaction.
+	 * @return an existing collection or a newly created one.
 	 */
 	MongoCollection<Document> getCollection(String collectionName);
 
@@ -362,9 +355,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	 *
 	 * @return
 	 * @since 1.7
-	 * @deprecated since 2.2. The {@code eval} command has been removed without replacement in MongoDB Server 4.2.0.
 	 */
-	@Deprecated
 	ScriptOperations scriptOps();
 
 	/**
@@ -436,11 +427,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	 *          reduce function.
 	 * @param entityClass The parametrized type of the returned list
 	 * @return The results of the group operation
-	 * @deprecated since 2.2. The {@code group} command has been removed in MongoDB Server 4.2.0. <br />
-	 *             Please use {@link #aggregate(TypedAggregation, String, Class) } with a
-	 *             {@link org.springframework.data.mongodb.core.aggregation.GroupOperation} instead.
 	 */
-	@Deprecated
 	<T> GroupByResults<T> group(String inputCollectionName, GroupBy groupBy, Class<T> entityClass);
 
 	/**
@@ -455,12 +442,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	 *          reduce function.
 	 * @param entityClass The parametrized type of the returned list
 	 * @return The results of the group operation
-	 * @deprecated since 2.2. The {@code group} command has been removed in MongoDB Server 4.2.0. <br />
-	 *             Please use {@link #aggregate(TypedAggregation, String, Class) } with a
-	 *             {@link org.springframework.data.mongodb.core.aggregation.GroupOperation} and
-	 *             {@link org.springframework.data.mongodb.core.aggregation.MatchOperation} instead.
 	 */
-	@Deprecated
 	<T> GroupByResults<T> group(@Nullable Criteria criteria, String inputCollectionName, GroupBy groupBy,
 			Class<T> entityClass);
 
@@ -648,52 +630,24 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * 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.
-	 * <p>
-	 * MongoDB 4.2 has removed the {@code geoNear} command. This method uses since version 2.2 aggregations and the
-	 * {@code $geoNear} aggregation command to emulate {@code geoNear} command functionality. We recommend using
-	 * aggregations directly:
-	 * </p>
-	 *
-	 * <pre class="code">
-	 * TypedAggregation&lt;T&gt; geoNear = TypedAggregation.newAggregation(entityClass, Aggregation.geoNear(near, "dis"))
-	 * 		.withOptions(AggregationOptions.builder().collation(near.getCollation()).build());
-	 * AggregationResults&lt;Document&gt; results = aggregate(geoNear, Document.class);
-	 * </pre>
 	 *
 	 * @param near must not be {@literal null}.
 	 * @param entityClass must not be {@literal null}.
 	 * @return
-	 * @deprecated since 2.2. The {@code eval} command has been removed in MongoDB Server 4.2.0. Use Aggregations with
-	 *             {@link Aggregation#geoNear(NearQuery, String)} instead.
 	 */
-	@Deprecated
 	<T> GeoResults<T> geoNear(NearQuery near, Class<T> entityClass);
 
 	/**
 	 * Returns {@link GeoResults} 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.
-	 * <p>
-	 * MongoDB 4.2 has removed the {@code geoNear} command. This method uses since version 2.2 aggregations and the
-	 * {@code $geoNear} aggregation command to emulate {@code geoNear} command functionality. We recommend using
-	 * aggregations directly:
-	 * </p>
-	 *
-	 * <pre class="code">
-	 * TypedAggregation&lt;T&gt; geoNear = TypedAggregation.newAggregation(entityClass, Aggregation.geoNear(near, "dis"))
-	 * 		.withOptions(AggregationOptions.builder().collation(near.getCollation()).build());
-	 * AggregationResults&lt;Document&gt; results = aggregate(geoNear, Document.class);
-	 * </pre>
 	 *
 	 * @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. Must not be {@literal null} nor empty.
 	 * @return
-	 * @deprecated since 2.2. The {@code eval} command has been removed in MongoDB Server 4.2.0. Use Aggregations with
-	 *             {@link Aggregation#geoNear(NearQuery, String)} instead.
 	 */
-	@Deprecated
 	<T> GeoResults<T> geoNear(NearQuery near, Class<T> entityClass, String collectionName);
 
 	/**
@@ -1140,11 +1094,6 @@ public interface MongoOperations extends FluentMongoOperations {
 
 	/**
 	 * Returns the number of documents for the given {@link Query} by querying the collection of the given entity class.
-	 * <br />
-	 * <strong>NOTE:</strong> Query {@link Query#getSkip() offset} and {@link Query#getLimit() limit} can have direct
-	 * influence on the resulting number of documents found as those values are passed on to the server and potentially
-	 * limit the range and order within which the server performs the count operation. Use an {@literal unpaged} query to
-	 * count all matches.
 	 *
 	 * @param query the {@link Query} class that specifies the criteria used to find documents. Must not be
 	 *          {@literal null}.
@@ -1156,11 +1105,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	/**
 	 * 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. Use {@link #count(Query, Class, String)} to get full type specific support. <br />
-	 * <strong>NOTE:</strong> Query {@link Query#getSkip() offset} and {@link Query#getLimit() limit} can have direct
-	 * influence on the resulting number of documents found as those values are passed on to the server and potentially
-	 * limit the range and order within which the server performs the count operation. Use an {@literal unpaged} query to
-	 * count all matches.
+	 * onto document fields. Use {@link #count(Query, Class, String)} to get full type specific support.
 	 *
 	 * @param query the {@link Query} class that specifies the criteria used to find documents.
 	 * @param collectionName must not be {@literal null} or empty.
@@ -1171,11 +1116,7 @@ public interface MongoOperations extends FluentMongoOperations {
 
 	/**
 	 * 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}. <br />
-	 * <strong>NOTE:</strong> Query {@link Query#getSkip() offset} and {@link Query#getLimit() limit} can have direct
-	 * influence on the resulting number of documents found as those values are passed on to the server and potentially
-	 * limit the range and order within which the server performs the count operation. Use an {@literal unpaged} query to
-	 * count all matches.
+	 * class to map the given {@link Query}.
 	 *
 	 * @param query the {@link Query} class that specifies the criteria used to find documents. Must not be
 	 *          {@literal null}.
@@ -1193,8 +1134,8 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * 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="https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation" > Spring's
-	 * Type Conversion"</a> for more details.
+	 * <a href="http://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation" > 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.
@@ -1255,8 +1196,8 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * 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="https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation" > Spring's
-	 * Type Conversion"</a> for more details.
+	 * <a href="http://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation" > Spring's Type
+	 * Conversion"</a> for more details.
 	 *
 	 * @param objectToSave the object to store in the collection. Must not be {@literal null}.
 	 * @return the saved object.
@@ -1273,7 +1214,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * 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
-	 * https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation">Spring's Type
+	 * http://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation">Spring's Type
 	 * Conversion"</a> for more details.
 	 *
 	 * @param objectToSave the object to store in the collection. Must not be {@literal null}.
@@ -1409,10 +1350,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	UpdateResult updateMulti(Query query, Update update, Class<?> entityClass, String collectionName);
 
 	/**
-	 * Remove the given object from the collection by {@literal id} and (if applicable) its
-	 * {@link org.springframework.data.annotation.Version}. <br />
-	 * Use {@link DeleteResult#getDeletedCount()} for insight whether an {@link DeleteResult#wasAcknowledged()
-	 * acknowledged} remove operation was successful or not.
+	 * Remove the given object from the collection by id.
 	 *
 	 * @param object must not be {@literal null}.
 	 * @return the {@link DeleteResult} which lets you access the results of the previous delete.
@@ -1420,10 +1358,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	DeleteResult remove(Object object);
 
 	/**
-	 * Removes the given object from the given collection by {@literal id} and (if applicable) its
-	 * {@link org.springframework.data.annotation.Version}. <br />
-	 * Use {@link DeleteResult#getDeletedCount()} for insight whether an {@link DeleteResult#wasAcknowledged()
-	 * acknowledged} remove operation was successful or not.
+	 * Removes the given object from the given collection.
 	 *
 	 * @param object must not be {@literal null}.
 	 * @param collectionName name of the collection where the objects will removed, must not be {@literal null} or empty.

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

@@ -40,7 +40,6 @@ 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 org.springframework.lang.Nullable;
-import org.springframework.transaction.reactive.TransactionalOperator;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
@@ -57,17 +56,13 @@ import com.mongodb.reactivestreams.client.MongoCollection;
  * 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}.
- * <p />
- * <strong>NOTE:</strong> Some operations cannot be executed within a MongoDB transaction. Please refer to the MongoDB
- * specific documentation to learn more about <a href="https://docs.mongodb.com/manual/core/transactions/">Multi
- * Document Transactions</a>.
  *
  * @author Mark Paluch
  * @author Christoph Strobl
  * @since 2.0
  * @see Flux
  * @see Mono
- * @see <a href="https://projectreactor.io/docs/">Project Reactor</a>
+ * @see <a href="http://projectreactor.io/docs/">Project Reactor</a>
  */
 public interface ReactiveMongoOperations extends ReactiveFluentMongoOperations {
 
@@ -221,9 +216,7 @@ public interface ReactiveMongoOperations extends ReactiveFluentMongoOperations {
 	 * {@link ClientSession#abortTransaction() rolled back} upon errors.
 	 *
 	 * @return new instance of {@link ReactiveSessionScoped}. Never {@literal null}.
-	 * @deprecated since 2.2. Use {@code @Transactional} or {@link TransactionalOperator}.
 	 */
-	@Deprecated
 	ReactiveSessionScoped inTransaction();
 
 	/**
@@ -238,9 +231,7 @@ public interface ReactiveMongoOperations extends ReactiveFluentMongoOperations {
 	 * @param sessionProvider must not be {@literal null}.
 	 * @return new instance of {@link ReactiveSessionScoped}. Never {@literal null}.
 	 * @since 2.1
-	 * @deprecated since 2.2. Use {@code @Transactional} or {@link TransactionalOperator}.
 	 */
-	@Deprecated
 	ReactiveSessionScoped inTransaction(Publisher<ClientSession> sessionProvider);
 
 	/**
@@ -286,15 +277,12 @@ public interface ReactiveMongoOperations extends ReactiveFluentMongoOperations {
 	Flux<String> getCollectionNames();
 
 	/**
-	 * Get a {@link MongoCollection} by name. The returned collection may not exists yet (except in local memory) and is
-	 * created on first interaction with the server. Collections can be explicitly created via
-	 * {@link #createCollection(Class)}. Please make sure to check if the collection {@link #collectionExists(Class)
-	 * exists} first.
+	 * 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 one created on first server interaction.
+	 * @return an existing collection or a newly created one.
 	 */
 	MongoCollection<Document> getCollection(String collectionName);
 
@@ -624,52 +612,24 @@ public interface ReactiveMongoOperations extends ReactiveFluentMongoOperations {
 	 * 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.
-	 * <p>
-	 * MongoDB 4.2 has removed the {@code geoNear} command. This method uses since version 2.2 aggregations and the
-	 * {@code $geoNear} aggregation command to emulate {@code geoNear} command functionality. We recommend using
-	 * aggregations directly:
-	 * </p>
-	 *
-	 * <pre class="code">
-	 * TypedAggregation&lt;T&gt; geoNear = TypedAggregation.newAggregation(entityClass, Aggregation.geoNear(near, "dis"))
-	 * 		.withOptions(AggregationOptions.builder().collation(near.getCollation()).build());
-	 * Flux&lt;Document&gt; results = aggregate(geoNear, Document.class);
-	 * </pre>
 	 *
 	 * @param near must not be {@literal null}.
 	 * @param entityClass must not be {@literal null}.
 	 * @return the converted {@link GeoResult}s.
-	 * @deprecated since 2.2. The {@code eval} command has been removed in MongoDB Server 4.2.0. Use Aggregations with
-	 *             {@link Aggregation#geoNear(NearQuery, String)} instead.
 	 */
-	@Deprecated
 	<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.
-	 * <p>
-	 * MongoDB 4.2 has removed the {@code geoNear} command. This method uses since version 2.2 aggregations and the
-	 * {@code $geoNear} aggregation command to emulate {@code geoNear} command functionality. We recommend using
-	 * aggregations directly:
-	 * </p>
-	 *
-	 * <pre class="code">
-	 * TypedAggregation&lt;T&gt; geoNear = TypedAggregation.newAggregation(entityClass, Aggregation.geoNear(near, "dis"))
-	 * 		.withOptions(AggregationOptions.builder().collation(near.getCollation()).build());
-	 * Flux&lt;Document&gt; results = aggregate(geoNear, Document.class);
-	 * </pre>
 	 *
 	 * @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 the converted {@link GeoResult}s.
-	 * @deprecated since 2.2. The {@code eval} command has been removed in MongoDB Server 4.2.0. Use Aggregations with
-	 *             {@link Aggregation#geoNear(NearQuery, String)} instead.
 	 */
-	@Deprecated
 	<T> Flux<GeoResult<T>> geoNear(NearQuery near, Class<T> entityClass, String collectionName);
 
 	/**
@@ -920,11 +880,6 @@ public interface ReactiveMongoOperations extends ReactiveFluentMongoOperations {
 
 	/**
 	 * Returns the number of documents for the given {@link Query} by querying the collection of the given entity class.
-	 * <br />
-	 * <strong>NOTE:</strong> Query {@link Query#getSkip() offset} and {@link Query#getLimit() limit} can have direct
-	 * influence on the resulting number of documents found as those values are passed on to the server and potentially
-	 * limit the range and order within which the server performs the count operation. Use an {@literal unpaged} query to
-	 * count all matches.
 	 *
 	 * @param query the {@link Query} class that specifies the criteria used to find documents. Must not be
 	 *          {@literal null}.
@@ -936,11 +891,7 @@ public interface ReactiveMongoOperations extends ReactiveFluentMongoOperations {
 	/**
 	 * 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. Use {@link #count(Query, Class, String)} to get full type specific support. <br />
-	 * <strong>NOTE:</strong> Query {@link Query#getSkip() offset} and {@link Query#getLimit() limit} can have direct
-	 * influence on the resulting number of documents found as those values are passed on to the server and potentially
-	 * limit the range and order within which the server performs the count operation. Use an {@literal unpaged} query to
-	 * count all matches.
+	 * onto document fields. Use {@link #count(Query, Class, String)} to get full type specific support.
 	 *
 	 * @param query the {@link Query} class that specifies the criteria used to find documents.
 	 * @param collectionName must not be {@literal null} or empty.
@@ -951,11 +902,7 @@ public interface ReactiveMongoOperations extends ReactiveFluentMongoOperations {
 
 	/**
 	 * 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}. <br />
-	 * <strong>NOTE:</strong> Query {@link Query#getSkip() offset} and {@link Query#getLimit() limit} can have direct
-	 * influence on the resulting number of documents found as those values are passed on to the server and potentially
-	 * limit the range and order within which the server performs the count operation. Use an {@literal unpaged} query to
-	 * count all matches.
+	 * class to map the given {@link Query}.
 	 *
 	 * @param query the {@link Query} class that specifies the criteria used to find documents. Must not be
 	 *          {@literal null}.
@@ -973,8 +920,8 @@ public interface ReactiveMongoOperations extends ReactiveFluentMongoOperations {
 	 * 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="https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation" > Spring's
-	 * Type Conversion"</a> for more details.
+	 * <a href="http://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation" > 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.
@@ -1033,8 +980,8 @@ public interface ReactiveMongoOperations extends ReactiveFluentMongoOperations {
 	 * 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="https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation" > Spring's
-	 * Type Conversion"</a> for more details.
+	 * <a href="http://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation" > 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.
@@ -1081,8 +1028,8 @@ public interface ReactiveMongoOperations extends ReactiveFluentMongoOperations {
 	 * 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="https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation" > Spring's
-	 * Type Conversion"</a> for more details.
+	 * <a href="http://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation" > Spring's Type
+	 * Conversion"</a> for more details.
 	 *
 	 * @param objectToSave the object to store in the collection. Must not be {@literal null}.
 	 * @return the saved object.
@@ -1099,7 +1046,7 @@ public interface ReactiveMongoOperations extends ReactiveFluentMongoOperations {
 	 * 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
-	 * https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation">Spring's Type
+	 * http://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation">Spring's Type
 	 * Conversion"</a> for more details.
 	 *
 	 * @param objectToSave the object to store in the collection. Must not be {@literal null}.
@@ -1118,8 +1065,8 @@ public interface ReactiveMongoOperations extends ReactiveFluentMongoOperations {
 	 * 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="https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation" > Spring's
-	 * Type Conversion"</a> for more details.
+	 * <a href="http://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation" > Spring's Type
+	 * Conversion"</a> for more details.
 	 *
 	 * @param objectToSave the object to store in the collection. Must not be {@literal null}.
 	 * @return the saved object.
@@ -1136,7 +1083,7 @@ public interface ReactiveMongoOperations extends ReactiveFluentMongoOperations {
 	 * 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
-	 * https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation">Spring's Type
+	 * http://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation">Spring's Type
 	 * Conversion"</a> for more details.
 	 *
 	 * @param objectToSave the object to store in the collection. Must not be {@literal null}.

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

@@ -31,6 +31,7 @@ import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import org.bson.BsonTimestamp;
 import org.bson.BsonValue;
 import org.bson.Document;
 import org.bson.codecs.Codec;
@@ -40,6 +41,7 @@ import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -58,13 +60,10 @@ import org.springframework.data.geo.Metric;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.PropertyPath;
 import org.springframework.data.mapping.PropertyReferenceException;
-import org.springframework.data.mapping.callback.ReactiveEntityCallbacks;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.context.MappingContextEvent;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory;
-import org.springframework.data.mongodb.ReactiveMongoDatabaseUtils;
-import org.springframework.data.mongodb.SessionSynchronization;
 import org.springframework.data.mongodb.core.EntityOperations.AdaptibleEntity;
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
 import org.springframework.data.mongodb.core.aggregation.AggregationOperationContext;
@@ -72,16 +71,7 @@ import org.springframework.data.mongodb.core.aggregation.AggregationOptions;
 import org.springframework.data.mongodb.core.aggregation.PrefixingDelegatingAggregationOperationContext;
 import org.springframework.data.mongodb.core.aggregation.TypeBasedAggregationOperationContext;
 import org.springframework.data.mongodb.core.aggregation.TypedAggregation;
-import org.springframework.data.mongodb.core.convert.DbRefResolver;
-import org.springframework.data.mongodb.core.convert.JsonSchemaMapper;
-import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
-import org.springframework.data.mongodb.core.convert.MongoConverter;
-import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
-import org.springframework.data.mongodb.core.convert.MongoJsonSchemaMapper;
-import org.springframework.data.mongodb.core.convert.MongoWriter;
-import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
-import org.springframework.data.mongodb.core.convert.QueryMapper;
-import org.springframework.data.mongodb.core.convert.UpdateMapper;
+import org.springframework.data.mongodb.core.convert.*;
 import org.springframework.data.mongodb.core.index.MongoMappingEventPublisher;
 import org.springframework.data.mongodb.core.index.ReactiveIndexOperations;
 import org.springframework.data.mongodb.core.index.ReactiveMongoPersistentEntityIndexCreator;
@@ -97,8 +87,6 @@ import org.springframework.data.mongodb.core.mapping.event.BeforeConvertEvent;
 import org.springframework.data.mongodb.core.mapping.event.BeforeDeleteEvent;
 import org.springframework.data.mongodb.core.mapping.event.BeforeSaveEvent;
 import org.springframework.data.mongodb.core.mapping.event.MongoMappingEvent;
-import org.springframework.data.mongodb.core.mapping.event.ReactiveBeforeConvertCallback;
-import org.springframework.data.mongodb.core.mapping.event.ReactiveBeforeSaveCallback;
 import org.springframework.data.mongodb.core.mapreduce.MapReduceOptions;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.core.query.Meta;
@@ -106,7 +94,6 @@ 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 org.springframework.data.mongodb.core.query.UpdateDefinition;
-import org.springframework.data.mongodb.core.query.UpdateDefinition.ArrayFilter;
 import org.springframework.data.mongodb.core.validation.Validator;
 import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
 import org.springframework.data.util.Optionals;
@@ -114,7 +101,6 @@ import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.NumberUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.ResourceUtils;
 import org.springframework.util.StringUtils;
@@ -127,29 +113,11 @@ import com.mongodb.Mongo;
 import com.mongodb.MongoException;
 import com.mongodb.ReadPreference;
 import com.mongodb.WriteConcern;
-import com.mongodb.client.model.CountOptions;
-import com.mongodb.client.model.CreateCollectionOptions;
-import com.mongodb.client.model.DeleteOptions;
-import com.mongodb.client.model.FindOneAndDeleteOptions;
-import com.mongodb.client.model.FindOneAndReplaceOptions;
-import com.mongodb.client.model.FindOneAndUpdateOptions;
-import com.mongodb.client.model.ReplaceOptions;
-import com.mongodb.client.model.ReturnDocument;
-import com.mongodb.client.model.UpdateOptions;
-import com.mongodb.client.model.ValidationOptions;
+import com.mongodb.client.model.*;
 import com.mongodb.client.model.changestream.FullDocument;
 import com.mongodb.client.result.DeleteResult;
 import com.mongodb.client.result.UpdateResult;
-import com.mongodb.reactivestreams.client.AggregatePublisher;
-import com.mongodb.reactivestreams.client.ChangeStreamPublisher;
-import com.mongodb.reactivestreams.client.ClientSession;
-import com.mongodb.reactivestreams.client.DistinctPublisher;
-import com.mongodb.reactivestreams.client.FindPublisher;
-import com.mongodb.reactivestreams.client.MapReducePublisher;
-import com.mongodb.reactivestreams.client.MongoClient;
-import com.mongodb.reactivestreams.client.MongoCollection;
-import com.mongodb.reactivestreams.client.MongoDatabase;
-import com.mongodb.reactivestreams.client.Success;
+import com.mongodb.reactivestreams.client.*;
 
 /**
  * Primary implementation of {@link ReactiveMongoOperations}. It simplifies the use of Reactive MongoDB usage and helps
@@ -201,11 +169,8 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 	private WriteResultChecking writeResultChecking = WriteResultChecking.NONE;
 	private @Nullable ReadPreference readPreference;
 	private @Nullable ApplicationEventPublisher eventPublisher;
-	private @Nullable ReactiveEntityCallbacks entityCallbacks;
 	private @Nullable ReactiveMongoPersistentEntityIndexCreator indexCreator;
 
-	private SessionSynchronization sessionSynchronization = SessionSynchronization.ON_ACTUAL_TRANSACTION;
-
 	/**
 	 * Constructor used for a basic template configuration.
 	 *
@@ -269,15 +234,12 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		if (this.mappingContext instanceof MongoMappingContext) {
 
 			MongoMappingContext mongoMappingContext = (MongoMappingContext) this.mappingContext;
+			this.indexCreator = new ReactiveMongoPersistentEntityIndexCreator(mongoMappingContext, this::indexOps);
+			this.eventPublisher = new MongoMappingEventPublisher(this.indexCreatorListener);
 
-			if (mongoMappingContext.isAutoIndexCreation()) {
-				this.indexCreator = new ReactiveMongoPersistentEntityIndexCreator(mongoMappingContext, this::indexOps);
-				this.eventPublisher = new MongoMappingEventPublisher(this.indexCreatorListener);
-
-				mongoMappingContext.setApplicationEventPublisher(this.eventPublisher);
-				this.mappingContext.getPersistentEntities()
-						.forEach(entity -> onCheckForIndexes(entity, subscriptionExceptionHandler));
-			}
+			mongoMappingContext.setApplicationEventPublisher(this.eventPublisher);
+			this.mappingContext.getPersistentEntities()
+					.forEach(entity -> onCheckForIndexes(entity, subscriptionExceptionHandler));
 		}
 	}
 
@@ -295,7 +257,6 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		this.mappingContext = that.mappingContext;
 		this.operations = that.operations;
 		this.propertyOperations = that.propertyOperations;
-		this.sessionSynchronization = that.sessionSynchronization;
 	}
 
 	private void onCheckForIndexes(MongoPersistentEntity<?> entity, Consumer<Throwable> subscriptionExceptionHandler) {
@@ -358,11 +319,6 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		prepareIndexCreator(applicationContext);
 
 		eventPublisher = applicationContext;
-
-		if (entityCallbacks == null) {
-			setEntityCallbacks(ReactiveEntityCallbacks.create(applicationContext));
-		}
-
 		if (mappingContext instanceof ApplicationEventPublisherAware) {
 			((ApplicationEventPublisherAware) mappingContext).setApplicationEventPublisher(eventPublisher);
 		}
@@ -371,23 +327,6 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		projectionFactory.setBeanClassLoader(applicationContext.getClassLoader());
 	}
 
-	/**
-	 * Set the {@link ReactiveEntityCallbacks} instance to use when invoking
-	 * {@link org.springframework.data.mapping.callback.EntityCallback callbacks} like the
-	 * {@link ReactiveBeforeSaveCallback}.
-	 * <p />
-	 * Overrides potentially existing {@link ReactiveEntityCallbacks}.
-	 *
-	 * @param entityCallbacks must not be {@literal null}.
-	 * @throws IllegalArgumentException if the given instance is {@literal null}.
-	 * @since 2.2
-	 */
-	public void setEntityCallbacks(ReactiveEntityCallbacks entityCallbacks) {
-
-		Assert.notNull(entityCallbacks, "EntityCallbacks must not be null!");
-		this.entityCallbacks = entityCallbacks;
-	}
-
 	/**
 	 * Inspects the given {@link ApplicationContext} for {@link ReactiveMongoPersistentEntityIndexCreator} and those in
 	 * turn if they were registered for the current {@link MappingContext}. If no creator for the current
@@ -529,17 +468,6 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		};
 	}
 
-	/**
-	 * Define if {@link ReactiveMongoTemplate} should participate in transactions. Default is set to
-	 * {@link SessionSynchronization#ON_ACTUAL_TRANSACTION}.<br />
-	 * <strong>NOTE:</strong> MongoDB transactions require at least MongoDB 4.0.
-	 *
-	 * @since 2.2
-	 */
-	public void setSessionSynchronization(SessionSynchronization sessionSynchronization) {
-		this.sessionSynchronization = sessionSynchronization;
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#inTransaction()
@@ -617,8 +545,7 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 
 		Assert.notNull(callback, "ReactiveDatabaseCallback must not be null!");
 
-		return Mono.defer(this::doGetDatabase).flatMapMany(database -> callback.doInDB(prepareDatabase(database)))
-				.onErrorMap(translateException());
+		return Flux.defer(() -> callback.doInDB(prepareDatabase(doGetDatabase()))).onErrorMap(translateException());
 	}
 
 	/**
@@ -632,7 +559,7 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 
 		Assert.notNull(callback, "ReactiveDatabaseCallback must not be null!");
 
-		return Mono.defer(this::doGetDatabase).flatMap(database -> Mono.from(callback.doInDB(prepareDatabase(database))))
+		return Mono.defer(() -> Mono.from(callback.doInDB(prepareDatabase(doGetDatabase()))))
 				.onErrorMap(translateException());
 	}
 
@@ -648,8 +575,8 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		Assert.hasText(collectionName, "Collection name must not be null or empty!");
 		Assert.notNull(callback, "ReactiveDatabaseCallback must not be null!");
 
-		Mono<MongoCollection<Document>> collectionPublisher = doGetDatabase()
-				.map(database -> getAndPrepareCollection(database, collectionName));
+		Mono<MongoCollection<Document>> collectionPublisher = Mono
+				.fromCallable(() -> getAndPrepareCollection(doGetDatabase(), collectionName));
 
 		return collectionPublisher.flatMapMany(callback::doInCollection).onErrorMap(translateException());
 	}
@@ -667,8 +594,8 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		Assert.hasText(collectionName, "Collection name must not be null or empty!");
 		Assert.notNull(callback, "ReactiveCollectionCallback must not be null!");
 
-		Mono<MongoCollection<Document>> collectionPublisher = doGetDatabase()
-				.map(database -> getAndPrepareCollection(database, collectionName));
+		Mono<MongoCollection<Document>> collectionPublisher = Mono
+				.fromCallable(() -> getAndPrepareCollection(doGetDatabase(), collectionName));
 
 		return collectionPublisher.flatMap(collection -> Mono.from(callback.doInCollection(collection)))
 				.onErrorMap(translateException());
@@ -679,7 +606,7 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#createCollection(java.lang.Class)
 	 */
 	public <T> Mono<MongoCollection<Document>> createCollection(Class<T> entityClass) {
-		return createCollection(entityClass, CollectionOptions.empty());
+		return createCollection(determineCollectionName(entityClass));
 	}
 
 	/*
@@ -688,17 +615,8 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 	 */
 	public <T> Mono<MongoCollection<Document>> createCollection(Class<T> entityClass,
 			@Nullable CollectionOptions collectionOptions) {
-
-		Assert.notNull(entityClass, "EntityClass must not be null!");
-
-		CollectionOptions options = collectionOptions != null ? collectionOptions : CollectionOptions.empty();
-		options = Optionals
-				.firstNonEmpty(() -> Optional.ofNullable(collectionOptions).flatMap(CollectionOptions::getCollation),
-						() -> operations.forType(entityClass).getCollation()) //
-				.map(options::collation).orElse(options);
-
 		return doCreateCollection(determineCollectionName(entityClass),
-				convertToCreateCollectionOptions(options, entityClass));
+				convertToCreateCollectionOptions(collectionOptions, entityClass));
 	}
 
 	/*
@@ -723,14 +641,7 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#getCollection(java.lang.String)
 	 */
 	public MongoCollection<Document> getCollection(String collectionName) {
-
-		Assert.notNull(collectionName, "Collection name must not be null!");
-
-		try {
-			return this.mongoDatabaseFactory.getMongoDatabase().getCollection(collectionName);
-		} catch (RuntimeException e) {
-			throw potentiallyConvertRuntimeException(e, exceptionTranslator);
-		}
+		return execute((MongoDatabaseCallback<MongoCollection<Document>>) db -> db.getCollection(collectionName));
 	}
 
 	/*
@@ -782,11 +693,11 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 	}
 
 	public MongoDatabase getMongoDatabase() {
-		return mongoDatabaseFactory.getMongoDatabase();
+		return doGetDatabase();
 	}
 
-	protected Mono<MongoDatabase> doGetDatabase() {
-		return ReactiveMongoDatabaseUtils.getDatabase(mongoDatabaseFactory, sessionSynchronization);
+	protected MongoDatabase doGetDatabase() {
+		return mongoDatabaseFactory.getMongoDatabase();
 	}
 
 	/*
@@ -805,7 +716,7 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 
 		if (ObjectUtils.isEmpty(query.getSortObject())) {
 			return doFindOne(collectionName, query.getQueryObject(), query.getFieldsObject(), entityClass,
-					operations.forType(entityClass).getCollation(query).orElse(null));
+					query.getCollation().orElse(null));
 		}
 
 		query.limit(1);
@@ -848,8 +759,8 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 				LOGGER.debug("exists: {} in collection: {}", serializeToJsonSafely(filter), collectionName);
 			}
 
-			findPublisher = operations.forType(entityClass).getCollation(query).map(Collation::toMongoCollation)
-					.map(findPublisher::collation).orElse(findPublisher);
+			findPublisher = query.getCollation().map(Collation::toMongoCollation).map(findPublisher::collation)
+					.orElse(findPublisher);
 
 			return findPublisher.limit(1);
 		}).hasElements();
@@ -935,10 +846,8 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 			}
 
 			DistinctPublisher<T> publisher = collection.distinct(mappedFieldName, mappedQuery, mongoDriverCompatibleType);
-			return operations.forType(entityClass).getCollation(query) //
-					.map(Collation::toMongoCollation) //
-					.map(publisher::collation) //
-					.orElse(publisher);
+
+			return query.getCollation().map(Collation::toMongoCollation).map(publisher::collation).orElse(publisher);
 		});
 
 		if (resultClass == Object.class || mongoDriverCompatibleType != resultClass) {
@@ -1048,12 +957,11 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		}
 
 		ReadDocumentCallback<O> readCallback = new ReadDocumentCallback<>(mongoConverter, outputType, collectionName);
-		return execute(collectionName, collection -> aggregateAndMap(collection, pipeline, options, readCallback,
-				aggregation instanceof TypedAggregation ? ((TypedAggregation) aggregation).getInputType() : null));
+		return execute(collectionName, collection -> aggregateAndMap(collection, pipeline, options, readCallback));
 	}
 
 	private <O> Flux<O> aggregateAndMap(MongoCollection<Document> collection, List<Document> pipeline,
-			AggregationOptions options, ReadDocumentCallback<O> readCallback, @Nullable Class<?> inputType) {
+			AggregationOptions options, ReadDocumentCallback<O> readCallback) {
 
 		AggregatePublisher<Document> cursor = collection.aggregate(pipeline, Document.class)
 				.allowDiskUse(options.isAllowDiskUse());
@@ -1062,11 +970,9 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 			cursor = cursor.batchSize(options.getCursorBatchSize());
 		}
 
-		options.getComment().ifPresent(cursor::comment);
-
-		Optionals.firstNonEmpty(options::getCollation, () -> operations.forType(inputType).getCollation()) //
-				.map(Collation::toMongoCollation) //
-				.ifPresent(cursor::collation);
+		if (options.getCollation().isPresent()) {
+			cursor = cursor.collation(options.getCollation().map(Collation::toMongoCollation).get());
+		}
 
 		return Flux.from(cursor).map(readCallback::doWith);
 	}
@@ -1102,16 +1008,34 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		}
 
 		String collection = StringUtils.hasText(collectionName) ? collectionName : determineCollectionName(entityClass);
-		String distanceField = operations.nearQueryDistanceFieldName(entityClass);
+		Document nearDocument = near.toDocument();
 
-		GeoNearResultDocumentCallback<T> callback = new GeoNearResultDocumentCallback<>(distanceField,
-				new ProjectingReadCallback<>(mongoConverter, entityClass, returnType, collection), near.getMetric());
+		Document command = new Document("geoNear", collection);
+		command.putAll(nearDocument);
 
-		Aggregation $geoNear = TypedAggregation.newAggregation(entityClass, Aggregation.geoNear(near, distanceField))
-				.withOptions(AggregationOptions.builder().collation(near.getCollation()).build());
+		return Flux.defer(() -> {
 
-		return aggregate($geoNear, collection, Document.class) //
-				.map(callback::doWith);
+			if (nearDocument.containsKey("query")) {
+				Document query = (Document) nearDocument.get("query");
+				command.put("query", queryMapper.getMappedObject(query, getPersistentEntity(entityClass)));
+			}
+
+			if (LOGGER.isDebugEnabled()) {
+				LOGGER.debug("Executing geoNear using: {} for class: {} in collection: {}", serializeToJsonSafely(command),
+						entityClass, collectionName);
+			}
+
+			GeoNearResultDocumentCallback<T> callback = new GeoNearResultDocumentCallback<>(
+					new ProjectingReadCallback<>(mongoConverter, entityClass, returnType, collectionName), near.getMetric());
+
+			return executeCommand(command, this.readPreference).flatMapMany(document -> {
+
+				List<Document> results = document.get("results", List.class);
+
+				return results == null ? Flux.empty() : Flux.fromIterable(results);
+
+			}).skip(near.getSkip() != null ? near.getSkip() : 0).map(callback::doWith);
+		});
 	}
 
 	/*
@@ -1145,8 +1069,6 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 	public <T> Mono<T> findAndModify(Query query, Update update, FindAndModifyOptions options, Class<T> entityClass,
 			String collectionName) {
 
-		Assert.notNull(options, "Options must not be null! ");
-
 		FindAndModifyOptions optionsToUse = FindAndModifyOptions.of(options);
 
 		Optionals.ifAllPresent(query.getCollation(), optionsToUse.getCollation(), (l, r) -> {
@@ -1154,10 +1076,7 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 					"Both Query and FindAndModifyOptions define a collation. Please provide the collation only via one of the two.");
 		});
 
-		if (!optionsToUse.getCollation().isPresent()) {
-			operations.forType(entityClass).getCollation(query).ifPresent(optionsToUse::collation);
-			;
-		}
+		query.getCollation().ifPresent(optionsToUse::collation);
 
 		return doFindAndModify(collectionName, query.getQueryObject(), query.getFieldsObject(),
 				getMappedSortObject(query, entityClass), entityClass, update, optionsToUse);
@@ -1187,25 +1106,11 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		Document mappedFields = queryMapper.getMappedFields(query.getFieldsObject(), entity);
 		Document mappedSort = queryMapper.getMappedSort(query.getSortObject(), entity);
 
-		return Mono.just(PersistableEntityModel.of(replacement, collectionName)) //
-				.doOnNext(it -> maybeEmitEvent(new BeforeConvertEvent<>(it.getSource(), it.getCollection()))) //
-				.flatMap(it -> maybeCallBeforeConvert(it.getSource(), it.getCollection()).map(it::mutate))
-				.map(it -> it
-						.addTargetDocument(operations.forEntity(it.getSource()).toMappedDocument(mongoConverter).getDocument())) //
-				.doOnNext(it -> maybeEmitEvent(new BeforeSaveEvent(it.getSource(), it.getTarget(), it.getCollection()))) //
-				.flatMap(it -> {
+		Document mappedReplacement = operations.forEntity(replacement).toMappedDocument(this.mongoConverter).getDocument();
 
-					PersistableEntityModel<S> flowObject = (PersistableEntityModel<S>) it;
-					return maybeCallBeforeSave(flowObject.getSource(), flowObject.getTarget(), flowObject.getCollection())
-							.map(potentiallyModified -> PersistableEntityModel.of(potentiallyModified, flowObject.getTarget(),
-									flowObject.getCollection()));
-				}).flatMap(it -> {
-
-					PersistableEntityModel<S> flowObject = (PersistableEntityModel<S>) it;
-					return doFindAndReplace(flowObject.getCollection(), mappedQuery, mappedFields, mappedSort,
-							operations.forType(entityType).getCollation(query).map(Collation::toMongoCollation).orElse(null),
-							entityType, flowObject.getTarget(), options, resultType);
-				});
+		return doFindAndReplace(collectionName, mappedQuery, mappedFields, mappedSort,
+				query.getCollation().map(Collation::toMongoCollation).orElse(null), entityType, mappedReplacement, options,
+				resultType);
 	}
 
 	/*
@@ -1222,10 +1127,8 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 	 */
 	public <T> Mono<T> findAndRemove(Query query, Class<T> entityClass, String collectionName) {
 
-		operations.forType(entityClass).getCollation(query);
 		return doFindAndRemove(collectionName, query.getQueryObject(), query.getFieldsObject(),
-				getMappedSortObject(query, entityClass), operations.forType(entityClass).getCollation(query).orElse(null),
-				entityClass);
+				getMappedSortObject(query, entityClass), query.getCollation().orElse(null), entityClass);
 	}
 
 	/*
@@ -1258,45 +1161,23 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 
 		return createMono(collectionName, collection -> {
 
-			Document filter = queryMapper.getMappedObject(query.getQueryObject(),
-					entityClass == null ? null : mappingContext.getPersistentEntity(entityClass));
+			Document filter = query == null ? null
+					: queryMapper.getMappedObject(query.getQueryObject(),
+							entityClass == null ? null : mappingContext.getPersistentEntity(entityClass));
 
 			CountOptions options = new CountOptions();
-			query.getCollation().map(Collation::toMongoCollation).ifPresent(options::collation);
-
-			if (query.getLimit() > 0) {
-				options.limit(query.getLimit());
+			if (query != null) {
+				query.getCollation().map(Collation::toMongoCollation).ifPresent(options::collation);
 			}
-			if (query.getSkip() > 0) {
-				options.skip((int) query.getSkip());
-			}
-
-			operations.forType(entityClass).getCollation(query).map(Collation::toMongoCollation) //
-					.ifPresent(options::collation);
 
 			if (LOGGER.isDebugEnabled()) {
 				LOGGER.debug("Executing count: {} in collection: {}", serializeToJsonSafely(filter), collectionName);
 			}
 
-			return doCount(collectionName, filter, options);
+			return collection.count(filter, options);
 		});
 	}
 
-	/**
-	 * Run the actual count operation against the collection with given name.
-	 *
-	 * @param collectionName the name of the collection to count matching documents in.
-	 * @param filter the filter to apply. Must not be {@literal null}.
-	 * @param options options to apply. Like collation and the such.
-	 * @return
-	 */
-	protected Mono<Long> doCount(String collectionName, Document filter, CountOptions options) {
-
-		return ReactiveMongoDatabaseUtils.isTransactionActive(mongoDatabaseFactory) //
-				.flatMap(txActive -> createMono(collectionName,
-						collection -> txActive ? collection.countDocuments(filter, options) : collection.count(filter, options)));
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#insert(reactor.core.publisher.Mono)
@@ -1356,31 +1237,28 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 
 	protected <T> Mono<T> doInsert(String collectionName, T objectToSave, MongoWriter<Object> writer) {
 
-		return Mono.just(PersistableEntityModel.of(objectToSave, collectionName)) //
-				.doOnNext(it -> maybeEmitEvent(new BeforeConvertEvent<>(it.getSource(), it.getCollection()))) //
-				.flatMap(it -> maybeCallBeforeConvert(it.getSource(), it.getCollection()).map(it::mutate)) //
-				.map(it -> {
+		return Mono.defer(() -> {
 
-					AdaptibleEntity<T> entity = operations.forEntity(it.getSource(), mongoConverter.getConversionService());
-					entity.assertUpdateableIdIfNotSet();
+			BeforeConvertEvent<T> event = new BeforeConvertEvent<>(objectToSave, collectionName);
+			T toConvert = maybeEmitEvent(event).getSource();
 
-					return PersistableEntityModel.of(entity.initializeVersionProperty(),
-							entity.toMappedDocument(writer).getDocument(), it.getCollection());
-				}).doOnNext(it -> maybeEmitEvent(new BeforeSaveEvent<>(it.getSource(), it.getTarget(), it.getCollection()))) //
-				.flatMap(it -> {
+			AdaptibleEntity<T> entity = operations.forEntity(toConvert, mongoConverter.getConversionService());
+			entity.assertUpdateableIdIfNotSet();
 
-					return maybeCallBeforeSave(it.getSource(), it.getTarget(), it.getCollection()).map(it::mutate);
+			T initialized = entity.initializeVersionProperty();
+			Document dbDoc = entity.toMappedDocument(writer).getDocument();
 
-				}).flatMap(it -> {
+			maybeEmitEvent(new BeforeSaveEvent<>(initialized, dbDoc, collectionName));
 
-					return insertDocument(it.getCollection(), it.getTarget(), it.getSource().getClass()).map(id -> {
+			Mono<T> afterInsert = insertDocument(collectionName, dbDoc, initialized.getClass()).map(id -> {
 
-						T saved = operations.forEntity(it.getSource(), mongoConverter.getConversionService())
-								.populateIdIfNecessary(id);
-						maybeEmitEvent(new AfterSaveEvent<>(saved, it.getTarget(), collectionName));
-						return saved;
-					});
-				});
+				T saved = entity.populateIdIfNecessary(id);
+				maybeEmitEvent(new AfterSaveEvent<>(saved, dbDoc, collectionName));
+				return saved;
+			});
+
+			return afterInsert;
+		});
 	}
 
 	/*
@@ -1440,23 +1318,20 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		Assert.notNull(writer, "MongoWriter must not be null!");
 
 		Mono<List<Tuple2<AdaptibleEntity<T>, Document>>> prepareDocuments = Flux.fromIterable(batchToSave)
-				.flatMap(uninitialized -> {
+				.map(uninitialized -> {
 
 					BeforeConvertEvent<T> event = new BeforeConvertEvent<>(uninitialized, collectionName);
 					T toConvert = maybeEmitEvent(event).getSource();
 
-					return maybeCallBeforeConvert(toConvert, collectionName).flatMap(it -> {
+					AdaptibleEntity<T> entity = operations.forEntity(toConvert, mongoConverter.getConversionService());
+					entity.assertUpdateableIdIfNotSet();
 
-						AdaptibleEntity<T> entity = operations.forEntity(it, mongoConverter.getConversionService());
-						entity.assertUpdateableIdIfNotSet();
+					T initialized = entity.initializeVersionProperty();
+					Document dbDoc = entity.toMappedDocument(writer).getDocument();
 
-						T initialized = entity.initializeVersionProperty();
-						Document dbDoc = entity.toMappedDocument(writer).getDocument();
+					maybeEmitEvent(new BeforeSaveEvent<>(initialized, dbDoc, collectionName));
 
-						maybeEmitEvent(new BeforeSaveEvent<>(initialized, dbDoc, collectionName));
-
-						return maybeCallBeforeSave(initialized, dbDoc, collectionName).thenReturn(Tuples.of(entity, dbDoc));
-					});
+					return Tuples.of(entity, dbDoc);
 				}).collectList();
 
 		Flux<Tuple2<AdaptibleEntity<T>, Document>> insertDocuments = prepareDocuments.flatMapMany(tuples -> {
@@ -1542,21 +1417,17 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 			source.assertUpdateableIdIfNotSet();
 
 			BeforeConvertEvent<T> event = new BeforeConvertEvent<>(toSave, collectionName);
-			T afterEvent = maybeEmitEvent(event).getSource();
+			T afterEvent = ReactiveMongoTemplate.this.maybeEmitEvent(event).getSource();
 
-			return maybeCallBeforeConvert(afterEvent, collectionName).flatMap(toConvert -> {
+			MappedDocument mapped = operations.forEntity(toSave).toMappedDocument(mongoConverter);
+			Document document = mapped.getDocument();
 
-				MappedDocument mapped = operations.forEntity(toSave).toMappedDocument(mongoConverter);
-				Document document = mapped.getDocument();
+			ReactiveMongoTemplate.this.maybeEmitEvent(new BeforeSaveEvent<>(afterEvent, document, collectionName));
 
-				maybeEmitEvent(new BeforeSaveEvent<>(toConvert, document, collectionName));
-				return maybeCallBeforeSave(toConvert, document, collectionName).flatMap(it -> {
-
-					return doUpdate(collectionName, query, mapped.updateWithoutId(), it.getClass(), false, false).map(result -> {
-						return maybeEmitEvent(new AfterSaveEvent<T>(it, document, collectionName)).getSource();
+			return doUpdate(collectionName, query, mapped.updateWithoutId(), afterEvent.getClass(), false, false)
+					.map(result -> {
+						return maybeEmitEvent(new AfterSaveEvent<T>(afterEvent, document, collectionName)).getSource();
 					});
-				});
-			});
 		});
 	}
 
@@ -1568,20 +1439,14 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 
 			T toSave = maybeEmitEvent(new BeforeConvertEvent<T>(objectToSave, collectionName)).getSource();
 
-			return maybeCallBeforeConvert(toSave, collectionName).flatMap(toConvert -> {
+			AdaptibleEntity<T> entity = operations.forEntity(toSave, mongoConverter.getConversionService());
+			Document dbDoc = entity.toMappedDocument(writer).getDocument();
+			maybeEmitEvent(new BeforeSaveEvent<T>(toSave, dbDoc, collectionName));
 
-				AdaptibleEntity<T> entity = operations.forEntity(toConvert, mongoConverter.getConversionService());
-				Document dbDoc = entity.toMappedDocument(writer).getDocument();
-				maybeEmitEvent(new BeforeSaveEvent<T>(toConvert, dbDoc, collectionName));
+			return saveDocument(collectionName, dbDoc, toSave.getClass()).map(id -> {
 
-				return maybeCallBeforeSave(toConvert, dbDoc, collectionName).flatMap(it -> {
-
-					return saveDocument(collectionName, dbDoc, it.getClass()).map(id -> {
-
-						T saved = entity.populateIdIfNecessary(id);
-						return maybeEmitEvent(new AfterSaveEvent<>(saved, dbDoc, collectionName)).getSource();
-					});
-				});
+				T saved = entity.populateIdIfNecessary(id);
+				return maybeEmitEvent(new AfterSaveEvent<>(saved, dbDoc, collectionName)).getSource();
 			});
 		});
 	}
@@ -1748,7 +1613,12 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		return doUpdate(collectionName, query, update, entityClass, false, true);
 	}
 
-	protected Mono<UpdateResult> doUpdate(String collectionName, Query query, @Nullable UpdateDefinition update,
+	protected Mono<UpdateResult> doUpdate(String collectionName, Query query, @Nullable Update update,
+			@Nullable Class<?> entityClass, boolean upsert, boolean multi) {
+		return doUpdate(collectionName, query, (UpdateDefinition) update, entityClass, upsert, multi);
+	}
+
+	private Mono<UpdateResult> doUpdate(String collectionName, Query query, @Nullable UpdateDefinition update,
 			@Nullable Class<?> entityClass, boolean upsert, boolean multi) {
 
 		MongoPersistentEntity<?> entity = entityClass == null ? null : getPersistentEntity(entityClass);
@@ -1772,14 +1642,7 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 			MongoCollection<Document> collectionToUse = prepareCollection(collection, writeConcernToUse);
 
 			UpdateOptions updateOptions = new UpdateOptions().upsert(upsert);
-			operations.forType(entityClass).getCollation(query) //
-					.map(Collation::toMongoCollation) //
-					.ifPresent(updateOptions::collation);
-
-			if (update.hasArrayFilters()) {
-				updateOptions.arrayFilters(update.getArrayFilters().stream().map(ArrayFilter::asDocument)
-						.map(it -> queryMapper.getMappedObject(it, entity)).collect(Collectors.toList()));
-			}
+			query.getCollation().map(Collation::toMongoCollation).ifPresent(updateOptions::collation);
 
 			if (!UpdateMapper.isUpdateObject(updateObj)) {
 
@@ -1829,7 +1692,7 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 			return false;
 		}
 
-		return document.containsKey(persistentEntity.getRequiredVersionProperty().getFieldName());
+		return document.containsKey(persistentEntity.getRequiredIdProperty().getFieldName());
 	}
 
 	/*
@@ -1858,7 +1721,7 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 
 		Assert.notNull(object, "Object must not be null!");
 
-		return remove(operations.forEntity(object).getRemoveByQuery(), object.getClass());
+		return remove(operations.forEntity(object).getByIdQuery(), object.getClass());
 	}
 
 	/*
@@ -1870,7 +1733,7 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		Assert.notNull(object, "Object must not be null!");
 		Assert.hasText(collectionName, "Collection name must not be null or empty!");
 
-		return doRemove(collectionName, operations.forEntity(object).getRemoveByQuery(), object.getClass());
+		return doRemove(collectionName, operations.forEntity(object).getByIdQuery(), object.getClass());
 	}
 
 	private void assertUpdateableIdIfNotSet(Object value) {
@@ -1928,33 +1791,31 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 
 		Document queryObject = query.getQueryObject();
 		MongoPersistentEntity<?> entity = getPersistentEntity(entityClass);
-		Document removeQuery = queryMapper.getMappedObject(queryObject, entity);
 
 		return execute(collectionName, collection -> {
 
-			maybeEmitEvent(new BeforeDeleteEvent<>(removeQuery, entityClass, collectionName));
+			Document removeQuey = queryMapper.getMappedObject(queryObject, entity);
+
+			maybeEmitEvent(new BeforeDeleteEvent<>(removeQuey, entityClass, collectionName));
 
 			MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.REMOVE, collectionName, entityClass,
-					null, removeQuery);
+					null, removeQuey);
 
 			DeleteOptions deleteOptions = new DeleteOptions();
-
-			operations.forType(entityClass).getCollation(query) //
-					.map(Collation::toMongoCollation) //
-					.ifPresent(deleteOptions::collation);
+			query.getCollation().map(Collation::toMongoCollation).ifPresent(deleteOptions::collation);
 
 			WriteConcern writeConcernToUse = prepareWriteConcern(mongoAction);
 			MongoCollection<Document> collectionToUse = prepareCollection(collection, writeConcernToUse);
 
 			if (LOGGER.isDebugEnabled()) {
 				LOGGER.debug("Remove using query: {} in collection: {}.",
-						new Object[] { serializeToJsonSafely(removeQuery), collectionName });
+						new Object[] { serializeToJsonSafely(removeQuey), collectionName });
 			}
 
 			if (query.getLimit() > 0 || query.getSkip() > 0) {
 
 				FindPublisher<Document> cursor = new QueryFindPublisherPreparer(query, entityClass)
-						.prepare(collection.find(removeQuery)) //
+						.prepare(collection.find(removeQuey)) //
 						.projection(MappedDocument.getIdOnlyProjection());
 
 				return Flux.from(cursor) //
@@ -1965,10 +1826,10 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 							return collectionToUse.deleteMany(MappedDocument.getIdIn(val), deleteOptions);
 						});
 			} else {
-				return collectionToUse.deleteMany(removeQuery, deleteOptions);
+				return collectionToUse.deleteMany(removeQuey, deleteOptions);
 			}
 
-		}).doOnNext(it -> maybeEmitEvent(new AfterDeleteEvent<>(queryObject, entityClass, collectionName))) //
+		}).doOnNext(deleteResult -> maybeEmitEvent(new AfterDeleteEvent<>(queryObject, entityClass, collectionName)))
 				.next();
 	}
 
@@ -2069,7 +1930,8 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 
 		publisher = options.getResumeToken().map(BsonValue::asDocument).map(publisher::resumeAfter).orElse(publisher);
 		publisher = options.getCollation().map(Collation::toMongoCollation).map(publisher::collation).orElse(publisher);
-		publisher = options.getResumeBsonTimestamp().map(publisher::startAtOperationTime).orElse(publisher);
+		publisher = options.getResumeTimestamp().map(it -> new BsonTimestamp((int) it.getEpochSecond(), 0))
+				.map(publisher::startAtOperationTime).orElse(publisher);
 		publisher = publisher.fullDocument(options.getFullDocumentLookup().orElse(fullDocument));
 
 		return Flux.from(publisher).map(document -> new ChangeStreamEvent<>(document, targetType, getConverter()));
@@ -2511,9 +2373,7 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 						collectionName));
 			}
 
-			return executeFindOneInternal(
-					new FindAndModifyCallback(mappedQuery, fields, sort, mappedUpdate,
-							update.getArrayFilters().stream().map(ArrayFilter::asDocument).collect(Collectors.toList()), options),
+			return executeFindOneInternal(new FindAndModifyCallback(mappedQuery, fields, sort, mappedUpdate, options),
 					new ReadDocumentCallback<>(this.mongoConverter, entityClass, collectionName), collectionName);
 		});
 	}
@@ -2548,10 +2408,11 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 						serializeToJsonSafely(replacement), collectionName);
 			}
 
+			maybeEmitEvent(new BeforeSaveEvent<>(replacement, replacement, collectionName));
+
 			return executeFindOneInternal(
 					new FindAndReplaceCallback(mappedQuery, mappedFields, mappedSort, replacement, collation, options),
 					new ProjectingReadCallback<>(this.mongoConverter, entityType, resultType, collectionName), collectionName);
-
 		});
 	}
 
@@ -2564,26 +2425,6 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		return event;
 	}
 
-	@SuppressWarnings("unchecked")
-	protected <T> Mono<T> maybeCallBeforeConvert(T object, String collection) {
-
-		if (null != entityCallbacks) {
-			return entityCallbacks.callback(ReactiveBeforeConvertCallback.class, object, collection);
-		}
-
-		return Mono.just(object);
-	}
-
-	@SuppressWarnings("unchecked")
-	protected <T> Mono<T> maybeCallBeforeSave(T object, Document document, String collection) {
-
-		if (null != entityCallbacks) {
-			return entityCallbacks.callback(ReactiveBeforeSaveCallback.class, object, document, collection);
-		}
-
-		return Mono.just(object);
-	}
-
 	private MongoCollection<Document> getAndPrepareCollection(MongoDatabase db, String collectionName) {
 
 		try {
@@ -2706,6 +2547,18 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		});
 	}
 
+	private <T> T execute(MongoDatabaseCallback<T> action) {
+
+		Assert.notNull(action, "MongoDatabaseCallback must not be null!");
+
+		try {
+			MongoDatabase db = this.doGetDatabase();
+			return action.doInDatabase(db);
+		} catch (RuntimeException e) {
+			throw potentiallyConvertRuntimeException(e, exceptionTranslator);
+		}
+	}
+
 	/**
 	 * Exception translation {@link Function} intended for {@link Flux#onErrorMap(Function)} usage.
 	 *
@@ -2904,7 +2757,6 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		private final Document fields;
 		private final Document sort;
 		private final Document update;
-		private final List<Document> arrayFilters;
 		private final FindAndModifyOptions options;
 
 		@Override
@@ -2920,13 +2772,12 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 				return collection.findOneAndDelete(query, findOneAndDeleteOptions);
 			}
 
-			FindOneAndUpdateOptions findOneAndUpdateOptions = convertToFindOneAndUpdateOptions(options, fields, sort,
-					arrayFilters);
+			FindOneAndUpdateOptions findOneAndUpdateOptions = convertToFindOneAndUpdateOptions(options, fields, sort);
 			return collection.findOneAndUpdate(query, update, findOneAndUpdateOptions);
 		}
 
-		private static FindOneAndUpdateOptions convertToFindOneAndUpdateOptions(FindAndModifyOptions options,
-				Document fields, Document sort, List<Document> arrayFilters) {
+		private FindOneAndUpdateOptions convertToFindOneAndUpdateOptions(FindAndModifyOptions options, Document fields,
+				Document sort) {
 
 			FindOneAndUpdateOptions result = new FindOneAndUpdateOptions();
 
@@ -2939,7 +2790,6 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 			}
 
 			result = options.getCollation().map(Collation::toMongoCollation).map(result::collation).orElse(result);
-			result.arrayFilters(arrayFilters);
 
 			return result;
 		}
@@ -3115,11 +2965,9 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 	 * a delegate and creates a {@link GeoResult} from the result.
 	 *
 	 * @author Mark Paluch
-	 * @author Chrstoph Strobl
 	 */
 	static class GeoNearResultDocumentCallback<T> implements DocumentCallback<GeoResult<T>> {
 
-		private final String distanceField;
 		private final DocumentCallback<T> delegate;
 		private final Metric metric;
 
@@ -3127,27 +2975,22 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		 * Creates a new {@link GeoNearResultDocumentCallback} using the given {@link DocumentCallback} delegate for
 		 * {@link GeoResult} content unmarshalling.
 		 *
-		 * @param distanceField the field to read the distance from.
 		 * @param delegate must not be {@literal null}.
-		 * @param metric the {@link Metric} to apply to the result distance.
 		 */
-		GeoNearResultDocumentCallback(String distanceField, DocumentCallback<T> delegate, Metric metric) {
+		GeoNearResultDocumentCallback(DocumentCallback<T> delegate, Metric metric) {
 
 			Assert.notNull(delegate, "DocumentCallback must not be null!");
 
-			this.distanceField = distanceField;
 			this.delegate = delegate;
 			this.metric = metric;
 		}
 
 		public GeoResult<T> doWith(Document object) {
 
-			double distance = Double.NaN;
-			if (object.containsKey(distanceField)) {
-				distance = NumberUtils.convertNumberToTargetClass(object.get(distanceField, Number.class), Double.class);
-			}
+			double distance = (Double) object.get("dis");
+			Document content = (Document) object.get("obj");
 
-			T doWith = delegate.doWith(object);
+			T doWith = delegate.doWith(content);
 
 			return new GeoResult<>(doWith, new Distance(distance, metric));
 		}
@@ -3158,10 +3001,10 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 	 */
 	class QueryFindPublisherPreparer implements FindPublisherPreparer {
 
-		private final Query query;
+		private final @Nullable Query query;
 		private final @Nullable Class<?> type;
 
-		QueryFindPublisherPreparer(Query query, @Nullable Class<?> type) {
+		QueryFindPublisherPreparer(@Nullable Query query, @Nullable Class<?> type) {
 
 			this.query = query;
 			this.type = type;
@@ -3170,10 +3013,13 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		@SuppressWarnings("deprecation")
 		public <T> FindPublisher<T> prepare(FindPublisher<T> findPublisher) {
 
-			FindPublisher<T> findPublisherToUse = operations.forType(type) //
-					.getCollation(query) //
-					.map(Collation::toMongoCollation) //
-					.map(findPublisher::collation) //
+			if (query == null) {
+				return findPublisher;
+			}
+
+			FindPublisher<T> findPublisherToUse;
+
+			findPublisherToUse = query.getCollation().map(Collation::toMongoCollation).map(findPublisher::collation)
 					.orElse(findPublisher);
 
 			Meta meta = query.getMeta();
@@ -3299,16 +3145,32 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 
 		/*
 		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveMongoTemplate#count(java.lang.String, org.bson.Document, com.mongodb.client.model.CountOptions)
+		 * @see org.springframework.data.mongodb.core.ReactiveMongoTemplate#count(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
 		 */
 		@Override
-		public Mono<Long> doCount(String collectionName, Document filter, CountOptions options) {
+		public Mono<Long> count(Query query, @Nullable Class<?> entityClass, String collectionName) {
 
 			if (!session.hasActiveTransaction()) {
-				return super.doCount(collectionName, filter, options);
+				return super.count(query, entityClass, collectionName);
 			}
 
-			return createMono(collectionName, collection -> collection.countDocuments(filter, options));
+			return createMono(collectionName, collection -> {
+
+				Document filter = query == null ? null
+						: delegate.queryMapper.getMappedObject(query.getQueryObject(),
+								entityClass == null ? null : delegate.mappingContext.getPersistentEntity(entityClass));
+
+				CountOptions options = new CountOptions();
+				if (query != null) {
+					query.getCollation().map(Collation::toMongoCollation).ifPresent(options::collation);
+				}
+
+				if (LOGGER.isDebugEnabled()) {
+					LOGGER.debug("Executing count: {} in collection: {}", serializeToJsonSafely(filter), collectionName);
+				}
+
+				return collection.countDocuments(filter, options);
+			});
 		}
 	}
 
@@ -3328,60 +3190,8 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 
 			// Double check type as Spring infrastructure does not consider nested generics
 			if (entity instanceof MongoPersistentEntity) {
-
 				onCheckForIndexes((MongoPersistentEntity<?>) entity, subscriptionExceptionHandler);
 			}
 		}
 	}
-
-	/**
-	 * Value object chaining together a given source document with its mapped representation and the collection to persist
-	 * it to.
-	 *
-	 * @param <T>
-	 * @author Christoph Strobl
-	 * @since 2.2
-	 */
-	private static class PersistableEntityModel<T> {
-
-		private final T source;
-		private final @Nullable Document target;
-		private final String collection;
-
-		private PersistableEntityModel(T source, @Nullable Document target, String collection) {
-
-			this.source = source;
-			this.target = target;
-			this.collection = collection;
-		}
-
-		static <T> PersistableEntityModel<T> of(T source, String collection) {
-			return new PersistableEntityModel<>(source, null, collection);
-		}
-
-		static <T> PersistableEntityModel<T> of(T source, Document target, String collection) {
-			return new PersistableEntityModel<>(source, target, collection);
-		}
-
-		PersistableEntityModel<T> mutate(T source) {
-			return new PersistableEntityModel(source, target, collection);
-		}
-
-		PersistableEntityModel<T> addTargetDocument(Document target) {
-			return new PersistableEntityModel(source, target, collection);
-		}
-
-		T getSource() {
-			return source;
-		}
-
-		@Nullable
-		Document getTarget() {
-			return target;
-		}
-
-		String getCollection() {
-			return collection;
-		}
-	}
 }

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

@@ -123,7 +123,7 @@ class ReactiveUpdateOperationSupport implements ReactiveUpdateOperation {
 
 			String collectionName = getCollectionName();
 
-			return template.findAndModify(query, update, findAndModifyOptions != null ? findAndModifyOptions : FindAndModifyOptions.none(), targetType, collectionName);
+			return template.findAndModify(query, update, findAndModifyOptions, targetType, collectionName);
 		}
 
 		/* 
@@ -133,7 +133,7 @@ class ReactiveUpdateOperationSupport implements ReactiveUpdateOperation {
 		@Override
 		public Mono<T> findAndReplace() {
 			return template.findAndReplace(query, replacement,
-					findAndReplaceOptions != null ? findAndReplaceOptions : FindAndReplaceOptions.none(), (Class) domainType,
+					findAndReplaceOptions != null ? findAndReplaceOptions : new FindAndReplaceOptions(), (Class) domainType,
 					getCollectionName(), targetType);
 		}
 

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

@@ -29,9 +29,7 @@ import com.mongodb.DB;
  * @author Christoph Strobl
  * @author Oliver Gierke
  * @since 1.7
- * @deprecated since 2.2. The {@code eval} command has been removed without replacement in MongoDB Server 4.2.0.
  */
-@Deprecated
 public interface ScriptOperations {
 
 	/**

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

@@ -211,15 +211,6 @@ public class SimpleReactiveMongoDatabaseFactory implements DisposableBean, React
 			return delegate.withSession(session);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.ReactiveMongoDatabaseFactory#isTransactionActive()
-		 */
-		@Override
-		public boolean isTransactionActive() {
-			return session != null && session.hasActiveTransaction();
-		}
-
 		private MongoDatabase decorateDatabase(MongoDatabase database) {
 			return createProxyInstance(session, database, MongoDatabase.class);
 		}

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

@@ -612,7 +612,7 @@ public class Aggregation {
 	}
 
 	/**
-	 * Creates a new {@link GeoNearOperation} instance from the given {@link NearQuery} and the {@code distanceField}. The
+	 * Creates a new {@link GeoNearOperation} instance from the given {@link NearQuery} and the{@code distanceField}. The
 	 * {@code distanceField} defines output field that contains the calculated distance.
 	 *
 	 * @param query must not be {@literal null}.

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

@@ -15,9 +15,6 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import java.util.Collections;
-import java.util.List;
-
 import org.bson.Document;
 
 /**
@@ -35,23 +32,7 @@ public interface AggregationOperation {
 	 * Turns the {@link AggregationOperation} into a {@link Document} by using the given
 	 * {@link AggregationOperationContext}.
 	 *
-	 * @param context the {@link AggregationOperationContext} to operate within. Must not be {@literal null}.
 	 * @return the Document
-	 * @deprecated since 2.2 in favor of {@link #toPipelineStages(AggregationOperationContext)}.
 	 */
-	@Deprecated
 	Document toDocument(AggregationOperationContext context);
-
-	/**
-	 * Turns the {@link AggregationOperation} into list of {@link Document stages} by using the given
-	 * {@link AggregationOperationContext}. This allows a single {@link AggregationOptions} to add additional stages for
-	 * eg. {@code $sort} or {@code $limit}.
-	 *
-	 * @param context the {@link AggregationOperationContext} to operate within. Must not be {@literal null}.
-	 * @return the pipeline stages to run through. Never {@literal null}.
-	 * @since 2.2
-	 */
-	default List<Document> toPipelineStages(AggregationOperationContext context) {
-		return Collections.singletonList(toDocument(context));
-	}
 }

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

@@ -17,7 +17,6 @@ package org.springframework.data.mongodb.core.aggregation;
 
 import org.bson.Document;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
-import org.springframework.lang.Nullable;
 
 /**
  * The context for an {@link AggregationOperation}.
@@ -34,20 +33,7 @@ public interface AggregationOperationContext {
 	 * @param document will never be {@literal null}.
 	 * @return must not be {@literal null}.
 	 */
-	default Document getMappedObject(Document document) {
-		return getMappedObject(document, null);
-	}
-
-	/**
-	 * Returns the mapped {@link Document}, potentially converting the source considering mapping metadata for the given
-	 * type.
-	 *
-	 * @param document will never be {@literal null}.
-	 * @param type can be {@literal null}.
-	 * @return must not be {@literal null}.
-	 * @since 2.2
-	 */
-	Document getMappedObject(Document document, @Nullable Class<?> type);
+	Document getMappedObject(Document document);
 
 	/**
 	 * 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/AggregationOperationRenderer.java

@@ -24,7 +24,6 @@ import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedFi
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
 import org.springframework.data.mongodb.core.aggregation.Fields.AggregationField;
 import org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation.InheritsFieldsAggregationOperation;
-import org.springframework.lang.Nullable;
 
 /**
  * Rendering support for {@link AggregationOperation} into a {@link List} of {@link org.bson.Document}.
@@ -53,7 +52,7 @@ class AggregationOperationRenderer {
 
 		for (AggregationOperation operation : operations) {
 
-			operationDocuments.addAll(operation.toPipelineStages(contextToUse));
+			operationDocuments.add(operation.toDocument(contextToUse));
 
 			if (operation instanceof FieldsExposingAggregationOperation) {
 
@@ -76,16 +75,15 @@ class AggregationOperationRenderer {
 	 * Simple {@link AggregationOperationContext} that just returns {@link FieldReference}s as is.
 	 *
 	 * @author Oliver Gierke
-	 * @author Christoph Strobl
 	 */
 	private static class NoOpAggregationOperationContext implements AggregationOperationContext {
 
 		/*
 		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(org.bson.Document, java.lang.Class)
+		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(org.bson.Document)
 		 */
 		@Override
-		public Document getMappedObject(Document document, @Nullable Class<?> type) {
+		public Document getMappedObject(Document document) {
 			return document;
 		}
 

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

@@ -44,13 +44,11 @@ public class AggregationOptions {
 	private static final String EXPLAIN = "explain";
 	private static final String ALLOW_DISK_USE = "allowDiskUse";
 	private static final String COLLATION = "collation";
-	private static final String COMMENT = "comment";
 
 	private final boolean allowDiskUse;
 	private final boolean explain;
 	private final Optional<Document> cursor;
 	private final Optional<Collation> collation;
-	private final Optional<String> comment;
 
 	/**
 	 * Creates a new {@link AggregationOptions}.
@@ -75,28 +73,11 @@ public class AggregationOptions {
 	 */
 	public AggregationOptions(boolean allowDiskUse, boolean explain, @Nullable Document cursor,
 			@Nullable Collation collation) {
-		this(allowDiskUse, explain, cursor, collation, null);
-	}
-
-	/**
-	 * Creates a new {@link AggregationOptions}.
-	 *
-	 * @param allowDiskUse whether to off-load intensive sort-operations to disk.
-	 * @param explain whether to get the execution plan for the aggregation instead of the actual results.
-	 * @param cursor can be {@literal null}, used to pass additional options (such as {@code batchSize}) to the
-	 *          aggregation.
-	 * @param collation collation for string comparison. Can be {@literal null}.
-	 * @param comment execution comment. Can be {@literal null}.
-	 * @since 2.2
-	 */
-	public AggregationOptions(boolean allowDiskUse, boolean explain, @Nullable Document cursor,
-			@Nullable Collation collation, @Nullable String comment) {
 
 		this.allowDiskUse = allowDiskUse;
 		this.explain = explain;
 		this.cursor = Optional.ofNullable(cursor);
 		this.collation = Optional.ofNullable(collation);
-		this.comment = Optional.ofNullable(comment);
 	}
 
 	/**
@@ -127,9 +108,8 @@ public class AggregationOptions {
 		Document cursor = document.get(CURSOR, Document.class);
 		Collation collation = document.containsKey(COLLATION) ? Collation.from(document.get(COLLATION, Document.class))
 				: null;
-		String comment = document.getString(COMMENT);
 
-		return new AggregationOptions(allowDiskUse, explain, cursor, collation, comment);
+		return new AggregationOptions(allowDiskUse, explain, cursor, collation);
 	}
 
 	/**
@@ -196,16 +176,6 @@ public class AggregationOptions {
 		return collation;
 	}
 
-	/**
-	 * Get the comment for the aggregation.
-	 *
-	 * @return
-	 * @since 2.2
-	 */
-	public Optional<String> getComment() {
-		return comment;
-	}
-
 	/**
 	 * Returns a new potentially adjusted copy for the given {@code aggregationCommandObject} with the configuration
 	 * applied.
@@ -249,7 +219,6 @@ public class AggregationOptions {
 
 		cursor.ifPresent(val -> document.put(CURSOR, val));
 		collation.ifPresent(val -> document.append(COLLATION, val.toDocument()));
-		comment.ifPresent(val -> document.append(COMMENT, val));
 
 		return document;
 	}
@@ -278,7 +247,6 @@ public class AggregationOptions {
 		private boolean explain;
 		private @Nullable Document cursor;
 		private @Nullable Collation collation;
-		private @Nullable String comment;
 
 		/**
 		 * Defines whether to off-load intensive sort-operations to disk.
@@ -334,7 +302,6 @@ public class AggregationOptions {
 		 *
 		 * @param collation can be {@literal null}.
 		 * @return
-		 * @since 2.0
 		 */
 		public Builder collation(@Nullable Collation collation) {
 
@@ -342,26 +309,13 @@ public class AggregationOptions {
 			return this;
 		}
 
-		/**
-		 * Define a comment to describe the execution.
-		 *
-		 * @param comment can be {@literal null}.
-		 * @return
-		 * @since 2.2
-		 */
-		public Builder comment(@Nullable String comment) {
-
-			this.comment = comment;
-			return this;
-		}
-
 		/**
 		 * Returns a new {@link AggregationOptions} instance with the given configuration.
 		 *
 		 * @return
 		 */
 		public AggregationOptions build() {
-			return new AggregationOptions(allowDiskUse, explain, cursor, collation, comment);
+			return new AggregationOptions(allowDiskUse, explain, cursor, collation);
 		}
 	}
 }

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

@@ -20,7 +20,7 @@ import org.springframework.util.Assert;
 
 /**
  * An {@link AggregationExpression} that renders a MongoDB Aggregation Framework expression from the AST of a
- * <a href="https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#expressions">SpEL
+ * <a href="http://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#expressions">SpEL
  * expression</a>. <br />
  * <br />
  * <strong>Samples:</strong> <br />

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

@@ -56,11 +56,11 @@ class ExposedFieldsAggregationOperationContext implements AggregationOperationCo
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(org.bson.Document, java.lang.Class)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(org.bson.Document)
 	 */
 	@Override
-	public Document getMappedObject(Document document, @Nullable Class<?> type) {
-		return rootContext.getMappedObject(document, type);
+	public Document getMappedObject(Document document) {
+		return rootContext.getMappedObject(document);
 	}
 
 	/*

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

@@ -15,15 +15,10 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 import org.bson.Document;
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
-import org.springframework.util.NumberUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -94,15 +89,6 @@ public class GeoNearOperation implements AggregationOperation {
 	public Document toDocument(AggregationOperationContext context) {
 
 		Document command = context.getMappedObject(nearQuery.toDocument());
-
-		if(command.containsKey("query")) {
-			command.replace("query", context.getMappedObject(command.get("query", Document.class)));
-		}
-
-		if(command.containsKey("collation")) {
-			command.remove("collation");
-		}
-
 		command.put("distanceField", distanceField);
 
 		if (StringUtils.hasText(indexKey)) {
@@ -111,28 +97,4 @@ public class GeoNearOperation implements AggregationOperation {
 
 		return new Document("$geoNear", command);
 	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toPipelineStages(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
-	@Override
-	public List<Document> toPipelineStages(AggregationOperationContext context) {
-
-		Document command = toDocument(context);
-		Number limit = (Number) command.get("$geoNear", Document.class).remove("num");
-
-		List<Document> stages = new ArrayList<>();
-		stages.add(command);
-
-		if(nearQuery.getSkip() != null && nearQuery.getSkip() > 0){
-			stages.add(new Document("$skip", nearQuery.getSkip()));
-		}
-
-		if(limit != null) {
-			stages.add(new Document("$limit", limit.longValue()));
-		}
-
-		return stages;
-	}
 }

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

@@ -128,13 +128,7 @@ public class GraphLookupOperation implements InheritsFieldsAggregationOperation
 	 */
 	@Override
 	public ExposedFields getFields() {
-
-		List<ExposedField> fields = new ArrayList<>(2);
-		fields.add(new ExposedField(as, true));
-		if(depthField != null) {
-			fields.add(new ExposedField(depthField, true));
-		}
-		return ExposedFields.from(fields.toArray(new ExposedField[0]));
+		return ExposedFields.from(new ExposedField(as, true));
 	}
 
 	/**

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

@@ -52,15 +52,6 @@ class NestedDelegatingExpressionAggregationOperationContext implements Aggregati
 		return delegate.getMappedObject(document);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(org.bson.Document, java.lang.Class)
-	 */
-	@Override
-	public Document getMappedObject(Document document, Class<?> type) {
-		return delegate.getMappedObject(document, type);
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(org.springframework.data.mongodb.core.aggregation.Field)

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

@@ -16,11 +16,7 @@
 package org.springframework.data.mongodb.core.aggregation;
 
 import org.bson.Document;
-
-import org.springframework.data.mongodb.util.BsonUtils;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
 
 /**
  * Encapsulates the {@code $out}-operation.
@@ -30,161 +26,18 @@ import org.springframework.util.StringUtils;
  *
  * @author Nikolay Bogdanov
  * @author Christoph Strobl
- * @see <a href="https://docs.mongodb.com/manual/reference/operator/aggregation/out/">MongoDB Aggregation Framework:
- *      $out</a>
+ * @see <a href="https://docs.mongodb.com/manual/reference/operator/aggregation/out/">MongoDB Aggregation Framework: $out</a>
  */
 public class OutOperation implements AggregationOperation {
 
-	private final @Nullable String databaseName;
 	private final String collectionName;
-	private final @Nullable Document uniqueKey;
-	private final @Nullable OutMode mode;
 
 	/**
 	 * @param outCollectionName Collection name to export the results. Must not be {@literal null}.
 	 */
 	public OutOperation(String outCollectionName) {
-		this(null, outCollectionName, null, null);
-	}
-
-	/**
-	 * @param databaseName Optional database name the target collection is located in. Can be {@literal null}.
-	 * @param collectionName Collection name to export the results. Must not be {@literal null}. Can be {@literal null}.
-	 * @param uniqueKey Optional unique key spec identify a document in the to collection for replacement or merge.
-	 * @param mode The mode for merging the aggregation pipeline output with the target collection. Can be
-	 *          {@literal null}. {@literal null}.
-	 * @since 2.2
-	 */
-	private OutOperation(@Nullable String databaseName, String collectionName, @Nullable Document uniqueKey,
-			@Nullable OutMode mode) {
-
-		Assert.notNull(collectionName, "Collection name must not be null!");
-
-		this.databaseName = databaseName;
-		this.collectionName = collectionName;
-		this.uniqueKey = uniqueKey;
-		this.mode = mode;
-	}
-
-	/**
-	 * Optionally specify the database of the target collection. <br />
-	 * <strong>NOTE:</strong> Requires MongoDB 4.2 or later.
-	 *
-	 * @param database can be {@literal null}. Defaulted to aggregation target database.
-	 * @return new instance of {@link OutOperation}.
-	 * @since 2.2
-	 */
-	public OutOperation in(@Nullable String database) {
-		return new OutOperation(database, collectionName, uniqueKey, mode);
-	}
-
-	/**
-	 * Optionally specify the field that uniquely identifies a document in the target collection. <br />
-	 * For convenience the given {@literal key} can either be a single field name or the Json representation of a key
-	 * {@link Document}.
-	 *
-	 * <pre class="code">
-	 *
-	 * // {
-	 * //    "field-1" : 1
-	 * // }
-	 * .uniqueKey("field-1")
-	 *
-	 * // {
-	 * //    "field-1" : 1,
-	 * //    "field-2" : 1
-	 * // }
-	 * .uniqueKey("{ 'field-1' : 1, 'field-2' : 1}")
-	 * </pre>
-	 *
-	 * <strong>NOTE:</strong> Requires MongoDB 4.2 or later.
-	 *
-	 * @param key can be {@literal null}. Server uses {@literal _id} when {@literal null}.
-	 * @return new instance of {@link OutOperation}.
-	 * @since 2.2
-	 */
-	public OutOperation uniqueKey(@Nullable String key) {
-
-		Document uniqueKey = key == null ? null : BsonUtils.toDocumentOrElse(key, it -> new Document(it, 1));
-		return new OutOperation(databaseName, collectionName, uniqueKey, mode);
-	}
-
-	/**
-	 * Optionally specify the fields that uniquely identifies a document in the target collection. <br />
-	 *
-	 * <pre class="code">
-	 *
-	 * // {
-	 * //    "field-1" : 1
-	 * //    "field-2" : 1
-	 * // }
-	 * .uniqueKeyOf(Arrays.asList("field-1", "field-2"))
-	 * </pre>
-	 *
-	 * <strong>NOTE:</strong> Requires MongoDB 4.2 or later.
-	 *
-	 * @param fields must not be {@literal null}.
-	 * @return new instance of {@link OutOperation}.
-	 * @since 2.2
-	 */
-	public OutOperation uniqueKeyOf(Iterable<String> fields) {
-
-		Assert.notNull(fields, "Fields must not be null!");
-
-		Document uniqueKey = new Document();
-		fields.forEach(it -> uniqueKey.append(it, 1));
-
-		return new OutOperation(databaseName, collectionName, uniqueKey, mode);
-	}
-
-	/**
-	 * Specify how to merge the aggregation output with the target collection. <br />
-	 * <strong>NOTE:</strong> Requires MongoDB 4.2 or later.
-	 *
-	 * @param mode must not be {@literal null}.
-	 * @return new instance of {@link OutOperation}.
-	 * @since 2.2
-	 */
-	public OutOperation mode(OutMode mode) {
-
-		Assert.notNull(mode, "Mode must not be null!");
-		return new OutOperation(databaseName, collectionName, uniqueKey, mode);
-	}
-
-	/**
-	 * Replace the target collection. <br />
-	 * <strong>NOTE:</strong> Requires MongoDB 4.2 or later.
-	 *
-	 * @return new instance of {@link OutOperation}.
-	 * @see OutMode#REPLACE_COLLECTION
-	 * @since 2.2
-	 */
-	public OutOperation replaceCollection() {
-		return mode(OutMode.REPLACE_COLLECTION);
-	}
-
-	/**
-	 * Replace/Upsert documents in the target collection. <br />
-	 * <strong>NOTE:</strong> Requires MongoDB 4.2 or later.
-	 *
-	 * @return new instance of {@link OutOperation}.
-	 * @see OutMode#REPLACE
-	 * @since 2.2
-	 */
-	public OutOperation replaceDocuments() {
-		return mode(OutMode.REPLACE);
-	}
-
-	/**
-	 * Insert documents to the target collection. <br />
-	 * <strong>NOTE:</strong> Requires MongoDB 4.2 or later.
-	 *
-	 * @return new instance of {@link OutOperation}.
-	 * @see OutMode#INSERT
-	 * @since 2.2
-	 */
-	public OutOperation insertDocuments() {
-		return mode(OutMode.INSERT);
+		Assert.notNull(outCollectionName, "Collection name must not be null!");
+		this.collectionName = outCollectionName;
 	}
 
 	/*
@@ -193,62 +46,6 @@ public class OutOperation implements AggregationOperation {
 	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
-
-		if (!requiresMongoDb42Format()) {
-			return new Document("$out", collectionName);
-		}
-
-		Assert.state(mode != null, "Mode must not be null!");
-
-		Document $out = new Document("to", collectionName) //
-				.append("mode", mode.getMongoMode());
-
-		if (StringUtils.hasText(databaseName)) {
-			$out.append("db", databaseName);
-		}
-
-		if (uniqueKey != null) {
-			$out.append("uniqueKey", uniqueKey);
-		}
-
-		return new Document("$out", $out);
-	}
-
-	private boolean requiresMongoDb42Format() {
-		return StringUtils.hasText(databaseName) || mode != null || uniqueKey != null;
-	}
-
-	/**
-	 * The mode for merging the aggregation pipeline output.
-	 *
-	 * @author Christoph Strobl
-	 * @since 2.2
-	 */
-	public enum OutMode {
-
-		/**
-		 * Write documents to the target collection. Errors if a document same uniqueKey already exists.
-		 */
-		INSERT("insertDocuments"),
-
-		/**
-		 * Update on any document in the target collection with the same uniqueKey.
-		 */
-		REPLACE("replaceDocuments"),
-
-		/**
-		 * Replaces the to collection with the output from the aggregation pipeline. Cannot be in a different database.
-		 */
-		REPLACE_COLLECTION("replaceCollection");
-
-		private String mode;
-
-		OutMode(String mode) {
-			this.mode = mode;
-		}
-
-		public String getMongoMode() {
-			return mode;
-		}
+		return new Document("$out", collectionName);
 	}
 }

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

@@ -25,7 +25,6 @@ import java.util.Set;
 
 import org.bson.Document;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
-import org.springframework.lang.Nullable;
 
 /**
  * {@link AggregationOperationContext} implementation prefixing non-command keys on root level with the given prefix.
@@ -64,15 +63,6 @@ public class PrefixingDelegatingAggregationOperationContext implements Aggregati
 		return doPrefix(delegate.getMappedObject(document));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(org.bson.Document, java.lang.Class)
-	 */
-	@Override
-	public Document getMappedObject(Document document, @Nullable Class<?> type) {
-		return doPrefix(delegate.getMappedObject(document, type));
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(org.springframework.data.mongodb.core.aggregation.Field)

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

@@ -27,7 +27,6 @@ import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldRefe
 import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -71,16 +70,7 @@ public class TypeBasedAggregationOperationContext implements AggregationOperatio
 	 */
 	@Override
 	public Document getMappedObject(Document document) {
-		return getMappedObject(document, type);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(org.bson.Document, java.lang.Class)
-	 */
-	@Override
-	public Document getMappedObject(Document document, @Nullable Class<?> type) {
-		return mapper.getMappedObject(document, type != null ? mappingContext.getPersistentEntity(type) : null);
+		return mapper.getMappedObject(document, mappingContext.getPersistentEntity(type));
 	}
 
 	/*
@@ -89,6 +79,8 @@ public class TypeBasedAggregationOperationContext implements AggregationOperatio
 	 */
 	@Override
 	public FieldReference getReference(Field field) {
+
+		PropertyPath.from(field.getTarget(), type);
 		return getReferenceFor(field);
 	}
 

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

@@ -15,16 +15,13 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
-import java.util.Collections;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.function.UnaryOperator;
 
 import org.bson.Document;
 import org.bson.conversions.Bson;
-
-import org.springframework.data.convert.CustomConversions;
 import org.springframework.data.convert.DefaultTypeMapper;
 import org.springframework.data.convert.SimpleTypeInformationMapper;
 import org.springframework.data.convert.TypeAliasAccessor;
@@ -61,58 +58,21 @@ public class DefaultMongoTypeMapper extends DefaultTypeMapper<Bson> implements M
 
 	private final TypeAliasAccessor<Bson> accessor;
 	private final @Nullable String typeKey;
-	private UnaryOperator<Class<?>> writeTarget = UnaryOperator.identity();
 
-	/**
-	 * Create a new {@link MongoTypeMapper} with fully-qualified type hints using {@code _class}.
-	 */
 	public DefaultMongoTypeMapper() {
 		this(DEFAULT_TYPE_KEY);
 	}
 
-	/**
-	 * Create a new {@link MongoTypeMapper} with fully-qualified type hints using {@code typeKey}.
-	 *
-	 * @param typeKey name of the field to read and write type hints. Can be {@literal null} to disable type hints.
-	 */
 	public DefaultMongoTypeMapper(@Nullable String typeKey) {
-		this(typeKey, Collections.singletonList(new SimpleTypeInformationMapper()));
+		this(typeKey, Arrays.asList(new SimpleTypeInformationMapper()));
 	}
 
-	/**
-	 * Create a new {@link MongoTypeMapper} with fully-qualified type hints using {@code typeKey}.
-	 *
-	 * @param typeKey name of the field to read and write type hints. Can be {@literal null} to disable type hints.
-	 * @param mappingContext the mapping context.
-	 */
 	public DefaultMongoTypeMapper(@Nullable String typeKey,
 			MappingContext<? extends PersistentEntity<?, ?>, ?> mappingContext) {
 		this(typeKey, new DocumentTypeAliasAccessor(typeKey), mappingContext,
-				Collections.singletonList(new SimpleTypeInformationMapper()));
+				Arrays.asList(new SimpleTypeInformationMapper()));
 	}
 
-	/**
-	 * Create a new {@link MongoTypeMapper} with fully-qualified type hints using {@code typeKey}. Uses
-	 * {@link UnaryOperator} to apply {@link CustomConversions}.
-	 *
-	 * @param typeKey name of the field to read and write type hints. Can be {@literal null} to disable type hints.
-	 * @param mappingContext the mapping context to look up types using type hints.
-	 * @see MappingMongoConverter#getWriteTarget(Class)
-	 */
-	public DefaultMongoTypeMapper(@Nullable String typeKey,
-			MappingContext<? extends PersistentEntity<?, ?>, ?> mappingContext, UnaryOperator<Class<?>> writeTarget) {
-		this(typeKey, new DocumentTypeAliasAccessor(typeKey), mappingContext,
-				Collections.singletonList(new SimpleTypeInformationMapper()));
-		this.writeTarget = writeTarget;
-	}
-
-	/**
-	 * Create a new {@link MongoTypeMapper} with fully-qualified type hints using {@code typeKey}. Uses
-	 * {@link TypeInformationMapper} to map type hints.
-	 *
-	 * @param typeKey name of the field to read and write type hints. Can be {@literal null} to disable type hints.
-	 * @param mappers
-	 */
 	public DefaultMongoTypeMapper(@Nullable String typeKey, List<? extends TypeInformationMapper> mappers) {
 		this(typeKey, new DocumentTypeAliasAccessor(typeKey), null, mappers);
 	}
@@ -160,15 +120,6 @@ public class DefaultMongoTypeMapper extends DefaultTypeMapper<Bson> implements M
 		accessor.writeTypeTo(result, new Document("$in", restrictedMappedTypes));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.MongoTypeMapper#getWriteTargetTypeFor(java.lang.Class)
-	 */
-	@Override
-	public Class<?> getWriteTargetTypeFor(Class<?> source) {
-		return writeTarget.apply(source);
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.convert.DefaultTypeMapper#getFallbackTypeFor(java.lang.Object)

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

@@ -15,33 +15,22 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.Set;
 
 import org.bson.Document;
 import org.bson.conversions.Bson;
-import org.bson.types.ObjectId;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.CollectionFactory;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.DefaultConversionService;
+import org.springframework.data.convert.CustomConversions;
 import org.springframework.data.convert.EntityInstantiator;
+import org.springframework.data.convert.EntityInstantiators;
 import org.springframework.data.convert.TypeMapper;
 import org.springframework.data.mapping.Association;
 import org.springframework.data.mapping.MappingException;
@@ -122,8 +111,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 
 		this.dbRefResolver = dbRefResolver;
 		this.mappingContext = mappingContext;
-		this.typeMapper = new DefaultMongoTypeMapper(DefaultMongoTypeMapper.DEFAULT_TYPE_KEY, mappingContext,
-				this::getWriteTarget);
+		this.typeMapper = new DefaultMongoTypeMapper(DefaultMongoTypeMapper.DEFAULT_TYPE_KEY, mappingContext);
 		this.idMapper = new QueryMapper(this);
 
 		this.spELContext = new SpELContext(DocumentPropertyAccessor.INSTANCE);
@@ -528,7 +516,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 
 		if (idProperty != null && !dbObjectAccessor.hasValue(idProperty)) {
 
-			Object value = idMapper.convertId(accessor.getProperty(idProperty), idProperty.getFieldType());
+			Object value = idMapper.convertId(accessor.getProperty(idProperty));
 
 			if (value != null) {
 				dbObjectAccessor.put(idProperty, value);
@@ -632,7 +620,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			return;
 		}
 
-		MongoPersistentEntity<?> entity = valueType.isSubTypeOf(prop.getType())
+		MongoPersistentEntity<?> entity = isSubTypeOf(obj.getClass(), prop.getType())
 				? mappingContext.getRequiredPersistentEntity(obj.getClass())
 				: mappingContext.getRequiredPersistentEntity(type);
 
@@ -671,10 +659,6 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	protected List<Object> createCollection(Collection<?> collection, MongoPersistentProperty property) {
 
 		if (!property.isDbReference()) {
-
-			if (property.hasExplicitWriteTarget()) {
-				return writeCollectionInternal(collection, new TypeInformationWrapper<>(property), new ArrayList<>());
-			}
 			return writeCollectionInternal(collection, property.getTypeInformation(), new BasicDBList());
 		}
 
@@ -754,8 +738,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			Class<?> elementType = element == null ? null : element.getClass();
 
 			if (elementType == null || conversions.isSimpleType(elementType)) {
-				collection.add(getPotentiallyConvertedSimpleWrite(element,
-						componentType != null ? componentType.getType() : Object.class));
+				collection.add(getPotentiallyConvertedSimpleWrite(element));
 			} else if (element instanceof Collection || elementType.isArray()) {
 				collection.add(writeCollectionInternal(asCollection(element), componentType, new BasicDBList()));
 			} else {
@@ -858,7 +841,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		}
 
 		return conversions.hasCustomWriteTarget(key.getClass(), String.class)
-				? (String) getPotentiallyConvertedSimpleWrite(key, Object.class)
+				? (String) getPotentiallyConvertedSimpleWrite(key)
 				: key.toString();
 	}
 
@@ -900,13 +883,12 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	 * @param key must not be {@literal null}.
 	 */
 	private void writeSimpleInternal(Object value, Bson bson, String key) {
-		addToMap(bson, key, getPotentiallyConvertedSimpleWrite(value, Object.class));
+		addToMap(bson, key, getPotentiallyConvertedSimpleWrite(value));
 	}
 
 	private void writeSimpleInternal(Object value, Bson bson, MongoPersistentProperty property) {
 		DocumentAccessor accessor = new DocumentAccessor(bson);
-		accessor.put(property, getPotentiallyConvertedSimpleWrite(value,
-				property.hasExplicitWriteTarget() ? property.getFieldType() : Object.class));
+		accessor.put(property, getPotentiallyConvertedSimpleWrite(value));
 	}
 
 	/**
@@ -917,19 +899,12 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	 * @return
 	 */
 	@Nullable
-	private Object getPotentiallyConvertedSimpleWrite(@Nullable Object value, @Nullable Class<?> typeHint) {
+	private Object getPotentiallyConvertedSimpleWrite(@Nullable Object value) {
 
 		if (value == null) {
 			return null;
 		}
 
-		if (typeHint != null && Object.class != typeHint) {
-
-			if (conversionService.canConvert(value.getClass(), typeHint)) {
-				value = conversionService.convert(value, typeHint);
-			}
-		}
-
 		Optional<Class<?>> customTarget = conversions.getCustomWriteTarget(value.getClass());
 
 		if (customTarget.isPresent()) {
@@ -1002,8 +977,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 				throw new MappingException("Cannot create a reference to an object with a NULL id.");
 			}
 
-			return dbRefResolver.createDbRef(property == null ? null : property.getDBRef(), entity,
-					idMapper.convertId(id, idProperty != null ? idProperty.getFieldType() : ObjectId.class));
+			return dbRefResolver.createDbRef(property == null ? null : property.getDBRef(), entity, idMapper.convertId(id));
 		}
 
 		throw new MappingException("No id property found on class " + entity.getType());
@@ -1033,8 +1007,9 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		Assert.notNull(targetType, "Target type must not be null!");
 		Assert.notNull(path, "Object path must not be null!");
 
-		Class<?> collectionType = targetType.isSubTypeOf(Collection.class) //
-				? targetType.getType() //
+		Class<?> collectionType = targetType.getType();
+		collectionType = isSubTypeOf(collectionType, Collection.class) //
+				? collectionType //
 				: List.class;
 
 		TypeInformation<?> componentType = targetType.getComponentType() != null //
@@ -1228,8 +1203,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 
 		if (conversions.isSimpleType(obj.getClass())) {
 			// Doesn't need conversion
-			return getPotentiallyConvertedSimpleWrite(obj,
-					typeInformation != null ? typeInformation.getType() : Object.class);
+			return getPotentiallyConvertedSimpleWrite(obj);
 		}
 
 		if (obj instanceof List) {
@@ -1609,7 +1583,6 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	 * @param ref
 	 * @return
 	 */
-	@Nullable
 	Document readRef(DBRef ref) {
 		return dbRefResolver.fetch(ref);
 	}
@@ -1625,16 +1598,6 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		return dbRefResolver.bulkFetch(references);
 	}
 
-	/**
-	 * Get the conversion target type if defined or return the {@literal source}.
-	 *
-	 * @param source must not be {@literal null}.
-	 * @return
-	 * @since 2.2
-	 */
-	public Class<?> getWriteTarget(Class<?> source) {
-		return conversions.getCustomWriteTarget(source).orElse(source);
-	}
 
 	/**
 	 * Create a new {@link MappingMongoConverter} using the given {@link MongoDbFactory} when loading {@link DBRef}.
@@ -1683,6 +1646,17 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		return true;
 	}
 
+	/**
+	 * Returns whether the given type is a sub type of the given reference, i.e. assignable but not the exact same type.
+	 * 
+	 * @param type must not be {@literal null}.
+	 * @param reference must not be {@literal null}.
+	 * @return
+	 */
+	private static boolean isSubTypeOf(Class<?> type, Class<?> reference) {
+		return !type.equals(reference) && reference.isAssignableFrom(type);
+	}
+
 	/**
 	 * Marker class used to indicate we have a non root document object here that might be used within an update - so we
 	 * need to preserve type hints for potential nested elements but need to remove it on top level.
@@ -1703,91 +1677,4 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			return null;
 		}
 	}
-
-	private static class TypeInformationWrapper<S> implements TypeInformation<S> {
-
-		private MongoPersistentProperty persistentProperty;
-		private TypeInformation<?> delegate;
-
-		public TypeInformationWrapper(MongoPersistentProperty property) {
-
-			this.persistentProperty = property;
-			this.delegate = property.getTypeInformation();
-		}
-
-		@Override
-		public List<org.springframework.data.util.TypeInformation<?>> getParameterTypes(Constructor constructor) {
-			return persistentProperty.getTypeInformation().getParameterTypes(constructor);
-		}
-
-		@Override
-		public org.springframework.data.util.TypeInformation<?> getProperty(String property) {
-			return delegate.getProperty(property);
-		}
-
-		@Override
-		public boolean isCollectionLike() {
-			return delegate.isCollectionLike();
-		}
-
-		@Override
-		public org.springframework.data.util.TypeInformation<?> getComponentType() {
-			return ClassTypeInformation.from(persistentProperty.getFieldType());
-		}
-
-		@Override
-		public boolean isMap() {
-			return delegate.isMap();
-		}
-
-		@Override
-		public org.springframework.data.util.TypeInformation<?> getMapValueType() {
-			return ClassTypeInformation.from(persistentProperty.getFieldType());
-		}
-
-		@Override
-		public Class getType() {
-			return delegate.getType();
-		}
-
-		@Override
-		public ClassTypeInformation<?> getRawTypeInformation() {
-			return delegate.getRawTypeInformation();
-		}
-
-		@Override
-		public org.springframework.data.util.TypeInformation<?> getActualType() {
-			return delegate.getActualType();
-		}
-
-		@Override
-		public org.springframework.data.util.TypeInformation<?> getReturnType(Method method) {
-			return delegate.getReturnType(method);
-		}
-
-		@Override
-		public List<org.springframework.data.util.TypeInformation<?>> getParameterTypes(Method method) {
-			return delegate.getParameterTypes(method);
-		}
-
-		@Override
-		public org.springframework.data.util.TypeInformation<?> getSuperTypeInformation(Class superType) {
-			return delegate.getSuperTypeInformation(superType);
-		}
-
-		@Override
-		public boolean isAssignableFrom(org.springframework.data.util.TypeInformation target) {
-			return delegate.isAssignableFrom(target);
-		}
-
-		@Override
-		public List<org.springframework.data.util.TypeInformation<?>> getTypeArguments() {
-			return delegate.getTypeArguments();
-		}
-
-		@Override
-		public org.springframework.data.util.TypeInformation specialize(ClassTypeInformation type) {
-			return delegate.specialize(type);
-		}
-	}
 }

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

@@ -18,8 +18,6 @@ package org.springframework.data.mongodb.core.convert;
 import org.bson.BsonValue;
 import org.bson.Document;
 import org.bson.conversions.Bson;
-import org.bson.types.ObjectId;
-import org.springframework.core.convert.ConversionException;
 import org.springframework.data.convert.EntityConverter;
 import org.springframework.data.convert.EntityReader;
 import org.springframework.data.convert.TypeMapper;
@@ -85,18 +83,7 @@ public interface MongoConverter
 
 				if (sourceDocument.containsKey("$ref") && sourceDocument.containsKey("$id")) {
 
-					Object id = sourceDocument.get("$id");
-					String collection = sourceDocument.getString("$ref");
-
-					MongoPersistentEntity<?> entity = getMappingContext().getPersistentEntity(targetType);
-					if (entity != null && entity.hasIdProperty()) {
-						id = convertId(id, entity.getIdProperty().getFieldType());
-					}
-
-					DBRef ref = sourceDocument.containsKey("$db") ? new DBRef(sourceDocument.getString("$db"), collection, id)
-							: new DBRef(collection, id);
-
-					sourceDocument = dbRefResolver.fetch(ref);
+					sourceDocument = dbRefResolver.fetch(new DBRef(sourceDocument.getString("$ref"), sourceDocument.get("$id")));
 					if (sourceDocument == null) {
 						return null;
 					}
@@ -115,38 +102,4 @@ public interface MongoConverter
 		}
 		return getConversionService().convert(source, targetType);
 	}
-
-	/**
-	 * Converts the given raw id value into either {@link ObjectId} or {@link String}.
-	 *
-	 * @param id
-	 * @param targetType
-	 * @return {@literal null} if source {@literal id} is already {@literal null}.
-	 * @since 2.2
-	 */
-	@Nullable
-	default Object convertId(@Nullable Object id, Class<?> targetType) {
-
-		if (id == null) {
-			return null;
-		}
-
-		if (ClassUtils.isAssignable(ObjectId.class, targetType)) {
-
-			if (id instanceof String) {
-
-				if (ObjectId.isValid(id.toString())) {
-					return new ObjectId(id.toString());
-				}
-			}
-		}
-
-		try {
-			return getConversionService().canConvert(id.getClass(), targetType)
-					? getConversionService().convert(id, targetType)
-					: convertToMongoType(id, null);
-		} catch (ConversionException o_O) {
-			return convertToMongoType(id, null);
-		}
-	}
 }

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

@@ -15,12 +15,9 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
-import static org.springframework.data.convert.ConverterBuilder.*;
-
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.MalformedURLException;
-import java.net.URI;
 import java.net.URL;
 import java.time.Instant;
 import java.util.ArrayList;
@@ -34,7 +31,6 @@ import org.bson.BsonTimestamp;
 import org.bson.Document;
 import org.bson.types.Binary;
 import org.bson.types.Code;
-import org.bson.types.Decimal128;
 import org.bson.types.ObjectId;
 import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.TypeDescriptor;
@@ -76,9 +72,7 @@ abstract class MongoConverters {
 		List<Object> converters = new ArrayList<>();
 
 		converters.add(BigDecimalToStringConverter.INSTANCE);
-		converters.add(BigDecimalToDecimal128Converter.INSTANCE);
 		converters.add(StringToBigDecimalConverter.INSTANCE);
-		converters.add(Decimal128ToBigDecimalConverter.INSTANCE);
 		converters.add(BigIntegerToStringConverter.INSTANCE);
 		converters.add(StringToBigIntegerConverter.INSTANCE);
 		converters.add(URLToStringConverter.INSTANCE);
@@ -96,8 +90,6 @@ abstract class MongoConverters {
 		converters.add(BinaryToByteArrayConverter.INSTANCE);
 		converters.add(BsonTimestampToInstantConverter.INSTANCE);
 
-		converters.add(reading(String.class, URI.class, URI::create).andWriting(URI::toString));
-
 		return converters;
 	}
 
@@ -161,17 +153,6 @@ abstract class MongoConverters {
 		}
 	}
 
-	/**
-	 * @since 2.2
-	 */
-	enum BigDecimalToDecimal128Converter implements Converter<BigDecimal, Decimal128> {
-		INSTANCE;
-
-		public Decimal128 convert(BigDecimal source) {
-			return source == null ? null : new Decimal128(source);
-		}
-	}
-
 	enum StringToBigDecimalConverter implements Converter<String, BigDecimal> {
 		INSTANCE;
 
@@ -180,17 +161,6 @@ abstract class MongoConverters {
 		}
 	}
 
-	/**
-	 * @since 2.2
-	 */
-	enum Decimal128ToBigDecimalConverter implements Converter<Decimal128, BigDecimal> {
-		INSTANCE;
-
-		public BigDecimal convert(Decimal128 source) {
-			return source.bigDecimalValue();
-		}
-	}
-
 	enum BigIntegerToStringConverter implements Converter<BigInteger, String> {
 		INSTANCE;
 

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

@@ -46,15 +46,4 @@ public interface MongoTypeMapper extends TypeMapper<Bson> {
 	 * @param restrictedTypes must not be {@literal null}
 	 */
 	void writeTypeRestrictions(Document result, Set<Class<?>> restrictedTypes);
-
-	/**
-	 * Compute the target type for a given source considering {@link org.springframework.data.convert.CustomConversions}.
-	 *
-	 * @param source the source type.
-	 * @return never {@literal null}.
-	 * @since 2.2
-	 */
-	default Class<?> getWriteTargetTypeFor(Class<?> source) {
-		return source;
-	}
 }

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

@@ -17,10 +17,8 @@ package org.springframework.data.mongodb.core.convert;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.function.Supplier;
 
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
-import org.springframework.data.util.Lazy;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
@@ -48,14 +46,14 @@ class ObjectPath {
 	private final @Nullable ObjectPath parent;
 	private final @Nullable Object object;
 	private final @Nullable Object idValue;
-	private final Lazy<String> collection;
+	private final String collection;
 
 	private ObjectPath() {
 
 		this.parent = null;
 		this.object = null;
 		this.idValue = null;
-		this.collection = Lazy.empty();
+		this.collection = "";
 	}
 
 	/**
@@ -66,7 +64,7 @@ class ObjectPath {
 	 * @param idValue
 	 * @param collection
 	 */
-	private ObjectPath(ObjectPath parent, Object object, @Nullable Object idValue, Lazy<String> collection) {
+	private ObjectPath(ObjectPath parent, Object object, @Nullable Object idValue, String collection) {
 
 		this.parent = parent;
 		this.object = object;
@@ -87,7 +85,7 @@ class ObjectPath {
 		Assert.notNull(object, "Object must not be null!");
 		Assert.notNull(entity, "MongoPersistentEntity must not be null!");
 
-		return new ObjectPath(this, object, id, Lazy.of(entity::getCollection));
+		return new ObjectPath(this, object, id, entity.getCollection());
 	}
 
 	/**
@@ -177,7 +175,7 @@ class ObjectPath {
 	}
 
 	private String getCollection() {
-		return collection.get();
+		return collection;
 	}
 
 	/*

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

@@ -26,14 +26,13 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.bson.BsonValue;
 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;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.domain.Example;
@@ -57,7 +56,6 @@ import org.springframework.data.util.TypeInformation;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
 
 import com.mongodb.BasicDBList;
 import com.mongodb.BasicDBObject;
@@ -257,16 +255,7 @@ public class QueryMapper {
 	 */
 	protected Field createPropertyField(@Nullable MongoPersistentEntity<?> entity, String key,
 			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
-
-		if (entity == null) {
-			return new Field(key);
-		}
-
-		if (Field.ID_KEY.equals(key)) {
-			return new MetadataBackedField(key, entity, mappingContext, entity.getIdProperty());
-		}
-
-		return new MetadataBackedField(key, entity, mappingContext);
+		return entity == null ? new Field(key) : new MetadataBackedField(key, entity, mappingContext);
 	}
 
 	/**
@@ -297,7 +286,7 @@ public class QueryMapper {
 		}
 
 		if (keyword.isJsonSchema()) {
-			return schemaMapper.mapSchema(new Document(keyword.getKey(), keyword.getValue()), entity != null ? entity.getType() : Object.class);
+			return schemaMapper.mapSchema(new Document(keyword.getKey(), keyword.getValue()), entity.getType());
 		}
 
 		return new Document(keyword.getKey(), convertSimpleOrDocument(keyword.getValue(), entity));
@@ -334,12 +323,6 @@ public class QueryMapper {
 	@SuppressWarnings("unchecked")
 	protected Object getMappedValue(Field documentField, Object value) {
 
-		if(documentField.getProperty() != null && documentField.getProperty().hasExplicitWriteTarget()) {
-			if(conversionService.canConvert(value.getClass(), documentField.getProperty().getFieldType())) {
-				value = conversionService.convert(value, documentField.getProperty().getFieldType());
-			}
-		}
-
 		if (documentField.isIdField() && !documentField.isAssociation()) {
 
 			if (isDBObject(value)) {
@@ -350,11 +333,11 @@ public class QueryMapper {
 					String inKey = valueDbo.containsField("$in") ? "$in" : "$nin";
 					List<Object> ids = new ArrayList<Object>();
 					for (Object id : (Iterable<?>) valueDbo.get(inKey)) {
-						ids.add(convertId(id, getIdTypeForField(documentField)));
+						ids.add(convertId(id));
 					}
 					resultDbo.put(inKey, ids);
 				} else if (valueDbo.containsField("$ne")) {
-					resultDbo.put("$ne", convertId(valueDbo.get("$ne"), getIdTypeForField(documentField)));
+					resultDbo.put("$ne", convertId(valueDbo.get("$ne")));
 				} else {
 					return getMappedObject(resultDbo, Optional.empty());
 				}
@@ -369,18 +352,18 @@ public class QueryMapper {
 					String inKey = valueDbo.containsKey("$in") ? "$in" : "$nin";
 					List<Object> ids = new ArrayList<Object>();
 					for (Object id : (Iterable<?>) valueDbo.get(inKey)) {
-						ids.add(convertId(id, getIdTypeForField(documentField)));
+						ids.add(convertId(id));
 					}
 					resultDbo.put(inKey, ids);
 				} else if (valueDbo.containsKey("$ne")) {
-					resultDbo.put("$ne", convertId(valueDbo.get("$ne"), getIdTypeForField(documentField)));
+					resultDbo.put("$ne", convertId(valueDbo.get("$ne")));
 				} else {
 					return getMappedObject(resultDbo, Optional.empty());
 				}
 				return resultDbo;
 
 			} else {
-				return convertId(value, getIdTypeForField(documentField));
+				return convertId(value);
 			}
 		}
 
@@ -395,14 +378,6 @@ public class QueryMapper {
 		return convertSimpleOrDocument(value, documentField.getPropertyEntity());
 	}
 
-	private boolean isIdField(Field documentField) {
-		return documentField.getProperty() != null && documentField.getProperty().isIdProperty();
-	}
-
-	private Class<?> getIdTypeForField(Field documentField) {
-		return isIdField(documentField) ? documentField.getProperty().getFieldType() : ObjectId.class;
-	}
-
 	/**
 	 * Returns whether the given {@link Field} represents an association reference that together with the given value
 	 * requires conversion to a {@link org.springframework.data.mongodb.core.mapping.DBRef} object. We check whether the
@@ -523,14 +498,7 @@ public class QueryMapper {
 		if (source instanceof DBRef) {
 
 			DBRef ref = (DBRef) source;
-			Object id = convertId(ref.getId(),
-					property != null && property.isIdProperty() ? property.getFieldType() : ObjectId.class);
-
-			if (StringUtils.hasText(ref.getDatabaseName())) {
-				return new DBRef(ref.getDatabaseName(), ref.getCollectionName(), id);
-			} else {
-				return new DBRef(ref.getCollectionName(), id);
-			}
+			return new DBRef(ref.getCollectionName(), convertId(ref.getId()));
 		}
 
 		if (source instanceof Iterable) {
@@ -611,24 +579,24 @@ public class QueryMapper {
 	 *
 	 * @param id
 	 * @return
-	 * @since 2.2
 	 */
 	@Nullable
 	public Object convertId(@Nullable Object id) {
-		return convertId(id, ObjectId.class);
-	}
 
-	/**
-	 * Converts the given raw id value into either {@link ObjectId} or {@link Class targetType}.
-	 *
-	 * @param id can be {@literal null}.
-	 * @param targetType
-	 * @return the converted {@literal id} or {@literal null} if the source was already {@literal null}.
-	 * @since 2.2
-	 */
-	@Nullable
-	public Object convertId(@Nullable Object id, Class<?> targetType) {
-		return converter.convertId(id, targetType);
+		if (id == null) {
+			return null;
+		}
+
+		if (id instanceof String) {
+			return ObjectId.isValid(id.toString()) ? conversionService.convert(id, ObjectId.class) : id;
+		}
+
+		try {
+			return conversionService.canConvert(id.getClass(), ObjectId.class) ? conversionService.convert(id, ObjectId.class)
+					: delegateConvertToMongoType(id, null);
+		} catch (ConversionException o_O) {
+			return delegateConvertToMongoType(id, null);
+		}
 	}
 
 	/**
@@ -776,8 +744,6 @@ public class QueryMapper {
 	 */
 	protected static class Field {
 
-		protected static final Pattern POSITIONAL_OPERATOR = Pattern.compile("\\$\\[.*\\]");
-
 		private static final String ID_KEY = "_id";
 
 		protected final String name;
@@ -1046,8 +1012,7 @@ public class QueryMapper {
 		@Nullable
 		private PersistentPropertyPath<MongoPersistentProperty> getPath(String pathExpression) {
 
-			String rawPath = pathExpression.replaceAll("\\.\\d+", "") //
-					.replaceAll(POSITIONAL_OPERATOR.pattern(), "");
+			String rawPath = pathExpression.replaceAll("\\.\\d+", "");
 
 			PropertyPath path = forName(rawPath);
 			if (path == null || isPathToJavaLangClassProperty(path)) {
@@ -1222,11 +1187,6 @@ public class QueryMapper {
 					return true;
 				}
 
-				Matcher matcher = POSITIONAL_OPERATOR.matcher(partial);
-				if (matcher.find()) {
-					return true;
-				}
-
 				try {
 					Long.valueOf(partial);
 					return true;

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

@@ -289,7 +289,7 @@ public class UpdateMapper extends QueryMapper {
 		public MetadataBackedUpdateField(MongoPersistentEntity<?> entity, String key,
 				MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
 
-			super(key.replaceAll("\\.\\$(\\[.*\\])?", ""), entity, mappingContext);
+			super(key.replaceAll("\\.\\$", ""), entity, mappingContext);
 			this.key = key;
 		}
 

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

@@ -16,7 +16,7 @@
 package org.springframework.data.mongodb.core.geo;
 
 /**
- * Interface definition for structures defined in GeoJSON ({@link https://geojson.org/}) format.
+ * Interface definition for structures defined in GeoJSON ({@link http://geojson.org/}) format.
  *
  * @author Christoph Strobl
  * @since 1.7
@@ -27,7 +27,7 @@ public interface GeoJson<T extends Iterable<?>> {
 	 * String value representing the type of the {@link GeoJson} object.
 	 *
 	 * @return will never be {@literal null}.
-	 * @see <a href="https://geojson.org/geojson-spec.html#geojson-objects">https://geojson.org/geojson-spec.html#geojson-objects</a>
+	 * @see <a href="http://geojson.org/geojson-spec.html#geojson-objects">http://geojson.org/geojson-spec.html#geojson-objects</a>
 	 */
 	String getType();
 
@@ -36,7 +36,7 @@ public interface GeoJson<T extends Iterable<?>> {
 	 * determined by {@link #getType()} of geometry.
 	 *
 	 * @return will never be {@literal null}.
-	 * @see <a href="https://geojson.org/geojson-spec.html#geometry-objects">https://geojson.org/geojson-spec.html#geometry-objects</a>
+	 * @see <a href="http://geojson.org/geojson-spec.html#geometry-objects">http://geojson.org/geojson-spec.html#geometry-objects</a>
 	 */
 	T getCoordinates();
 }

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

@@ -27,7 +27,7 @@ import org.springframework.util.ObjectUtils;
  *
  * @author Christoph Strobl
  * @since 1.7
- * @see <a href="https://geojson.org/geojson-spec.html#geometry-collection">https://geojson.org/geojson-spec.html#geometry-collection</a>
+ * @see <a href="http://geojson.org/geojson-spec.html#geometry-collection">http://geojson.org/geojson-spec.html#geometry-collection</a>
  */
 public class GeoJsonGeometryCollection implements GeoJson<Iterable<GeoJson<?>>> {
 

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

@@ -24,7 +24,7 @@ import org.springframework.data.geo.Point;
  *
  * @author Christoph Strobl
  * @since 1.7
- * @see <a href="https://geojson.org/geojson-spec.html#linestring">https://geojson.org/geojson-spec.html#linestring</a>
+ * @see <a href="http://geojson.org/geojson-spec.html#linestring">http://geojson.org/geojson-spec.html#linestring</a>
  */
 public class GeoJsonLineString extends GeoJsonMultiPoint {
 

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

@@ -28,7 +28,7 @@ import org.springframework.util.ObjectUtils;
  *
  * @author Christoph Strobl
  * @since 1.7
- * @see <a href="https://geojson.org/geojson-spec.html#multilinestring">https://geojson.org/geojson-spec.html#multilinestring</a>
+ * @see <a href="http://geojson.org/geojson-spec.html#multilinestring">http://geojson.org/geojson-spec.html#multilinestring</a>
  */
 public class GeoJsonMultiLineString implements GeoJson<Iterable<GeoJsonLineString>> {
 

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

@@ -29,7 +29,7 @@ import org.springframework.util.ObjectUtils;
  *
  * @author Christoph Strobl
  * @since 1.7
- * @see <a href="https://geojson.org/geojson-spec.html#multipoint">https://geojson.org/geojson-spec.html#multipoint</a>
+ * @see <a href="http://geojson.org/geojson-spec.html#multipoint">http://geojson.org/geojson-spec.html#multipoint</a>
  */
 public class GeoJsonMultiPoint implements GeoJson<Iterable<Point>> {
 

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

@@ -25,7 +25,7 @@ import org.springframework.data.geo.Point;
  *
  * @author Christoph Strobl
  * @since 1.7
- * @see <a href="https://geojson.org/geojson-spec.html#point">https://geojson.org/geojson-spec.html#point</a>
+ * @see <a href="http://geojson.org/geojson-spec.html#point">http://geojson.org/geojson-spec.html#point</a>
  */
 public class GeoJsonPoint extends Point implements GeoJson<List<Double>> {
 

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

@@ -32,7 +32,7 @@ import org.springframework.util.Assert;
  * @author Christoph Strobl
  * @author Mark Paluch
  * @since 1.7
- * @see <a href="https://geojson.org/geojson-spec.html#polygon">https://geojson.org/geojson-spec.html#polygon</a>
+ * @see <a href="http://geojson.org/geojson-spec.html#polygon">http://geojson.org/geojson-spec.html#polygon</a>
  */
 public class GeoJsonPolygon extends Polygon implements GeoJson<List<GeoJsonLineString>> {
 

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

@@ -17,29 +17,12 @@ package org.springframework.data.mongodb.core.index;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
-import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
  * Mark a class to use compound indexes.
- * <p />
- * <p>
- * <b>NOTE: This annotation is repeatable according to Java 8 conventions using {@link CompoundIndexes#value()} as
- * container.</b>
- *
- * <pre class="code">
- * &#64;Document
- * &#64;CompoundIndex(def = "{'firstname': 1, 'lastname': 1}")
- * &#64;CompoundIndex(def = "{'address.city': 1, 'address.street': 1}")
- * class Person {
- * 	String firstname;
- * 	String lastname;
- *
- * 	Address address;
- * }
- * </pre>
  *
  * @author Jon Brisbin
  * @author Oliver Gierke
@@ -49,31 +32,14 @@ import java.lang.annotation.Target;
  */
 @Target({ ElementType.TYPE })
 @Documented
-@Repeatable(CompoundIndexes.class)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface CompoundIndex {
 
 	/**
-	 * The actual index definition in JSON format or a {@link org.springframework.expression.spel.standard.SpelExpression
-	 * template expression} resolving to either a JSON String or a {@link org.bson.Document}. The keys of the JSON
-	 * document are the fields to be indexed, the values define the index direction (1 for ascending, -1 for descending).
-	 * <br />
+	 * The actual index definition in JSON format. The keys of the JSON document are the fields to be indexed, the values
+	 * define the index direction (1 for ascending, -1 for descending). <br />
 	 * If left empty on nested document, the whole document will be indexed.
 	 *
-	 * <pre class="code">
-	 * &#64;Document
-	 * &#64;CompoundIndex(def = "{'h1': 1, 'h2': 1}")
-	 * class JsonStringIndexDefinition {
-	 *   String h1, h2;
-	 * }
-	 *
-	 * &#64;Document
-	 * &#64;CompoundIndex(def = "#{T(org.bson.Document).parse("{ 'h1': 1, 'h2': 1 }")}")
-	 * class ExpressionIndexDefinition {
-	 *   String h1, h2;
-	 * }
-	 * </pre>
-	 *
 	 * @return
 	 */
 	String def() default "";
@@ -89,8 +55,7 @@ public @interface CompoundIndex {
 
 	/**
 	 * @return
-	 * @see <a href=
-	 *      "https://docs.mongodb.org/manual/core/index-unique/">https://docs.mongodb.org/manual/core/index-unique/</a>
+	 * @see <a href="https://docs.mongodb.org/manual/core/index-unique/">https://docs.mongodb.org/manual/core/index-unique/</a>
 	 */
 	boolean unique() default false;
 
@@ -98,54 +63,55 @@ public @interface CompoundIndex {
 	 * If set to true index will skip over any document that is missing the indexed field.
 	 *
 	 * @return
-	 * @see <a href=
-	 *      "https://docs.mongodb.org/manual/core/index-sparse/">https://docs.mongodb.org/manual/core/index-sparse/</a>
+	 * @see <a href="https://docs.mongodb.org/manual/core/index-sparse/">https://docs.mongodb.org/manual/core/index-sparse/</a>
 	 */
 	boolean sparse() default false;
 
 	/**
 	 * @return
-	 * @see <a href=
-	 *      "https://docs.mongodb.org/manual/core/index-creation/#index-creation-duplicate-dropping">https://docs.mongodb.org/manual/core/index-creation/#index-creation-duplicate-dropping</a>
+	 * @see <a href="https://docs.mongodb.org/manual/core/index-creation/#index-creation-duplicate-dropping">https://docs.mongodb.org/manual/core/index-creation/#index-creation-duplicate-dropping</a>
 	 * @deprecated since 2.1. No longer supported by MongoDB as of server version 3.0.
 	 */
 	@Deprecated
 	boolean dropDups() default false;
 
 	/**
-	 * Index name of the index to be created either as plain value or as
-	 * {@link org.springframework.expression.spel.standard.SpelExpression template expression}. <br />
+	 * The name of the index to be created. <br />
 	 * <br />
 	 * The name will only be applied as is when defined on root level. For usage on nested or embedded structures the
 	 * provided name will be prefixed with the path leading to the entity. <br />
 	 * <br />
 	 * The structure below
 	 *
-	 * <pre class="code">
+	 * <pre>
+	 * <code>
 	 * &#64;Document
 	 * class Root {
-	 * 	Hybrid hybrid;
-	 * 	Nested nested;
+	 *   Hybrid hybrid;
+	 *   Nested nested;
 	 * }
 	 *
 	 * &#64;Document
 	 * &#64;CompoundIndex(name = "compound_index", def = "{'h1': 1, 'h2': 1}")
 	 * class Hybrid {
-	 * 	String h1, h2;
+	 *   String h1, h2;
 	 * }
 	 *
 	 * &#64;CompoundIndex(name = "compound_index", def = "{'n1': 1, 'n2': 1}")
 	 * class Nested {
-	 * 	String n1, n2;
+	 *   String n1, n2;
 	 * }
+	 * </code>
 	 * </pre>
 	 *
 	 * resolves in the following index structures
 	 *
-	 * <pre class="code">
+	 * <pre>
+	 * <code>
 	 * db.root.createIndex( { hybrid.h1: 1, hybrid.h2: 1 } , { name: "hybrid.compound_index" } )
 	 * db.root.createIndex( { nested.n1: 1, nested.n2: 1 } , { name: "nested.compound_index" } )
 	 * db.hybrid.createIndex( { h1: 1, h2: 1 } , { name: "compound_index" } )
+	 * </code>
 	 * </pre>
 	 *
 	 * @return
@@ -165,8 +131,7 @@ public @interface CompoundIndex {
 	 * If {@literal true} the index will be created in the background.
 	 *
 	 * @return
-	 * @see <a href=
-	 *      "https://docs.mongodb.org/manual/core/indexes/#background-construction">https://docs.mongodb.org/manual/core/indexes/#background-construction</a>
+	 * @see <a href="https://docs.mongodb.org/manual/core/indexes/#background-construction">https://docs.mongodb.org/manual/core/indexes/#background-construction</a>
 	 */
 	boolean background() default false;
 

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

@@ -15,24 +15,15 @@
  */
 package org.springframework.data.mongodb.core.index;
 
-import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Container annotation that allows to collect multiple {@link CompoundIndex} annotations.
- * <p>
- * Can be used natively, declaring several nested {@link CompoundIndex} annotations. Can also be used in conjunction
- * with Java 8's support for <em>repeatable annotations</em>, where {@link CompoundIndex} can simply be declared several
- * times on the same {@linkplain ElementType#TYPE type}, implicitly generating this container annotation.
- *
- * @author Jon Brisbin
- * @author Christoph Strobl
+ * @author Jon Brisbin <jbrisbin@vmware.com>
  */
 @Target({ ElementType.TYPE })
-@Documented
 @Retention(RetentionPolicy.RUNTIME)
 public @interface CompoundIndexes {
 

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

@@ -1,216 +0,0 @@
-/*
- * Copyright 2012-2019 the original author 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
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.index;
-
-import java.time.Duration;
-import java.time.temporal.ChronoUnit;
-import java.util.function.Function;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
-/**
- * Duration format styles.
- * <p/>
- * Fork of {@code org.springframework.boot.convert.DurationStyle}.
- *
- * @author Phillip Webb
- * @since 2.2
- */
-enum DurationStyle {
-
-	/**
-	 * Simple formatting, for example '1s'.
-	 */
-	SIMPLE("^([\\+\\-]?\\d+)([a-zA-Z]{0,2})$") {
-
-		@Override
-		public Duration parse(String value, @Nullable ChronoUnit unit) {
-			try {
-				Matcher matcher = matcher(value);
-				Assert.state(matcher.matches(), "Does not match simple duration pattern");
-				String suffix = matcher.group(2);
-				return (StringUtils.hasLength(suffix) ? Unit.fromSuffix(suffix) : Unit.fromChronoUnit(unit))
-						.parse(matcher.group(1));
-			} catch (Exception ex) {
-				throw new IllegalArgumentException("'" + value + "' is not a valid simple duration", ex);
-			}
-		}
-	},
-
-	/**
-	 * ISO-8601 formatting.
-	 */
-	ISO8601("^[\\+\\-]?P.*$") {
-
-		@Override
-		public Duration parse(String value, @Nullable ChronoUnit unit) {
-			try {
-				return Duration.parse(value);
-			} catch (Exception ex) {
-				throw new IllegalArgumentException("'" + value + "' is not a valid ISO-8601 duration", ex);
-			}
-		}
-	};
-
-	private final Pattern pattern;
-
-	DurationStyle(String pattern) {
-		this.pattern = Pattern.compile(pattern);
-	}
-
-	protected final boolean matches(String value) {
-		return this.pattern.matcher(value).matches();
-	}
-
-	protected final Matcher matcher(String value) {
-		return this.pattern.matcher(value);
-	}
-
-	/**
-	 * Parse the given value to a duration.
-	 *
-	 * @param value the value to parse
-	 * @return a duration
-	 */
-	public Duration parse(String value) {
-		return parse(value, null);
-	}
-
-	/**
-	 * Parse the given value to a duration.
-	 *
-	 * @param value the value to parse
-	 * @param unit the duration unit to use if the value doesn't specify one ({@code null} will default to ms)
-	 * @return a duration
-	 */
-	public abstract Duration parse(String value, @Nullable ChronoUnit unit);
-
-	/**
-	 * Detect the style then parse the value to return a duration.
-	 *
-	 * @param value the value to parse
-	 * @return the parsed duration
-	 * @throws IllegalStateException if the value is not a known style or cannot be parsed
-	 */
-	public static Duration detectAndParse(String value) {
-		return detectAndParse(value, null);
-	}
-
-	/**
-	 * Detect the style then parse the value to return a duration.
-	 *
-	 * @param value the value to parse
-	 * @param unit the duration unit to use if the value doesn't specify one ({@code null} will default to ms)
-	 * @return the parsed duration
-	 * @throws IllegalStateException if the value is not a known style or cannot be parsed
-	 */
-	public static Duration detectAndParse(String value, @Nullable ChronoUnit unit) {
-		return detect(value).parse(value, unit);
-	}
-
-	/**
-	 * Detect the style from the given source value.
-	 *
-	 * @param value the source value
-	 * @return the duration style
-	 * @throws IllegalStateException if the value is not a known style
-	 */
-	public static DurationStyle detect(String value) {
-		Assert.notNull(value, "Value must not be null");
-		for (DurationStyle candidate : values()) {
-			if (candidate.matches(value)) {
-				return candidate;
-			}
-		}
-		throw new IllegalArgumentException("'" + value + "' is not a valid duration");
-	}
-
-	/**
-	 * Units that we support.
-	 */
-	enum Unit {
-
-		/**
-		 * Milliseconds.
-		 */
-		MILLIS(ChronoUnit.MILLIS, "ms", Duration::toMillis),
-
-		/**
-		 * Seconds.
-		 */
-		SECONDS(ChronoUnit.SECONDS, "s", Duration::getSeconds),
-
-		/**
-		 * Minutes.
-		 */
-		MINUTES(ChronoUnit.MINUTES, "m", Duration::toMinutes),
-
-		/**
-		 * Hours.
-		 */
-		HOURS(ChronoUnit.HOURS, "h", Duration::toHours),
-
-		/**
-		 * Days.
-		 */
-		DAYS(ChronoUnit.DAYS, "d", Duration::toDays);
-
-		private final ChronoUnit chronoUnit;
-
-		private final String suffix;
-
-		private Function<Duration, Long> longValue;
-
-		Unit(ChronoUnit chronoUnit, String suffix, Function<Duration, Long> toUnit) {
-			this.chronoUnit = chronoUnit;
-			this.suffix = suffix;
-			this.longValue = toUnit;
-		}
-
-		public Duration parse(String value) {
-			return Duration.of(Long.valueOf(value), this.chronoUnit);
-		}
-
-		public long longValue(Duration value) {
-			return this.longValue.apply(value);
-		}
-
-		public static Unit fromChronoUnit(ChronoUnit chronoUnit) {
-			if (chronoUnit == null) {
-				return Unit.MILLIS;
-			}
-			for (Unit candidate : values()) {
-				if (candidate.chronoUnit == chronoUnit) {
-					return candidate;
-				}
-			}
-			throw new IllegalArgumentException("Unknown unit " + chronoUnit);
-		}
-
-		public static Unit fromSuffix(String suffix) {
-			for (Unit candidate : values()) {
-				if (candidate.suffix.equalsIgnoreCase(suffix)) {
-					return candidate;
-				}
-			}
-			throw new IllegalArgumentException("Unknown unit '" + suffix + "'");
-		}
-	}
-}

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

@@ -34,8 +34,8 @@ import java.lang.annotation.Target;
 public @interface GeoSpatialIndexed {
 
 	/**
-	 * Index name either as plain value or as {@link org.springframework.expression.spel.standard.SpelExpression template
-	 * expression}. <br />
+	 * Index name. <br />
+	 * <br />
 	 * The name will only be applied as is when defined on root level. For usage on nested or embedded structures the
 	 * provided name will be prefixed with the path leading to the entity. <br />
 	 * <br />
@@ -52,7 +52,6 @@ public @interface GeoSpatialIndexed {
 	 * &#64;Document
 	 * class Hybrid {
 	 *   &#64;GeoSpatialIndexed(name="index") Point h1;
-	 *   &#64;GeoSpatialIndexed(name="#{&#64;myBean.indexName}") Point h2;
 	 * }
 	 *
 	 * class Nested {
@@ -68,7 +67,6 @@ public @interface GeoSpatialIndexed {
 	 * db.root.createIndex( { hybrid.h1: "2d" } , { name: "hybrid.index" } )
 	 * db.root.createIndex( { nested.n1: "2d" } , { name: "nested.index" } )
 	 * db.hybrid.createIndex( { h1: "2d" } , { name: "index" } )
-	 * db.hybrid.createIndex( { h2: "2d"} , { name: the value myBean.getIndexName() returned } )
 	 * </code>
 	 * </pre>
 	 *

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

@@ -1,64 +0,0 @@
-/*
- * Copyright 2019 the original author 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
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.index;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation for a property that should be used as key for a
- * <a href="https://docs.mongodb.com/manual/core/index-hashed/">Hashed Index</a>. If used on a simple property, the
- * index uses a hashing function to compute the hash of the value of the index field. Added to a property of complex
- * type the embedded document is collapsed and the hash computed for the entire object.
- * <p />
- *
- * <pre class="code">
- * &#64;Document
- * public class DomainType {
- *
- * 	&#64;HashIndexed @Id String id;
- * }
- * </pre>
- *
- * {@link HashIndexed} can also be used as meta {@link java.lang.annotation.Annotation} to create composed annotations:
- *
- * <pre class="code">
- * &#64;Indexed
- * &#64;HashIndexed
- * &#64;Retention(RetentionPolicy.RUNTIME)
- * public @interface IndexAndHash {
- *
- * 	&#64;AliasFor(annotation = Indexed.class, attribute = "name")
- * 	String name() default "";
- * }
- *
- * &#64;Document
- * public class DomainType {
- *
- * 	&#64;ComposedHashIndexed(name = "idx-name") String value;
- * }
- * </pre>
- *
- * @author Christoph Strobl
- * @since 2.2
- * @see HashedIndex
- */
-@Target({ ElementType.ANNOTATION_TYPE, ElementType.FIELD })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface HashIndexed {
-}

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

@@ -1,66 +0,0 @@
-/*
- * Copyright 2019 the original author 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
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.index;
-
-import org.bson.Document;
-import org.springframework.util.Assert;
-
-/**
- * {@link IndexDefinition} implementation for MongoDB
- * <a href="https://docs.mongodb.com/manual/core/index-hashed/">Hashed Indexes</a> maintaining entries with hashes of
- * the values of the indexed field.
- *
- * @author Christoph Strobl
- * @since 2.2
- */
-public class HashedIndex implements IndexDefinition {
-
-	private final String field;
-
-	private HashedIndex(String field) {
-
-		Assert.hasText(field, "Field must not be null nor empty!");
-		this.field = field;
-	}
-
-	/**
-	 * Creates a new {@link HashedIndex} for the given field.
-	 *
-	 * @param field must not be {@literal null} nor empty.
-	 * @return
-	 */
-	public static HashedIndex hashed(String field) {
-		return new HashedIndex(field);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.index.IndexDefinition#getIndexKeys()
-	 */
-	@Override
-	public Document getIndexKeys() {
-		return new Document(field, "hashed");
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.index.IndexDefinition#getIndexOptions()
-	 */
-	@Override
-	public Document getIndexOptions() {
-		return new Document();
-	}
-}

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

@@ -15,7 +15,6 @@
  */
 package org.springframework.data.mongodb.core.index;
 
-import java.time.Duration;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -117,20 +116,6 @@ public class Index implements IndexDefinition {
 		return expire(value, TimeUnit.SECONDS);
 	}
 
-	/**
-	 * Specifies the TTL.
-	 *
-	 * @param timeout must not be {@literal null}.
-	 * @return this.
-	 * @throws IllegalArgumentException if given {@literal timeout} is {@literal null}.
-	 * @since 2.2
-	 */
-	public Index expire(Duration timeout) {
-
-		Assert.notNull(timeout, "Timeout must not be null!");
-		return expire(timeout.getSeconds());
-	}
-
 	/**
 	 * Specifies TTL with given {@link TimeUnit}.
 	 *

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

@@ -26,10 +26,11 @@ import org.springframework.util.ObjectUtils;
  * @author Oliver Gierke
  * @author Christoph Strobl
  */
+@SuppressWarnings("deprecation")
 public final class IndexField {
 
 	enum Type {
-		GEO, TEXT, DEFAULT, HASH;
+		GEO, TEXT, DEFAULT;
 	}
 
 	private final String key;
@@ -48,9 +49,7 @@ public final class IndexField {
 		if (Type.GEO.equals(type) || Type.TEXT.equals(type)) {
 			Assert.isNull(direction, "Geo/Text indexes must not have a direction!");
 		} else {
-			if (!Type.HASH.equals(type)) {
-				Assert.notNull(direction, "Default indexes require a direction");
-			}
+			Assert.notNull(direction, "Default indexes require a direction");
 		}
 
 		this.key = key;
@@ -66,17 +65,6 @@ public final class IndexField {
 		return new IndexField(key, order, Type.DEFAULT);
 	}
 
-	/**
-	 * Creates a {@literal hashed} {@link IndexField} for the given key.
-	 *
-	 * @param key must not be {@literal null} or empty.
-	 * @return new instance of {@link IndexField}.
-	 * @since 2.2
-	 */
-	static IndexField hashed(String key) {
-		return new IndexField(key, null, Type.HASH);
-	}
-
 	/**
 	 * Creates a geo {@link IndexField} for the given key.
 	 *
@@ -132,16 +120,6 @@ public final class IndexField {
 		return Type.TEXT.equals(type);
 	}
 
-	/**
-	 * Returns whether the {@link IndexField} is a {@literal hashed}.
-	 *
-	 * @return {@literal true} if {@link IndexField} is hashed.
-	 * @since 2.2
-	 */
-	public boolean isHashed() {
-		return Type.HASH.equals(type);
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see java.lang.Object#equals(java.lang.Object)