DATAMONGO-2473 - Release version 3.0 M4 (Neumann).

Mockito reports falsely unnecessary stubbings so we're switching to the silent runner for these cases.

.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();
-    }
-
-}

.travis.yml

@@ -1,8 +1,5 @@
 language: java
 
-jdk:
-  - oraclejdk8
-
 before_install:
   - mkdir -p downloads
   - mkdir -p var/db var/log
@@ -14,20 +11,22 @@ before_install:
     downloads/mongodb-linux-x86_64-ubuntu1604-${MONGO_VERSION}/bin/mongo --eval "rs.initiate({_id: 'rs0', members:[{_id: 0, host: '127.0.0.1:27017'}]});"
     sleep 15
 
+jdk:
+  - openjdk13
+  - openjdk-ea
+
+matrix:
+  allow_failures:
+    - jdk: openjdk-ea
+
 env:
   matrix:
-    - MONGO_VERSION=4.1.10
-    - MONGO_VERSION=4.0.4
-    - MONGO_VERSION=3.6.12
-    - MONGO_VERSION=3.4.20
+    - MONGO_VERSION=4.2.0
+    - MONGO_VERSION=4.0.14
+    - MONGO_VERSION=3.6.16
   global:
     - PROFILE=ci
 
-addons:
-  apt:
-    packages:
-      - oracle-java8-installer
-
 sudo: false
 
 cache:
@@ -35,4 +34,7 @@ cache:
     - $HOME/.m2
     - downloads
 
-script: "mvn clean dependency:list test -P${PROFILE} -Dsort"
+install: true
+
+script:
+  - "./mvnw clean dependency:list test -Pjava11 -Dsort -U"

CI.adoc

@@ -0,0 +1,43 @@
+= Continuous Integration
+
+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/]
+
+== 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.

Jenkinsfile

@@ -1,144 +1,240 @@
 pipeline {
-    agent none
+	agent none
 
-    triggers {
-        pollSCM 'H/10 * * * *'
-        upstream(upstreamProjects: "spring-data-commons/master", threshold: hudson.model.Result.SUCCESS)
-    }
+	triggers {
+		pollSCM 'H/10 * * * *'
+		upstream(upstreamProjects: "spring-data-commons/master", threshold: hudson.model.Result.SUCCESS)
+	}
 
-    options {
-        disableConcurrentBuilds()
-    }
+	options {
+		disableConcurrentBuilds()
+		buildDiscarder(logRotator(numToKeepStr: '14'))
+	}
 
-    stages {
-        stage("Docker images") {
-            parallel {
-                stage('Publish JDK 8 + MongoDB 4.0') {
-                    when {
-                        changeset "ci/openjdk8-mongodb-4.0/**"
-                    }
-                    agent any
+	stages {
+		stage("Docker images") {
+			parallel {
+				stage('Publish JDK 8 + MongoDB 4.0') {
+					when {
+						changeset "ci/openjdk8-mongodb-4.0/**"
+					}
+					agent { label 'data' }
+					options { timeout(time: 30, unit: 'MINUTES') }
 
-                    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.0", "ci/openjdk8-mongodb-4.0/")
+							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
+								image.push()
+							}
+						}
+					}
+				}
+				stage('Publish JDK 8 + MongoDB 4.2') {
+					when {
+						changeset "ci/openjdk8-mongodb-4.2/**"
+					}
+					agent { label 'data' }
+					options { timeout(time: 30, unit: 'MINUTES') }
 
-                    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()
-                            }
-                        }
-                    }
-                }
-            }
-        }
+					steps {
+						script {
+							def image = docker.build("springci/spring-data-openjdk8-with-mongodb-4.2.0", "ci/openjdk8-mongodb-4.2/")
+							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
+								image.push()
+							}
+						}
+					}
+				}
+				stage('Publish JDK 13 + MongoDB 4.2') {
+					when {
+						changeset "ci/openjdk13-mongodb-4.2/**"
+					}
+					agent { label 'data' }
+					options { timeout(time: 30, unit: 'MINUTES') }
 
-        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'
-            }
-        }
+					steps {
+						script {
+							def image = docker.build("springci/spring-data-openjdk13-with-mongodb-4.2.0", "ci/openjdk13-mongodb-4.2/")
+							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
+								image.push()
+							}
+						}
+					}
+				}
+			}
+		}
 
-        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("test: baseline (jdk8)") {
+			when {
+				anyOf {
+					branch 'master'
+					not { triggeredBy 'UpstreamCause' }
+				}
+			}
+			agent {
+				docker {
+					image 'springci/spring-data-openjdk8-with-mongodb-4.2.0:latest'
+					label 'data'
+					args '-v $HOME:/tmp/jenkins-home'
+				}
+			}
+			options { timeout(time: 30, unit: 'MINUTES') }
+			steps {
+				sh 'rm -rf ?'
+				sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
+				sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --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 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean dependency:list test -Duser.name=jenkins -Dsort -U -B'
+			}
+		}
 
-        stage('Release to artifactory') {
-            when {
-                branch 'issue/*'
-            }
-            agent {
-                docker {
-                    image 'adoptopenjdk/openjdk8:latest'
-                    args '-v $HOME/.m2:/root/.m2'
-                }
-            }
+		stage("Test other configurations") {
+			when {
+				anyOf {
+					branch 'master'
+					not { triggeredBy 'UpstreamCause' }
+				}
+			}
+			parallel {
+				stage("test: mongodb 4.0 (jdk8)") {
+					agent {
+						docker {
+							image 'springci/spring-data-openjdk8-with-mongodb-4.0:latest'
+							label 'data'
+							args '-v $HOME:/tmp/jenkins-home'
+						}
+					}
+					options { timeout(time: 30, unit: 'MINUTES') }
+					steps {
+						sh 'rm -rf ?'
+						sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
+						sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --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 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean dependency:list test -Duser.name=jenkins -Dsort -U -B'
+					}
+				}
 
-            environment {
-                ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
-            }
+				stage("test: mongodb 4.2 (jdk8)") {
+					agent {
+						docker {
+							image 'springci/spring-data-openjdk8-with-mongodb-4.2.0:latest'
+							label 'data'
+							args '-v $HOME:/tmp/jenkins-home'
+						}
+					}
+					options { timeout(time: 30, unit: 'MINUTES') }
+					steps {
+						sh 'rm -rf ?'
+						sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
+						sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --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 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean dependency:list test -Duser.name=jenkins -Dsort -U -B'
+					}
+				}
 
-            steps {
-                sh "./mvnw -Pci,snapshot -Dmaven.test.skip=true clean deploy -B"
-            }
-        }
+				stage("test: baseline (jdk13)") {
+					agent {
+						docker {
+							image 'springci/spring-data-openjdk13-with-mongodb-4.2.0:latest'
+							label 'data'
+							args '-v $HOME:/tmp/jenkins-home'
+						}
+					}
+					options { timeout(time: 30, unit: 'MINUTES') }
+					steps {
+						sh 'rm -rf ?'
+						sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
+						sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --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 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pjava11 clean dependency:list test -Duser.name=jenkins -Dsort -U -B'
+					}
+				}
+			}
+		}
 
-        stage('Release to artifactory with docs') {
-            when {
-                branch 'master'
-            }
-            agent {
-                docker {
-                    image 'adoptopenjdk/openjdk8:latest'
-                    args '-v $HOME/.m2:/root/.m2'
-                }
-            }
+		stage('Release to artifactory') {
+			when {
+				anyOf {
+					branch 'master'
+					not { triggeredBy 'UpstreamCause' }
+				}
+			}
+			agent {
+				docker {
+					image 'adoptopenjdk/openjdk8:latest'
+					label 'data'
+					args '-v $HOME:/tmp/jenkins-home'
+				}
+			}
+			options { timeout(time: 20, unit: 'MINUTES') }
 
-            environment {
-                ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
-            }
+			environment {
+				ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
+			}
 
-            steps {
-                sh "./mvnw -Pci,snapshot -Dmaven.test.skip=true clean deploy -B"
-            }
-        }
-    }
+			steps {
+				sh 'rm -rf ?'
+				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +
+						'-Dartifactory.server=https://repo.spring.io ' +
+						"-Dartifactory.username=${ARTIFACTORY_USR} " +
+						"-Dartifactory.password=${ARTIFACTORY_PSW} " +
+						"-Dartifactory.staging-repository=libs-snapshot-local " +
+						"-Dartifactory.build-name=spring-data-mongodb " +
+						"-Dartifactory.build-number=${BUILD_NUMBER} " +
+						'-Dmaven.test.skip=true clean deploy -U -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>")
-            }
-        }
-    }
+		stage('Publish documentation') {
+			when {
+				branch 'master'
+			}
+			agent {
+				docker {
+					image 'adoptopenjdk/openjdk8:latest'
+					label 'data'
+					args '-v $HOME:/tmp/jenkins-home'
+				}
+			}
+			options { timeout(time: 20, unit: 'MINUTES') }
+
+			environment {
+				ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
+			}
+
+			steps {
+				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,distribute ' +
+						'-Dartifactory.server=https://repo.spring.io ' +
+						"-Dartifactory.username=${ARTIFACTORY_USR} " +
+						"-Dartifactory.password=${ARTIFACTORY_PSW} " +
+						"-Dartifactory.distribution-repository=temp-private-local " +
+						'-Dmaven.test.skip=true clean deploy -U -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,28 +1,68 @@
-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://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
+= Spring Data MongoDB image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-mongodb%2Fmaster&subject=Build[link=https://jenkins.spring.io/view/SpringData/job/spring-data-mongodb/] https://gitter.im/spring-projects/spring-data[image:https://badges.gitter.im/spring-projects/spring-data.svg[Gitter]]
 
 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.
+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 `+Document+` and easily writing a repository style data access layer.
 
-== Getting Help
+== Code of Conduct
 
-For a comprehensive treatment of all the Spring Data MongoDB features, please refer to:
+This project is governed by the link:CODE_OF_CONDUCT.adoc[Spring Code of Conduct]. By participating, you are expected to uphold this code of conduct. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
 
-* 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].
+== Getting Started
 
-If you are new to Spring as well as to Spring Data, look for information about https://projects.spring.io/[Spring projects].
+Here is a quick teaser of an application using Spring Data Repositories in Java:
 
-== Quick Start
+[source,java]
+----
+public interface PersonRepository extends CrudRepository<Person, Long> {
+
+  List<Person> findByLastname(String lastname);
+
+  List<Person> findByFirstnameLike(String firstname);
+}
+
+@Service
+public class MyService {
+
+  private final PersonRepository repository;
+
+  public MyService(PersonRepository repository) {
+    this.repository = repository;
+  }
+
+  public void doWork() {
+
+    repository.deleteAll();
+
+    Person person = new Person();
+    person.setFirstname("Oliver");
+    person.setLastname("Gierke");
+    repository.save(person);
+
+    List<Person> lastNameResults = repository.findByLastname("Gierke");
+    List<Person> firstNameResults = repository.findByFirstnameLike("Oli*");
+ }
+}
+
+@Configuration
+@EnableMongoRepositories
+class ApplicationConfig extends AbstractMongoClientConfiguration {
+
+  @Override
+  public MongoClient mongoClient() {
+    return MongoClients.create();
+  }
+
+  @Override
+  protected String getDatabaseName() {
+    return "springdata";
+  }
+}
+----
 
 === Maven configuration
 
@@ -54,181 +94,203 @@ If you'd rather like the latest snapshots of the upcoming major version, use our
 </repository>
 ----
 
-=== MongoTemplate
+== Upgrading from 2.x
 
-MongoTemplate is the central support class for Mongo database operations. It provides:
+The 4.0 MongoDB Java Driver does no longer support certain features that have already been deprecated in one of the last minor versions.
+Some of the changes affect the initial setup configuration as well as compile/runtime features. We summarized the most typical changes one might encounter.
 
-* 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].
+=== XML Namespace
 
-=== Spring Data repositories
+.Changed XML Namespace Elements and Attributes:
+|===
+Element / Attribute | 2.x | 3.x
 
-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. 
+| `<mongo:mongo-client />`
+| Used to create a `com.mongodb.MongoClient`
+| Now exposes a `com.mongodb.client.MongoClient`
 
-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:
+| `<mongo:mongo-client replica-set="..." />`
+| Was a comma delimited list of replica set members (host/port)
+| Now defines the replica set name. +
+Use `<mongo:client-settings cluster-hosts="..." />` instead
 
+| `<mongo:db-factory writeConcern="..." />`
+| NONE, NORMAL, SAFE, FSYNC_SAFE, REPLICAS_SAFE, MAJORITY
+| W1, W2, W3, UNAKNOWLEDGED, AKNOWLEDGED, JOURNALED, MAJORITY
+|===
+
+.Removed XML Namespace Elements and Attributes:
+|===
+Element / Attribute | Replacement in 3.x | Comment
+
+| `<mongo:db-factory mongo-ref="..." />`
+| `<mongo:db-factory mongo-client-ref="..." />`
+| Referencing a `com.mongodb.client.MongoClient`.
+
+| `<mongo:mongo-client credentials="..." />`
+| `<mongo:mongo-client credential="..." />`
+| Single authentication data instead of list.
+
+| `<mongo:client-options />`
+| `<mongo:client-settings />`
+| See `com.mongodb.MongoClientSettings` for details.
+|===
+
+.New XML Namespace Elements and Attributes:
+|===
+Element | Comment
+
+| `<mongo:db-factory mongo-client-ref="..." />`
+| Replacement for `<mongo:db-factory mongo-ref="..." />`
+
+| `<mongo:db-factory connection-string="..." />`
+| Replacement for `uri` and `client-uri`.
+
+| `<mongo:mongo-client connection-string="..." />`
+| Replacement for `uri` and `client-uri`.
+
+| `<mongo:client-settings />`
+| Namespace element for `com.mongodb.MongoClientSettings`.
+
+|===
+
+=== Java Configuration
+
+.Java API changes
+|===
+Type | Comment
+
+| `MongoClientFactoryBean`
+| Creates `com.mongodb.client.MongoClient` instead of `com.mongodb.MongoClient` +
+Uses `MongoClientSettings` instead of `MongoClientOptions`.
+
+| `MongoDataIntegrityViolationException`
+| Uses `WriteConcernResult` instead of `WriteResult`.
+
+| `BulkOperationException`
+| Uses `MongoBulkWriteException` and `com.mongodb.bulk.BulkWriteError` instead of `BulkWriteException` and `com.mongodb.BulkWriteError`
+
+| `ReactiveMongoClientFactoryBean`
+| Uses `com.mongodb.MongoClientSettings` instead of `com.mongodb.async.client.MongoClientSettings`
+
+| `ReactiveMongoClientSettingsFactoryBean`
+| Now produces `com.mongodb.MongoClientSettings` instead of `com.mongodb.async.client.MongoClientSettings`
+|===
+
+.Removed Java API:
+|===
+2.x | Replacement in 3.x | Comment
+
+| `MongoClientOptionsFactoryBean`
+| `MongoClientSettingsFactoryBean`
+| Creating a `com.mongodb.MongoClientSettings`.
+
+| `AbstractMongoConfiguration`
+| `AbstractMongoClientConfiguration` +
+(Available since 2.1)
+| Using `com.mongodb.client.MongoClient`.
+
+| `MongoDbFactory#getLegacyDb()`
+| -
+| -
+
+| `SimpleMongoDbFactory`
+| `SimpleMongoClientDbFactory` +
+(Available since 2.1)
+|
+
+| `MapReduceOptions#getOutputType()`
+| `MapReduceOptions#getMapReduceAction()`
+| Returns `MapReduceAction` instead of `MapReduceCommand.OutputType`.
+
+| `Meta\|Query` maxScan & snapshot
+|
+|
+|===
+
+=== Other Changes
+
+==== UUID Types
+
+The MongoDB UUID representation can now be configured with different formats.
+This has to be done via `MongoClientSettings` as shown in the snippet below.
+
+.UUID Codec Configuration
+====
 [source,java]
 ----
-public interface PersonRepository extends CrudRepository<Person, Long> {
+static class Config extends AbstractMongoClientConfiguration {
 
-  List<Person> findByLastname(String lastname);
+    @Override
+    public void configureClientSettings(MongoClientSettings.Builder builder) {
+        builder.uuidRepresentation(UuidRepresentation.STANDARD);
+    }
 
-  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.
+== Getting Help
 
-You can have Spring automatically create a proxy for the interface by using the following JavaConfig:
+Having trouble with Spring Data? We’d love to help!
 
-[source,java]
+* Check the
+https://docs.spring.io/spring-data/mongodb/docs/current/reference/html/[reference documentation], and https://docs.spring.io/spring-data/mongodb/docs/current/api/[Javadocs].
+* Learn the Spring basics – Spring Data builds on Spring Framework, check the https://spring.io[spring.io] web-site for a wealth of reference documentation.
+If you are just starting out with Spring, try one of the https://spring.io/guides[guides].
+* If you are upgrading, check out the https://docs.spring.io/spring-data/mongodb/docs/current/changelog.txt[changelog] for "`new and noteworthy`" features.
+* Ask a question - we monitor https://stackoverflow.com[stackoverflow.com] for questions tagged with https://stackoverflow.com/tags/spring-data[`spring-data-mongodb`].
+You can also chat with the community on https://gitter.im/spring-projects/spring-data[Gitter].
+* Report bugs with Spring Data MongoDB at https://jira.spring.io/browse/DATAMONGO[jira.spring.io/browse/DATAMONGO].
+
+== Reporting Issues
+
+Spring Data uses JIRA as issue tracking system to record bugs and feature requests. If you want to raise an issue, please follow the recommendations below:
+
+* Before you log a bug, please search the
+https://jira.spring.io/browse/DATAMONGO[issue tracker] to see if someone has already reported the problem.
+* If the issue doesn’t already exist, https://jira.spring.io/browse/DATAMONGO[create a new issue].
+* Please provide as much information as possible with the issue report, we like to know the version of Spring Data that you are using and JVM version.
+* If you need to paste code, or include a stack trace use JIRA `{code}…{code}` escapes before and after your text.
+* If possible try to create a test-case or project that replicates the issue. Attach a link to your code or a compressed file containing your code.
+
+== Building from Source
+
+You don’t need to build from source to use Spring Data (binaries in https://repo.spring.io[repo.spring.io]), but if you want to try out the latest and greatest, Spring Data can be easily built with the https://github.com/takari/maven-wrapper[maven wrapper].
+You also need JDK 1.8.
+
+[source,bash]
 ----
-@Configuration
-@EnableMongoRepositories
-class ApplicationConfig extends AbstractMongoConfiguration {
-
-  @Override
-  public MongoClient mongoClient() throws Exception {
-    return new MongoClient();
-  }
-
-  @Override
-  protected String getDatabaseName() {
-    return "springdata";
-  }
-}
+ $ ./mvnw clean install
 ----
 
-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:
+If you want to build with the regular `mvn` command, you will need https://maven.apache.org/run-maven/index.html[Maven v3.5.0 or above].
 
-[source,xml]
+_Also see link:CONTRIBUTING.adoc[CONTRIBUTING.adoc] if you wish to submit pull requests, and in particular please sign the https://cla.pivotal.io/sign/spring[Contributor’s Agreement] before your first non-trivial change._
+
+=== Building reference documentation
+
+Building the documentation builds also the project without running tests.
+
+[source,bash]
 ----
-<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" />
+ $ ./mvnw clean install -Pdistribute
 ----
 
-This will find the repository interface and register a proxy object in the container. You can use it as shown below:
+The generated documentation is available from `target/site/reference/html/index.html`.
 
-[source,java]
-----
-@Service
-public class MyService {
+== Guides
 
-  private final PersonRepository repository;
+The https://spring.io/[spring.io] site contains several guides that show how to use Spring Data step-by-step:
 
-  @Autowired
-  public MyService(PersonRepository repository) {
-    this.repository = repository;
-  }
+* https://spring.io/guides/gs/accessing-data-mongodb/[Accessing Data with MongoDB] is a very basic guide that shows you how to create a simple application and how to access data using repositories.
+* https://spring.io/guides/gs/accessing-mongodb-data-rest/[Accessing MongoDB Data with REST] is a guide to creating a REST web service exposing data stored in MongoDB through repositories.
 
-  public void doWork() {
+== Examples
 
-     repository.deleteAll();
+* https://github.com/spring-projects/spring-data-examples/[Spring Data Examples] contains example projects that explain specific features in more detail.
 
-     Person person = new Person();
-     person.setFirstname("Oliver");
-     person.setLastname("Gierke");
-     person = repository.save(person);
+== License
 
-     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.
+Spring Data MongoDB is Open Source software released under the https://www.apache.org/licenses/LICENSE-2.0.html[Apache 2.0 license].

ci/openjdk11-mongodb-4.2/Dockerfile

@@ -0,0 +1,15 @@
+FROM adoptopenjdk/openjdk11:latest
+
+ENV TZ=Etc/UTC
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN set -eux; \
+	apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
+	apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv e162f504a20cdf15827f718d4b7c549a058f8b6b ; \
+	echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.2 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.2.list; \
+	echo ${TZ} > /etc/timezone;
+
+RUN apt-get update ; \
+	apt-get install -y mongodb-org=4.2.0 mongodb-org-server=4.2.0 mongodb-org-shell=4.2.0 mongodb-org-mongos=4.2.0 mongodb-org-tools=4.2.0 ; \
+	apt-get clean; \
+	rm -rf /var/lib/apt/lists/*;

ci/openjdk13-mongodb-4.2/Dockerfile

@@ -0,0 +1,15 @@
+FROM adoptopenjdk/openjdk13:latest
+
+ENV TZ=Etc/UTC
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN set -eux; \
+	apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
+	apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv e162f504a20cdf15827f718d4b7c549a058f8b6b ; \
+	echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.2 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.2.list; \
+	echo ${TZ} > /etc/timezone;
+
+RUN apt-get update ; \
+	apt-get install -y mongodb-org=4.2.0 mongodb-org-server=4.2.0 mongodb-org-shell=4.2.0 mongodb-org-mongos=4.2.0 mongodb-org-tools=4.2.0 ; \
+	apt-get clean; \
+	rm -rf /var/lib/apt/lists/*;

ci/openjdk8-mongodb-4.0/Dockerfile

@@ -1,14 +1,15 @@
 FROM adoptopenjdk/openjdk8:latest
 
-RUN apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2
+ENV TZ=Etc/UTC
+ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4
+RUN RUN set -eux; \
+	apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
+	apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 ; \
+	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; \
+	echo ${TZ} > /etc/timezone;
 
-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/*
+RUN apt-get update ; \
+	apt-get install -y mongodb-org=4.0.14 mongodb-org-server=4.0.14 mongodb-org-shell=4.0.14 mongodb-org-mongos=4.0.14 mongodb-org-tools=4.0.14 ; \
+	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/*

ci/openjdk8-mongodb-4.2/Dockerfile

@@ -0,0 +1,15 @@
+FROM adoptopenjdk/openjdk8:latest
+
+ENV TZ=Etc/UTC
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN set -eux; \
+	apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
+	apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv e162f504a20cdf15827f718d4b7c549a058f8b6b ; \
+	echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.2 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.2.list; \
+	echo ${TZ} > /etc/timezone;
+
+RUN apt-get update ; \
+	apt-get install -y mongodb-org=4.2.0 mongodb-org-server=4.2.0 mongodb-org-shell=4.2.0 mongodb-org-mongos=4.2.0 mongodb-org-tools=4.2.0 ; \
+	apt-get clean; \
+	rm -rf /var/lib/apt/lists/*;

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-mongodb-parent</artifactId>
-	<version>2.2.0.RC1</version>
+	<version>3.0.0.M4</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data MongoDB</name>
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>2.2.0.RC1</version>
+		<version>2.3.0.M4</version>
 	</parent>
 
 	<modules>
@@ -26,9 +26,9 @@
 	<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.3.0.M4</springdata.commons>
+		<mongo>4.0.0</mongo>
+		<mongo.reactivestreams>${mongo}</mongo.reactivestreams>
 		<jmh.version>1.19</jmh.version>
 	</properties>
 
@@ -113,60 +113,6 @@
 	</developers>
 
 	<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>
-				<plugins>
-					<plugin>
-						<groupId>org.jfrog.buildinfo</groupId>
-						<artifactId>artifactory-maven-plugin</artifactId>
-						<inherited>false</inherited>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-
 		<profile>
 			<id>benchmarks</id>
 			<modules>
@@ -181,7 +127,7 @@
 		<!-- MongoDB -->
 		<dependency>
 			<groupId>org.mongodb</groupId>
-			<artifactId>mongo-java-driver</artifactId>
+			<artifactId>mongodb-driver-core</artifactId>
 			<version>${mongo}</version>
 		</dependency>
 	</dependencies>
@@ -191,6 +137,16 @@
 			<id>spring-libs-milestone</id>
 			<url>https://repo.spring.io/libs-milestone</url>
 		</repository>
+		<repository>
+			<id>sonatype-libs-snapshot</id>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+			<releases>
+        <enabled>false</enabled>
+      </releases>
+			<snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+		</repository>
 	</repositories>
 
 	<pluginRepositories>

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>3.0.0.M4</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

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

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

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

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

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

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

spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/microbenchmark/AbstractMicrobenchmark.java

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

spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/microbenchmark/HttpResultsWriter.java

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

spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/microbenchmark/MongoResultsWriter.java

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

spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/microbenchmark/ResultsWriter.java

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

spring-data-mongodb-distribution/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>2.2.0.RC1</version>
+		<version>3.0.0.M4</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -29,10 +29,6 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
 			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>wagon-maven-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.asciidoctor</groupId>
 				<artifactId>asciidoctor-maven-plugin</artifactId>

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>3.0.0.M4</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -65,6 +65,12 @@
 			<artifactId>querydsl-mongodb</artifactId>
 			<version>${querydsl}</version>
 			<optional>true</optional>
+			<exclusions>
+				<exclusion>
+					<groupId>org.mongodb</groupId>
+					<artifactId>mongo-java-driver</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>
@@ -82,28 +88,19 @@
 		</dependency>
 
 		<!-- reactive -->
+
 		<dependency>
 			<groupId>org.mongodb</groupId>
-			<artifactId>mongodb-driver-reactivestreams</artifactId>
-			<version>${mongo.reactivestreams}</version>
+			<artifactId>mongodb-driver-sync</artifactId>
+			<version>${mongo}</version>
 			<optional>true</optional>
 		</dependency>
 
 		<dependency>
 			<groupId>org.mongodb</groupId>
-			<artifactId>mongodb-driver-async</artifactId>
-			<version>${mongo}</version>
+			<artifactId>mongodb-driver-reactivestreams</artifactId>
+			<version>${mongo.reactivestreams}</version>
 			<optional>true</optional>
-			<exclusions>
-				<exclusion>
-					<groupId>org.mongodb</groupId>
-					<artifactId>mongodb-driver-core</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.mongodb</groupId>
-					<artifactId>bson</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 
 		<dependency>
@@ -253,6 +250,13 @@
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.junit-pioneer</groupId>
+			<artifactId>junit-pioneer</artifactId>
+			<version>0.5.3</version>
+			<scope>test</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>javax.transaction</groupId>
 			<artifactId>jta</artifactId>
@@ -276,14 +280,12 @@
 		<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>
 		</dependency>
 
@@ -342,12 +344,6 @@
 						<java.util.logging.config.file>src/test/resources/logging.properties</java.util.logging.config.file>
 						<reactor.trace.cancel>true</reactor.trace.cancel>
 					</systemPropertyVariables>
-					<properties>
-						<property>
-							<name>listener</name>
-							<value>org.springframework.data.mongodb.test.util.CleanMongoDBJunitRunListener</value>
-						</property>
-					</properties>
 				</configuration>
 			</plugin>
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@ import java.util.List;
 
 import org.springframework.dao.DataAccessException;
 
-import com.mongodb.BulkWriteError;
-import com.mongodb.BulkWriteException;
-import com.mongodb.BulkWriteResult;
+import com.mongodb.MongoBulkWriteException;
+import com.mongodb.bulk.BulkWriteError;
+import com.mongodb.bulk.BulkWriteResult;
 
 /**
  * Is thrown when errors occur during bulk operations.
@@ -38,12 +38,12 @@ public class BulkOperationException extends DataAccessException {
 	private final BulkWriteResult result;
 
 	/**
-	 * Creates a new {@link BulkOperationException} with the given message and source {@link BulkWriteException}.
+	 * Creates a new {@link BulkOperationException} with the given message and source {@link MongoBulkWriteException}.
 	 *
 	 * @param message must not be {@literal null}.
 	 * @param source must not be {@literal null}.
 	 */
-	public BulkOperationException(String message, BulkWriteException source) {
+	public BulkOperationException(String message, MongoBulkWriteException source) {
 
 		super(message, source);
 

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,112 @@
+/*
+ * 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;
+
+import org.bson.codecs.configuration.CodecRegistry;
+import org.springframework.dao.DataAccessException;
+import org.springframework.dao.support.PersistenceExceptionTranslator;
+import org.springframework.data.mongodb.core.MongoExceptionTranslator;
+
+import com.mongodb.ClientSessionOptions;
+import com.mongodb.client.ClientSession;
+import com.mongodb.client.MongoDatabase;
+
+/**
+ * Interface for factories creating {@link MongoDatabase} instances.
+ *
+ * @author Mark Pollack
+ * @author Thomas Darimont
+ * @author Christoph Strobl
+ * @since 3.0
+ */
+public interface MongoDatabaseFactory extends CodecRegistryProvider, MongoSessionProvider {
+
+	/**
+	 * Obtain a {@link MongoDatabase} from the underlying factory.
+	 *
+	 * @return never {@literal null}.
+	 * @throws DataAccessException
+	 */
+	MongoDatabase getMongoDatabase() throws DataAccessException;
+
+	/**
+	 * Obtain a {@link MongoDatabase} instance to access the database with the given name.
+	 *
+	 * @param dbName
+	 * @return never {@literal null}.
+	 * @throws DataAccessException
+	 */
+	MongoDatabase getMongoDatabase(String dbName) throws DataAccessException;
+
+	/**
+	 * Exposes a shared {@link MongoExceptionTranslator}.
+	 *
+	 * @return will never be {@literal null}.
+	 */
+	PersistenceExceptionTranslator getExceptionTranslator();
+
+	/**
+	 * Get the underlying {@link CodecRegistry} used by the MongoDB Java driver.
+	 *
+	 * @return never {@literal null}.
+	 */
+	@Override
+	default CodecRegistry getCodecRegistry() {
+		return getMongoDatabase().getCodecRegistry();
+	}
+
+	/**
+	 * Obtain a {@link ClientSession} for given ClientSessionOptions.
+	 *
+	 * @param options must not be {@literal null}.
+	 * @return never {@literal null}.
+	 * @since 2.1
+	 */
+	ClientSession getSession(ClientSessionOptions options);
+
+	/**
+	 * Obtain a {@link ClientSession} bound instance of {@link MongoDatabaseFactory} returning {@link MongoDatabase}
+	 * instances that are aware and bound to a new session with given {@link ClientSessionOptions options}.
+	 *
+	 * @param options must not be {@literal null}.
+	 * @return never {@literal null}.
+	 * @since 2.1
+	 */
+	default MongoDatabaseFactory withSession(ClientSessionOptions options) {
+		return withSession(getSession(options));
+	}
+
+	/**
+	 * Obtain a {@link ClientSession} bound instance of {@link MongoDatabaseFactory} returning {@link MongoDatabase}
+	 * instances that are aware and bound to the given session.
+	 *
+	 * @param session must not be {@literal null}.
+	 * @return never {@literal null}.
+	 * @since 2.1
+	 */
+	MongoDatabaseFactory withSession(ClientSession session);
+
+	/**
+	 * Returns if the given {@link MongoDatabaseFactory} is bound to a {@link ClientSession} that has an
+	 * {@link ClientSession#hasActiveTransaction() active transaction}.
+	 *
+	 * @return {@literal true} if there's an active transaction, {@literal false} otherwise.
+	 * @since 2.1.3
+	 */
+	default boolean isTransactionActive() {
+		return false;
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ import com.mongodb.client.ClientSession;
 import com.mongodb.client.MongoDatabase;
 
 /**
- * Helper class for managing a {@link MongoDatabase} instances via {@link MongoDbFactory}. Used for obtaining
+ * Helper class for managing a {@link MongoDatabase} instances via {@link MongoDatabaseFactory}. Used for obtaining
  * {@link ClientSession session bound} resources, such as {@link MongoDatabase} and
  * {@link com.mongodb.client.MongoCollection} suitable for transactional usage.
  * <p />
@@ -41,93 +41,94 @@ import com.mongodb.client.MongoDatabase;
 public class MongoDatabaseUtils {
 
 	/**
-	 * Obtain the default {@link MongoDatabase database} form the given {@link MongoDbFactory factory} using
+	 * Obtain the default {@link MongoDatabase database} form the given {@link MongoDatabaseFactory factory} using
 	 * {@link SessionSynchronization#ON_ACTUAL_TRANSACTION native session synchronization}.
 	 * <p />
 	 * Registers a {@link MongoSessionSynchronization MongoDB specific transaction synchronization} within the current
 	 * {@link Thread} if {@link TransactionSynchronizationManager#isSynchronizationActive() synchronization is active}.
 	 *
-	 * @param factory the {@link MongoDbFactory} to get the {@link MongoDatabase} from.
+	 * @param factory the {@link MongoDatabaseFactory} to get the {@link MongoDatabase} from.
 	 * @return the {@link MongoDatabase} that is potentially associated with a transactional {@link ClientSession}.
 	 */
-	public static MongoDatabase getDatabase(MongoDbFactory factory) {
+	public static MongoDatabase getDatabase(MongoDatabaseFactory factory) {
 		return doGetMongoDatabase(null, factory, SessionSynchronization.ON_ACTUAL_TRANSACTION);
 	}
 
 	/**
-	 * Obtain the default {@link MongoDatabase database} form the given {@link MongoDbFactory factory}.
+	 * Obtain the default {@link MongoDatabase database} form the given {@link MongoDatabaseFactory factory}.
 	 * <p />
 	 * Registers a {@link MongoSessionSynchronization MongoDB specific transaction synchronization} within the current
 	 * {@link Thread} if {@link TransactionSynchronizationManager#isSynchronizationActive() synchronization is active}.
 	 *
-	 * @param factory the {@link MongoDbFactory} to get the {@link MongoDatabase} from.
+	 * @param factory the {@link MongoDatabaseFactory} 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 MongoDatabase getDatabase(MongoDbFactory factory, SessionSynchronization sessionSynchronization) {
+	public static MongoDatabase getDatabase(MongoDatabaseFactory factory, SessionSynchronization sessionSynchronization) {
 		return doGetMongoDatabase(null, factory, sessionSynchronization);
 	}
 
 	/**
-	 * Obtain the {@link MongoDatabase database} with given name form the given {@link MongoDbFactory factory} using
+	 * Obtain the {@link MongoDatabase database} with given name form the given {@link MongoDatabaseFactory factory} using
 	 * {@link SessionSynchronization#ON_ACTUAL_TRANSACTION native session synchronization}.
 	 * <p />
 	 * Registers a {@link MongoSessionSynchronization MongoDB specific transaction synchronization} within the current
 	 * {@link Thread} if {@link TransactionSynchronizationManager#isSynchronizationActive() synchronization is active}.
 	 *
 	 * @param dbName the name of the {@link MongoDatabase} to get.
-	 * @param factory the {@link MongoDbFactory} to get the {@link MongoDatabase} from.
+	 * @param factory the {@link MongoDatabaseFactory} to get the {@link MongoDatabase} from.
 	 * @return the {@link MongoDatabase} that is potentially associated with a transactional {@link ClientSession}.
 	 */
-	public static MongoDatabase getDatabase(String dbName, MongoDbFactory factory) {
+	public static MongoDatabase getDatabase(String dbName, MongoDatabaseFactory factory) {
 		return doGetMongoDatabase(dbName, factory, SessionSynchronization.ON_ACTUAL_TRANSACTION);
 	}
 
 	/**
-	 * Obtain the {@link MongoDatabase database} with given name form the given {@link MongoDbFactory factory}.
+	 * Obtain the {@link MongoDatabase database} with given name form the given {@link MongoDatabaseFactory factory}.
 	 * <p />
 	 * Registers a {@link MongoSessionSynchronization MongoDB specific transaction synchronization} within the current
 	 * {@link Thread} if {@link TransactionSynchronizationManager#isSynchronizationActive() synchronization is active}.
 	 *
 	 * @param dbName the name of the {@link MongoDatabase} to get.
-	 * @param factory the {@link MongoDbFactory} to get the {@link MongoDatabase} from.
+	 * @param factory the {@link MongoDatabaseFactory} 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 MongoDatabase getDatabase(String dbName, MongoDbFactory factory,
+	public static MongoDatabase getDatabase(String dbName, MongoDatabaseFactory factory,
 			SessionSynchronization sessionSynchronization) {
 		return doGetMongoDatabase(dbName, factory, sessionSynchronization);
 	}
 
-	private static MongoDatabase doGetMongoDatabase(@Nullable String dbName, MongoDbFactory factory,
+	private static MongoDatabase doGetMongoDatabase(@Nullable String dbName, MongoDatabaseFactory factory,
 			SessionSynchronization sessionSynchronization) {
 
 		Assert.notNull(factory, "Factory must not be null!");
 
 		if (!TransactionSynchronizationManager.isSynchronizationActive()) {
-			return StringUtils.hasText(dbName) ? factory.getDb(dbName) : factory.getDb();
+			return StringUtils.hasText(dbName) ? factory.getMongoDatabase(dbName) : factory.getMongoDatabase();
 		}
 
 		ClientSession session = doGetSession(factory, sessionSynchronization);
 
 		if (session == null) {
-			return StringUtils.hasText(dbName) ? factory.getDb(dbName) : factory.getDb();
+			return StringUtils.hasText(dbName) ? factory.getMongoDatabase(dbName) : factory.getMongoDatabase();
 		}
 
-		MongoDbFactory factoryToUse = factory.withSession(session);
-		return StringUtils.hasText(dbName) ? factoryToUse.getDb(dbName) : factoryToUse.getDb();
+		MongoDatabaseFactory factoryToUse = factory.withSession(session);
+		return StringUtils.hasText(dbName) ? factoryToUse.getMongoDatabase(dbName) : factoryToUse.getMongoDatabase();
 	}
 
 	/**
-	 * Check if the {@link MongoDbFactory} is actually bound to a {@link ClientSession} that has an active transaction, or
-	 * if a {@link TransactionSynchronization} has been registered for the {@link MongoDbFactory resource} and if the
-	 * associated {@link ClientSession} has an {@link ClientSession#hasActiveTransaction() active transaction}.
+	 * Check if the {@link MongoDatabaseFactory} is actually bound to a {@link ClientSession} that has an active
+	 * transaction, or if a {@link TransactionSynchronization} has been registered for the {@link MongoDatabaseFactory
+	 * resource} and if the associated {@link ClientSession} has an {@link ClientSession#hasActiveTransaction() active
+	 * transaction}.
 	 *
 	 * @param dbFactory the resource to check transactions for. Must not be {@literal null}.
 	 * @return {@literal true} if the factory has an ongoing transaction.
 	 * @since 2.1.3
 	 */
-	public static boolean isTransactionActive(MongoDbFactory dbFactory) {
+	public static boolean isTransactionActive(MongoDatabaseFactory dbFactory) {
 
 		if (dbFactory.isTransactionActive()) {
 			return true;
@@ -138,7 +139,8 @@ public class MongoDatabaseUtils {
 	}
 
 	@Nullable
-	private static ClientSession doGetSession(MongoDbFactory dbFactory, SessionSynchronization sessionSynchronization) {
+	private static ClientSession doGetSession(MongoDatabaseFactory dbFactory,
+			SessionSynchronization sessionSynchronization) {
 
 		MongoResourceHolder resourceHolder = (MongoResourceHolder) TransactionSynchronizationManager.getResource(dbFactory);
 
@@ -169,7 +171,7 @@ public class MongoDatabaseUtils {
 		return resourceHolder.getSession();
 	}
 
-	private static ClientSession createClientSession(MongoDbFactory dbFactory) {
+	private static ClientSession createClientSession(MongoDatabaseFactory dbFactory) {
 		return dbFactory.getSession(ClientSessionOptions.builder().causallyConsistent(true).build());
 	}
 
@@ -184,7 +186,7 @@ public class MongoDatabaseUtils {
 
 		private final MongoResourceHolder resourceHolder;
 
-		MongoSessionSynchronization(MongoResourceHolder resourceHolder, MongoDbFactory dbFactory) {
+		MongoSessionSynchronization(MongoResourceHolder resourceHolder, MongoDatabaseFactory dbFactory) {
 
 			super(resourceHolder, dbFactory);
 			this.resourceHolder = resourceHolder;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,14 +15,8 @@
  */
 package org.springframework.data.mongodb;
 
-import org.bson.codecs.configuration.CodecRegistry;
 import org.springframework.dao.DataAccessException;
-import org.springframework.dao.support.PersistenceExceptionTranslator;
-import org.springframework.data.mongodb.core.MongoExceptionTranslator;
 
-import com.mongodb.ClientSessionOptions;
-import com.mongodb.DB;
-import com.mongodb.client.ClientSession;
 import com.mongodb.client.MongoDatabase;
 
 /**
@@ -31,92 +25,33 @@ import com.mongodb.client.MongoDatabase;
  * @author Mark Pollack
  * @author Thomas Darimont
  * @author Christoph Strobl
+ * @deprecated since 3.0, use {@link MongoDatabaseFactory} instead.
  */
-public interface MongoDbFactory extends CodecRegistryProvider, MongoSessionProvider {
+@Deprecated
+public interface MongoDbFactory extends MongoDatabaseFactory {
 
 	/**
 	 * Creates a default {@link MongoDatabase} instance.
 	 *
 	 * @return
 	 * @throws DataAccessException
+	 * @deprecated since 3.0. Use {@link #getMongoDatabase()} instead.
 	 */
-	MongoDatabase getDb() throws DataAccessException;
+	@Deprecated
+	default MongoDatabase getDb() throws DataAccessException {
+		return getMongoDatabase();
+	}
 
 	/**
-	 * Creates a {@link DB} instance to access the database with the given name.
+	 * Obtain a {@link MongoDatabase} instance to access the database with the given name.
 	 *
 	 * @param dbName must not be {@literal null} or empty.
 	 * @return
 	 * @throws DataAccessException
-	 */
-	MongoDatabase getDb(String dbName) throws DataAccessException;
-
-	/**
-	 * Exposes a shared {@link MongoExceptionTranslator}.
-	 *
-	 * @return will never be {@literal null}.
-	 */
-	PersistenceExceptionTranslator getExceptionTranslator();
-
-	/**
-	 * Get the legacy database entry point. Please consider {@link #getDb()} instead.
-	 *
-	 * @return
-	 * @deprecated since 2.1, use {@link #getDb()}. This method will be removed with a future version as it works only
-	 *             with the legacy MongoDB driver.
+	 * @deprecated since 3.0. Use {@link #getMongoDatabase(String)} instead.
 	 */
 	@Deprecated
-	DB getLegacyDb();
-
-	/**
-	 * Get the underlying {@link CodecRegistry} used by the MongoDB Java driver.
-	 *
-	 * @return never {@literal null}.
-	 */
-	@Override
-	default CodecRegistry getCodecRegistry() {
-		return getDb().getCodecRegistry();
-	}
-
-	/**
-	 * Obtain a {@link ClientSession} for given ClientSessionOptions.
-	 *
-	 * @param options must not be {@literal null}.
-	 * @return never {@literal null}.
-	 * @since 2.1
-	 */
-	ClientSession getSession(ClientSessionOptions options);
-
-	/**
-	 * Obtain a {@link ClientSession} bound instance of {@link MongoDbFactory} returning {@link MongoDatabase} instances
-	 * that are aware and bound to a new session with given {@link ClientSessionOptions options}.
-	 *
-	 * @param options must not be {@literal null}.
-	 * @return never {@literal null}.
-	 * @since 2.1
-	 */
-	default MongoDbFactory withSession(ClientSessionOptions options) {
-		return withSession(getSession(options));
-	}
-
-	/**
-	 * Obtain a {@link ClientSession} bound instance of {@link MongoDbFactory} returning {@link MongoDatabase} instances
-	 * that are aware and bound to the given session.
-	 *
-	 * @param session must not be {@literal null}.
-	 * @return never {@literal null}.
-	 * @since 2.1
-	 */
-	MongoDbFactory withSession(ClientSession session);
-
-	/**
-	 * Returns if the given {@link MongoDbFactory} is bound to a {@link ClientSession} that has an
-	 * {@link ClientSession#hasActiveTransaction() active transaction}.
-	 *
-	 * @return {@literal true} if there's an active transaction, {@literal false} otherwise.
-	 * @since 2.1.3
-	 */
-	default boolean isTransactionActive() {
-		return false;
+	default MongoDatabase getDb(String dbName) throws DataAccessException {
+		return getMongoDatabase(dbName);
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,15 +36,15 @@ import com.mongodb.client.ClientSession;
 class MongoResourceHolder extends ResourceHolderSupport {
 
 	private @Nullable ClientSession session;
-	private MongoDbFactory dbFactory;
+	private MongoDatabaseFactory dbFactory;
 
 	/**
 	 * Create a new {@link MongoResourceHolder} for a given {@link ClientSession session}.
 	 *
 	 * @param session the associated {@link ClientSession}. Can be {@literal null}.
-	 * @param dbFactory the associated {@link MongoDbFactory}. must not be {@literal null}.
+	 * @param dbFactory the associated {@link MongoDatabaseFactory}. must not be {@literal null}.
 	 */
-	MongoResourceHolder(@Nullable ClientSession session, MongoDbFactory dbFactory) {
+	MongoResourceHolder(@Nullable ClientSession session, MongoDatabaseFactory dbFactory) {
 
 		this.session = session;
 		this.dbFactory = dbFactory;
@@ -75,9 +75,9 @@ class MongoResourceHolder extends ResourceHolderSupport {
 	}
 
 	/**
-	 * @return the associated {@link MongoDbFactory}.
+	 * @return the associated {@link MongoDatabaseFactory}.
 	 */
-	public MongoDbFactory getDbFactory() {
+	public MongoDatabaseFactory getDbFactory() {
 		return dbFactory;
 	}
 

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,17 +36,18 @@ import com.mongodb.client.ClientSession;
 
 /**
  * A {@link org.springframework.transaction.PlatformTransactionManager} implementation that manages
- * {@link ClientSession} based transactions for a single {@link MongoDbFactory}.
+ * {@link ClientSession} based transactions for a single {@link MongoDatabaseFactory}.
  * <p />
- * Binds a {@link ClientSession} from the specified {@link MongoDbFactory} to the thread.
+ * Binds a {@link ClientSession} from the specified {@link MongoDatabaseFactory} to the thread.
  * <p />
  * {@link TransactionDefinition#isReadOnly() Readonly} transactions operate on a {@link ClientSession} and enable causal
  * consistency, and also {@link ClientSession#startTransaction() start}, {@link ClientSession#commitTransaction()
  * commit} or {@link ClientSession#abortTransaction() abort} a transaction.
  * <p />
  * Application code is required to retrieve the {@link com.mongodb.client.MongoDatabase} via
- * {@link MongoDatabaseUtils#getDatabase(MongoDbFactory)} instead of a standard {@link MongoDbFactory#getDb()} call.
- * Spring classes such as {@link org.springframework.data.mongodb.core.MongoTemplate} use this strategy implicitly.
+ * {@link MongoDatabaseUtils#getDatabase(MongoDatabaseFactory)} instead of a standard
+ * {@link MongoDatabaseFactory#getMongoDatabase()} call. Spring classes such as
+ * {@link org.springframework.data.mongodb.core.MongoTemplate} use this strategy implicitly.
  * <p />
  * By default failure of a {@literal commit} operation raises a {@link TransactionSystemException}. One may override
  * {@link #doCommit(MongoTransactionObject)} to implement the
@@ -58,46 +59,46 @@ import com.mongodb.client.ClientSession;
  * @currentRead Shadow's Edge - Brent Weeks
  * @since 2.1
  * @see <a href="https://www.mongodb.com/transactions">MongoDB Transaction Documentation</a>
- * @see MongoDatabaseUtils#getDatabase(MongoDbFactory, SessionSynchronization)
+ * @see MongoDatabaseUtils#getDatabase(MongoDatabaseFactory, SessionSynchronization)
  */
 public class MongoTransactionManager extends AbstractPlatformTransactionManager
 		implements ResourceTransactionManager, InitializingBean {
 
-	private @Nullable MongoDbFactory dbFactory;
+	private @Nullable MongoDatabaseFactory dbFactory;
 	private @Nullable TransactionOptions options;
 
 	/**
 	 * Create a new {@link MongoTransactionManager} for bean-style usage.
 	 * <p />
-	 * <strong>Note:</strong>The {@link MongoDbFactory db factory} has to be {@link #setDbFactory(MongoDbFactory) set}
-	 * before using the instance. Use this constructor to prepare a {@link MongoTransactionManager} via a
-	 * {@link org.springframework.beans.factory.BeanFactory}.
+	 * <strong>Note:</strong>The {@link MongoDatabaseFactory db factory} has to be
+	 * {@link #setDbFactory(MongoDatabaseFactory) set} before using the instance. Use this constructor to prepare a
+	 * {@link MongoTransactionManager} 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 #setDbFactory(MongoDbFactory)
+	 * @see #setDbFactory(MongoDatabaseFactory)
 	 * @see #setTransactionSynchronization(int)
 	 */
 	public MongoTransactionManager() {}
 
 	/**
-	 * Create a new {@link MongoTransactionManager} obtaining sessions from the given {@link MongoDbFactory}.
+	 * Create a new {@link MongoTransactionManager} obtaining sessions from the given {@link MongoDatabaseFactory}.
 	 *
 	 * @param dbFactory must not be {@literal null}.
 	 */
-	public MongoTransactionManager(MongoDbFactory dbFactory) {
+	public MongoTransactionManager(MongoDatabaseFactory dbFactory) {
 		this(dbFactory, null);
 	}
 
 	/**
-	 * Create a new {@link MongoTransactionManager} obtaining sessions from the given {@link MongoDbFactory} applying the
-	 * given {@link TransactionOptions options}, if present, when starting a new transaction.
+	 * Create a new {@link MongoTransactionManager} obtaining sessions from the given {@link MongoDatabaseFactory}
+	 * applying the given {@link TransactionOptions options}, if present, when starting a new transaction.
 	 *
 	 * @param dbFactory must not be {@literal null}.
 	 * @param options can be {@literal null}.
 	 */
-	public MongoTransactionManager(MongoDbFactory dbFactory, @Nullable TransactionOptions options) {
+	public MongoTransactionManager(MongoDatabaseFactory dbFactory, @Nullable TransactionOptions options) {
 
 		Assert.notNull(dbFactory, "DbFactory must not be null!");
 
@@ -295,11 +296,11 @@ public class MongoTransactionManager extends AbstractPlatformTransactionManager
 	}
 
 	/**
-	 * Set the {@link MongoDbFactory} that this instance should manage transactions for.
+	 * Set the {@link MongoDatabaseFactory} that this instance should manage transactions for.
 	 *
 	 * @param dbFactory must not be {@literal null}.
 	 */
-	public void setDbFactory(MongoDbFactory dbFactory) {
+	public void setDbFactory(MongoDatabaseFactory dbFactory) {
 
 		Assert.notNull(dbFactory, "DbFactory must not be null!");
 		this.dbFactory = dbFactory;
@@ -315,12 +316,12 @@ public class MongoTransactionManager extends AbstractPlatformTransactionManager
 	}
 
 	/**
-	 * Get the {@link MongoDbFactory} that this instance manages transactions for.
+	 * Get the {@link MongoDatabaseFactory} that this instance manages transactions for.
 	 *
 	 * @return can be {@literal null}.
 	 */
 	@Nullable
-	public MongoDbFactory getDbFactory() {
+	public MongoDatabaseFactory getDbFactory() {
 		return dbFactory;
 	}
 
@@ -329,7 +330,7 @@ public class MongoTransactionManager extends AbstractPlatformTransactionManager
 	 * @see org.springframework.transaction.support.ResourceTransactionManager#getResourceFactory()
 	 */
 	@Override
-	public MongoDbFactory getResourceFactory() {
+	public MongoDatabaseFactory getResourceFactory() {
 		return getRequiredDbFactory();
 	}
 
@@ -344,7 +345,7 @@ public class MongoTransactionManager extends AbstractPlatformTransactionManager
 
 	private MongoResourceHolder newResourceHolder(TransactionDefinition definition, ClientSessionOptions options) {
 
-		MongoDbFactory dbFactory = getResourceFactory();
+		MongoDatabaseFactory dbFactory = getResourceFactory();
 
 		MongoResourceHolder resourceHolder = new MongoResourceHolder(dbFactory.getSession(options), dbFactory);
 		resourceHolder.setTimeoutIfNotDefaulted(determineTimeout(definition));
@@ -355,7 +356,7 @@ public class MongoTransactionManager extends AbstractPlatformTransactionManager
 	/**
 	 * @throws IllegalStateException if {@link #dbFactory} is {@literal null}.
 	 */
-	private MongoDbFactory getRequiredDbFactory() {
+	private MongoDatabaseFactory getRequiredDbFactory() {
 
 		Assert.state(dbFactory != null,
 				"MongoTransactionManager operates upon a MongoDbFactory. Did you forget to provide one? It's required.");

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ public interface ReactiveMongoDatabaseFactory extends CodecRegistryProvider {
 	MongoDatabase getMongoDatabase() throws DataAccessException;
 
 	/**
-	 * Creates a {@link MongoDatabase} instance to access the database with the given name.
+	 * Obtain a {@link MongoDatabase} instance to access the database with the given name.
 	 *
 	 * @param dbName must not be {@literal null} or empty.
 	 * @return

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ class ReactiveMongoResourceHolder extends ResourceHolderSupport {
 	 * 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}.
+	 * @param databaseFactory the associated {@link MongoDatabaseFactory}. must not be {@literal null}.
 	 */
 	ReactiveMongoResourceHolder(@Nullable ClientSession session, ReactiveMongoDatabaseFactory databaseFactory) {
 

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

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

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

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

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

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

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

@@ -0,0 +1,77 @@
+/*
+ * Copyright 2020 the original author 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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.data.util.Version;
+import org.springframework.util.StringUtils;
+
+import com.mongodb.MongoDriverInformation;
+
+/**
+ * Class that exposes the SpringData MongoDB specific information like the current {@link Version} or
+ * {@link MongoDriverInformation driver information}.
+ *
+ * @author Christoph Strobl
+ * @since 3.0
+ */
+public class SpringDataMongoDB {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(SpringDataMongoDB.class);
+
+	private static final Version FALLBACK_VERSION = new Version(3);
+	private static final MongoDriverInformation DRIVER_INFORMATION = MongoDriverInformation
+			.builder(MongoDriverInformation.builder().build()).driverName("spring-data").build();
+
+	/**
+	 * Obtain the SpringData MongoDB specific driver information.
+	 *
+	 * @return never {@literal null}.
+	 */
+	public static MongoDriverInformation driverInformation() {
+		return DRIVER_INFORMATION;
+	}
+
+	/**
+	 * Fetches the "Implementation-Version" manifest attribute from the jar file.
+	 * <p />
+	 * Note that some ClassLoaders do not expose the package metadata, hence this class might not be able to determine the
+	 * version in all environments. In this case the current Major version is returned as a fallback.
+	 *
+	 * @return never {@literal null}.
+	 */
+	public static Version version() {
+
+		Package pkg = SpringDataMongoDB.class.getPackage();
+		String versionString = (pkg != null ? pkg.getImplementationVersion() : null);
+
+		if (!StringUtils.hasText(versionString)) {
+
+			LOGGER.debug("Unable to find Spring Data MongoDB version.");
+			return FALLBACK_VERSION;
+		}
+
+		try {
+			return Version.parse(versionString);
+		} catch (Exception e) {
+			LOGGER.debug("Cannot read Spring Data MongoDB version '{}'.", versionString);
+		}
+
+		return FALLBACK_VERSION;
+	}
+
+}

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,17 +17,22 @@ package org.springframework.data.mongodb.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
+import org.springframework.data.mongodb.SpringDataMongoDB;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.SimpleMongoClientDbFactory;
-import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
+import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory;
 import org.springframework.data.mongodb.core.convert.DbRefResolver;
 import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
 import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.lang.Nullable;
 
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoClientSettings.Builder;
 import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 
 /**
  * Base class for Spring Data MongoDB configuration using JavaConfig with {@link com.mongodb.client.MongoClient}.
@@ -35,40 +40,44 @@ import com.mongodb.client.MongoClient;
  * @author Christoph Strobl
  * @since 2.1
  * @see MongoConfigurationSupport
- * @see AbstractMongoConfiguration
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public abstract class AbstractMongoClientConfiguration extends MongoConfigurationSupport {
 
 	/**
 	 * Return the {@link MongoClient} instance to connect to. Annotate with {@link Bean} in case you want to expose a
-	 * {@link MongoClient} instance to the {@link org.springframework.context.ApplicationContext}.
+	 * {@link MongoClient} instance to the {@link org.springframework.context.ApplicationContext}. <br />
+	 * Override {@link #mongoClientSettings()} to configure connection details.
 	 *
-	 * @return
+	 * @return never {@literal null}.
+	 * @see #mongoClientSettings()
+	 * @see #configureClientSettings(Builder)
 	 */
-	public abstract MongoClient mongoClient();
+	public MongoClient mongoClient() {
+		return createMongoClient(mongoClientSettings());
+	}
 
 	/**
 	 * Creates a {@link MongoTemplate}.
 	 *
-	 * @return
+	 * @see #mongoDbFactory()
+	 * @see #mappingMongoConverter(MongoDatabaseFactory, MongoCustomConversions, MongoMappingContext)
 	 */
 	@Bean
-	public MongoTemplate mongoTemplate() throws Exception {
-		return new MongoTemplate(mongoDbFactory(), mappingMongoConverter());
+	public MongoTemplate mongoTemplate(MongoDatabaseFactory databaseFactory, MappingMongoConverter converter) {
+		return new MongoTemplate(databaseFactory, converter);
 	}
 
 	/**
-	 * Creates a {@link SimpleMongoDbFactory} to be used by the {@link MongoTemplate}. Will use the {@link MongoClient}
-	 * instance configured in {@link #mongoClient()}.
+	 * Creates a {@link org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory} to be used by the
+	 * {@link MongoTemplate}. Will use the {@link MongoClient} instance configured in {@link #mongoClient()}.
 	 *
 	 * @see #mongoClient()
-	 * @see #mongoTemplate()
-	 * @return
+	 * @see #mongoTemplate(MongoDatabaseFactory, MappingMongoConverter)
 	 */
 	@Bean
-	public MongoDbFactory mongoDbFactory() {
-		return new SimpleMongoClientDbFactory(mongoClient(), getDatabaseName());
+	public MongoDatabaseFactory mongoDbFactory() {
+		return new SimpleMongoClientDatabaseFactory(mongoClient(), getDatabaseName());
 	}
 
 	/**
@@ -91,21 +100,32 @@ public abstract class AbstractMongoClientConfiguration extends MongoConfiguratio
 
 	/**
 	 * Creates a {@link MappingMongoConverter} using the configured {@link #mongoDbFactory()} and
-	 * {@link #mongoMappingContext()}. Will get {@link #customConversions()} applied.
+	 * {@link #mongoMappingContext(MongoCustomConversions)}. Will get {@link #customConversions()} applied.
 	 *
 	 * @see #customConversions()
-	 * @see #mongoMappingContext()
+	 * @see #mongoMappingContext(MongoCustomConversions)
 	 * @see #mongoDbFactory()
-	 * @return
-	 * @throws Exception
 	 */
 	@Bean
-	public MappingMongoConverter mappingMongoConverter() throws Exception {
+	public MappingMongoConverter mappingMongoConverter(MongoDatabaseFactory databaseFactory,
+			MongoCustomConversions customConversions, MongoMappingContext mappingContext) {
 
-		DbRefResolver dbRefResolver = new DefaultDbRefResolver(mongoDbFactory());
-		MappingMongoConverter converter = new MappingMongoConverter(dbRefResolver, mongoMappingContext());
-		converter.setCustomConversions(customConversions());
+		DbRefResolver dbRefResolver = new DefaultDbRefResolver(databaseFactory);
+		MappingMongoConverter converter = new MappingMongoConverter(dbRefResolver, mappingContext);
+		converter.setCustomConversions(customConversions);
+		converter.setCodecRegistryProvider(databaseFactory);
 
 		return converter;
 	}
+
+	/**
+	 * Create the Reactive Streams {@link com.mongodb.reactivestreams.client.MongoClient} instance with given
+	 * {@link MongoClientSettings}.
+	 *
+	 * @return never {@literal null}.
+	 * @since 3.0
+	 */
+	protected MongoClient createMongoClient(MongoClientSettings settings) {
+		return MongoClients.create(settings, SpringDataMongoDB.driverInformation());
+	}
 }

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

@@ -1,118 +0,0 @@
-/*
- * 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.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.mongodb.MongoDbFactory;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
-import org.springframework.data.mongodb.core.convert.DbRefResolver;
-import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
-import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
-import org.springframework.data.mongodb.core.mapping.Document;
-import org.springframework.lang.Nullable;
-
-import com.mongodb.MongoClient;
-
-/**
- * Base class for Spring Data MongoDB configuration using JavaConfig with {@link com.mongodb.MongoClient}.
- * <p />
- * <strong>INFO:</strong>In case you want to use {@link com.mongodb.client.MongoClients} for configuration please refer
- * to {@link AbstractMongoClientConfiguration}.
- *
- * @author Mark Pollack
- * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Ryan Tenney
- * @author Christoph Strobl
- * @author Mark Paluch
- * @see MongoConfigurationSupport
- * @see AbstractMongoClientConfiguration
- */
-@Configuration
-public abstract class AbstractMongoConfiguration extends MongoConfigurationSupport {
-
-	/**
-	 * Return the {@link MongoClient} instance to connect to. Annotate with {@link Bean} in case you want to expose a
-	 * {@link MongoClient} instance to the {@link org.springframework.context.ApplicationContext}.
-	 *
-	 * @return
-	 */
-	public abstract MongoClient mongoClient();
-
-	/**
-	 * Creates a {@link MongoTemplate}.
-	 *
-	 * @return
-	 */
-	@Bean
-	public MongoTemplate mongoTemplate() throws Exception {
-		return new MongoTemplate(mongoDbFactory(), mappingMongoConverter());
-	}
-
-	/**
-	 * Creates a {@link SimpleMongoDbFactory} to be used by the {@link MongoTemplate}. Will use the {@link MongoClient}
-	 * instance configured in {@link #mongoClient()}.
-	 *
-	 * @see #mongoClient()
-	 * @see #mongoTemplate()
-	 * @return
-	 */
-	@Bean
-	public MongoDbFactory mongoDbFactory() {
-		return new SimpleMongoDbFactory(mongoClient(), getDatabaseName());
-	}
-
-	/**
-	 * Return the base package to scan for mapped {@link Document}s. Will return the package name of the configuration
-	 * class' (the concrete class, not this one here) by default. So if you have a {@code com.acme.AppConfig} extending
-	 * {@link AbstractMongoConfiguration} the base package will be considered {@code com.acme} unless the method is
-	 * overridden to implement alternate behavior.
-	 *
-	 * @return the base package to scan for mapped {@link Document} classes or {@literal null} to not enable scanning for
-	 *         entities.
-	 * @deprecated use {@link #getMappingBasePackages()} instead.
-	 */
-	@Deprecated
-	@Nullable
-	protected String getMappingBasePackage() {
-
-		Package mappingBasePackage = getClass().getPackage();
-		return mappingBasePackage == null ? null : mappingBasePackage.getName();
-	}
-
-	/**
-	 * Creates a {@link MappingMongoConverter} using the configured {@link #mongoDbFactory()} and
-	 * {@link #mongoMappingContext()}. Will get {@link #customConversions()} applied.
-	 *
-	 * @see #customConversions()
-	 * @see #mongoMappingContext()
-	 * @see #mongoDbFactory()
-	 * @return
-	 * @throws Exception
-	 */
-	@Bean
-	public MappingMongoConverter mappingMongoConverter() throws Exception {
-
-		DbRefResolver dbRefResolver = new DefaultDbRefResolver(mongoDbFactory());
-		MappingMongoConverter converter = new MappingMongoConverter(dbRefResolver, mongoMappingContext());
-		converter.setCustomConversions(customConversions());
-
-		return converter;
-	}
-
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,13 +18,19 @@ package org.springframework.data.mongodb.config;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory;
+import org.springframework.data.mongodb.SpringDataMongoDB;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
 import org.springframework.data.mongodb.core.SimpleReactiveMongoDatabaseFactory;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
 import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoClientSettings.Builder;
 import com.mongodb.reactivestreams.client.MongoClient;
+import com.mongodb.reactivestreams.client.MongoClients;
 
 /**
  * Base class for reactive Spring Data MongoDB configuration using JavaConfig.
@@ -34,25 +40,33 @@ import com.mongodb.reactivestreams.client.MongoClient;
  * @since 2.0
  * @see MongoConfigurationSupport
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public abstract class AbstractReactiveMongoConfiguration extends MongoConfigurationSupport {
 
 	/**
 	 * Return the Reactive Streams {@link MongoClient} instance to connect to. Annotate with {@link Bean} in case you want
-	 * to expose a {@link MongoClient} instance to the {@link org.springframework.context.ApplicationContext}.
+	 * to expose a {@link MongoClient} instance to the {@link org.springframework.context.ApplicationContext}. <br />
+	 * Override {@link #mongoClientSettings()} to configure connection details.
 	 *
 	 * @return never {@literal null}.
+	 * @see #mongoClientSettings()
+	 * @see #configureClientSettings(Builder)
 	 */
-	public abstract MongoClient reactiveMongoClient();
+	public MongoClient reactiveMongoClient() {
+		return createReactiveMongoClient(mongoClientSettings());
+	}
 
 	/**
 	 * Creates {@link ReactiveMongoOperations}.
 	 *
+	 * @see #reactiveMongoDbFactory()
+	 * @see #mappingMongoConverter(ReactiveMongoDatabaseFactory, MongoCustomConversions, MongoMappingContext)
 	 * @return never {@literal null}.
 	 */
 	@Bean
-	public ReactiveMongoOperations reactiveMongoTemplate() throws Exception {
-		return new ReactiveMongoTemplate(reactiveMongoDbFactory(), mappingMongoConverter());
+	public ReactiveMongoTemplate reactiveMongoTemplate(ReactiveMongoDatabaseFactory databaseFactory,
+			MappingMongoConverter mongoConverter) {
+		return new ReactiveMongoTemplate(databaseFactory, mongoConverter);
 	}
 
 	/**
@@ -60,7 +74,7 @@ public abstract class AbstractReactiveMongoConfiguration extends MongoConfigurat
 	 * {@link MongoClient} instance configured in {@link #reactiveMongoClient()}.
 	 *
 	 * @see #reactiveMongoClient()
-	 * @see #reactiveMongoTemplate()
+	 * @see #reactiveMongoTemplate(ReactiveMongoDatabaseFactory, MappingMongoConverter)
 	 * @return never {@literal null}.
 	 */
 	@Bean
@@ -70,20 +84,31 @@ public abstract class AbstractReactiveMongoConfiguration extends MongoConfigurat
 
 	/**
 	 * Creates a {@link MappingMongoConverter} using the configured {@link #reactiveMongoDbFactory()} and
-	 * {@link #mongoMappingContext()}. Will get {@link #customConversions()} applied.
+	 * {@link #mongoMappingContext(MongoCustomConversions)}. Will get {@link #customConversions()} applied.
 	 *
 	 * @see #customConversions()
-	 * @see #mongoMappingContext()
+	 * @see #mongoMappingContext(MongoCustomConversions)
 	 * @see #reactiveMongoDbFactory()
 	 * @return never {@literal null}.
-	 * @throws Exception
 	 */
 	@Bean
-	public MappingMongoConverter mappingMongoConverter() throws Exception {
+	public MappingMongoConverter mappingMongoConverter(ReactiveMongoDatabaseFactory databaseFactory,
+			MongoCustomConversions customConversions, MongoMappingContext mappingContext) {
 
-		MappingMongoConverter converter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, mongoMappingContext());
-		converter.setCustomConversions(customConversions());
+		MappingMongoConverter converter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, mappingContext);
+		converter.setCustomConversions(customConversions);
+		converter.setCodecRegistryProvider(databaseFactory);
 
 		return converter;
 	}
+
+	/**
+	 * Create the Reactive Streams {@link MongoClient} instance with given {@link MongoClientSettings}.
+	 *
+	 * @return never {@literal null}.
+	 * @since 3.0
+	 */
+	protected MongoClient createReactiveMongoClient(MongoClientSettings settings) {
+		return MongoClients.create(settings, SpringDataMongoDB.driverInformation());
+	}
 }

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

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

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

@@ -0,0 +1,46 @@
+/*
+ * 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.config;
+
+import java.beans.PropertyEditorSupport;
+
+import org.springframework.lang.Nullable;
+import org.springframework.util.StringUtils;
+
+import com.mongodb.ConnectionString;
+
+/**
+ * Parse a {@link String} to a {@link com.mongodb.ConnectionString}.
+ *
+ * @author Christoph Strobl
+ * @since 3.0
+ */
+public class ConnectionStringPropertyEditor extends PropertyEditorSupport {
+
+	/*
+	 * (non-Javadoc)
+	 * @see java.beans.PropertyEditorSupport#setAsText(java.lang.String)
+	 */
+	@Override
+	public void setAsText(@Nullable String connectionString) {
+
+		if (!StringUtils.hasText(connectionString)) {
+			return;
+		}
+
+		setValue(new ConnectionString(connectionString));
+	}
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,10 +50,11 @@ public class MongoClientParser implements BeanDefinitionParser {
 
 		ParsingUtils.setPropertyValue(builder, element, "port", "port");
 		ParsingUtils.setPropertyValue(builder, element, "host", "host");
-		ParsingUtils.setPropertyValue(builder, element, "credentials", "credentials");
+		ParsingUtils.setPropertyValue(builder, element, "credential", "credential");
+		ParsingUtils.setPropertyValue(builder, element, "replica-set", "replicaSet");
+		ParsingUtils.setPropertyValue(builder, element, "connection-string", "connectionString");
 
-		MongoParsingUtils.parseMongoClientOptions(element, builder);
-		MongoParsingUtils.parseReplicaSet(element, builder);
+		MongoParsingUtils.parseMongoClientSettings(element, builder);
 
 		String defaultedId = StringUtils.hasText(id) ? id : BeanNames.MONGO_BEAN_NAME;
 
@@ -62,22 +63,34 @@ public class MongoClientParser implements BeanDefinitionParser {
 		BeanComponentDefinition mongoComponent = helper.getComponent(builder, defaultedId);
 		parserContext.registerBeanComponent(mongoComponent);
 
-		BeanComponentDefinition serverAddressPropertyEditor = helper.getComponent(MongoParsingUtils
-				.getServerAddressPropertyEditorBuilder());
+		BeanComponentDefinition connectionStringPropertyEditor = helper
+				.getComponent(MongoParsingUtils.getConnectionStringPropertyEditorBuilder());
+		parserContext.registerBeanComponent(connectionStringPropertyEditor);
+
+		BeanComponentDefinition serverAddressPropertyEditor = helper
+				.getComponent(MongoParsingUtils.getServerAddressPropertyEditorBuilder());
 		parserContext.registerBeanComponent(serverAddressPropertyEditor);
 
-		BeanComponentDefinition writeConcernEditor = helper.getComponent(MongoParsingUtils
-				.getWriteConcernPropertyEditorBuilder());
+		BeanComponentDefinition writeConcernEditor = helper
+				.getComponent(MongoParsingUtils.getWriteConcernPropertyEditorBuilder());
 		parserContext.registerBeanComponent(writeConcernEditor);
 
-		BeanComponentDefinition readPreferenceEditor = helper.getComponent(MongoParsingUtils
-				.getReadPreferencePropertyEditorBuilder());
+		BeanComponentDefinition readConcernEditor = helper
+				.getComponent(MongoParsingUtils.getReadConcernPropertyEditorBuilder());
+		parserContext.registerBeanComponent(readConcernEditor);
+
+		BeanComponentDefinition readPreferenceEditor = helper
+				.getComponent(MongoParsingUtils.getReadPreferencePropertyEditorBuilder());
 		parserContext.registerBeanComponent(readPreferenceEditor);
 
-		BeanComponentDefinition credentialsEditor = helper.getComponent(MongoParsingUtils
-				.getMongoCredentialPropertyEditor());
+		BeanComponentDefinition credentialsEditor = helper
+				.getComponent(MongoParsingUtils.getMongoCredentialPropertyEditor());
 		parserContext.registerBeanComponent(credentialsEditor);
 
+		BeanComponentDefinition uuidRepresentationEditor = helper
+				.getComponent(MongoParsingUtils.getUUidRepresentationEditorBuilder());
+		parserContext.registerBeanComponent(uuidRepresentationEditor);
+
 		parserContext.popAndRegisterContainingComponent();
 
 		return mongoComponent.getBeanDefinition();

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.bson.UuidRepresentation;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
@@ -31,11 +32,15 @@ import org.springframework.data.mapping.model.CamelCaseAbbreviatingFieldNamingSt
 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.convert.MongoCustomConversions.MongoConverterConfigurationAdapter;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoClientSettings.Builder;
+
 /**
  * Base class for Spring Data MongoDB to be extended for JavaConfiguration usage.
  *
@@ -75,11 +80,12 @@ public abstract class MongoConfigurationSupport {
 	 * @throws ClassNotFoundException
 	 */
 	@Bean
-	public MongoMappingContext mongoMappingContext() throws ClassNotFoundException {
+	public MongoMappingContext mongoMappingContext(MongoCustomConversions customConversions)
+			throws ClassNotFoundException {
 
 		MongoMappingContext mappingContext = new MongoMappingContext();
 		mappingContext.setInitialEntitySet(getInitialEntitySet());
-		mappingContext.setSimpleTypeHolder(customConversions().getSimpleTypeHolder());
+		mappingContext.setSimpleTypeHolder(customConversions.getSimpleTypeHolder());
 		mappingContext.setFieldNamingStrategy(fieldNamingStrategy());
 		mappingContext.setAutoIndexCreation(autoIndexCreation());
 
@@ -88,14 +94,30 @@ public abstract class MongoConfigurationSupport {
 
 	/**
 	 * Register custom {@link Converter}s in a {@link CustomConversions} object if required. These
-	 * {@link CustomConversions} will be registered with the {@link #mappingMongoConverter()} and
-	 * {@link #mongoMappingContext()}. Returns an empty {@link MongoCustomConversions} instance by default.
+	 * {@link CustomConversions} will be registered with the
+	 * {@link org.springframework.data.mongodb.core.convert.MappingMongoConverter} and {@link #mongoMappingContext()}.
+	 * Returns an empty {@link MongoCustomConversions} instance by default.
+	 * <p>
+	 * <strong>NOTE:</strong> Use {@link #configureConverters(MongoConverterConfigurationAdapter)} to configure MongoDB
+	 * native simple types and register custom {@link Converter converters}.
 	 *
 	 * @return must not be {@literal null}.
 	 */
 	@Bean
-	public CustomConversions customConversions() {
-		return new MongoCustomConversions(Collections.emptyList());
+	public MongoCustomConversions customConversions() {
+		return MongoCustomConversions.create(this::configureConverters);
+	}
+
+	/**
+	 * Configuration hook for {@link MongoCustomConversions} creation.
+	 *
+	 * @param converterConfigurationAdapter never {@literal null}.
+	 * @since 2.3
+	 * @see MongoConverterConfigurationAdapter#useNativeDriverJavaTimeCodecs()
+	 * @see MongoConverterConfigurationAdapter#useSpringDataJavaTimeCodecs()
+	 */
+	protected void configureConverters(MongoConverterConfigurationAdapter converterConfigurationAdapter) {
+
 	}
 
 	/**
@@ -184,4 +206,28 @@ public abstract class MongoConfigurationSupport {
 	protected boolean autoIndexCreation() {
 		return true;
 	}
+
+	/**
+	 * Return the {@link MongoClientSettings} used to create the actual {@literal MongoClient}. <br />
+	 * Override either this method, or use {@link #configureClientSettings(Builder)} to alter the setup.
+	 *
+	 * @return never {@literal null}.
+	 * @since 3.0
+	 */
+	protected MongoClientSettings mongoClientSettings() {
+
+		MongoClientSettings.Builder builder = MongoClientSettings.builder();
+		configureClientSettings(builder);
+		return builder.build();
+	}
+
+	/**
+	 * Configure {@link MongoClientSettings} via its {@link Builder} API.
+	 *
+	 * @param builder never {@literal null}.
+	 * @since 3.0
+	 */
+	protected void configureClientSettings(MongoClientSettings.Builder builder) {
+		builder.uuidRepresentation(UuidRepresentation.JAVA_LEGACY);
+	}
 }

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,14 +32,12 @@ import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.data.config.BeanComponentDefinitionBuilder;
 import org.springframework.data.mongodb.core.MongoClientFactoryBean;
-import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
+import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory;
 import org.springframework.lang.Nullable;
 import org.springframework.util.StringUtils;
 import org.w3c.dom.Element;
 
-import com.mongodb.Mongo;
-import com.mongodb.MongoClientURI;
-import com.mongodb.MongoURI;
+import com.mongodb.ConnectionString;
 
 /**
  * {@link BeanDefinitionParser} to parse {@code db-factory} elements into {@link BeanDefinition}s.
@@ -84,10 +82,11 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
 
 		// Common setup
-		BeanDefinitionBuilder dbFactoryBuilder = BeanDefinitionBuilder.genericBeanDefinition(SimpleMongoDbFactory.class);
+		BeanDefinitionBuilder dbFactoryBuilder = BeanDefinitionBuilder
+				.genericBeanDefinition(SimpleMongoClientDatabaseFactory.class);
 		setPropertyValue(dbFactoryBuilder, element, "write-concern", "writeConcern");
 
-		BeanDefinition mongoUri = getMongoUri(element, parserContext);
+		BeanDefinition mongoUri = getConnectionString(element, parserContext);
 
 		if (mongoUri != null) {
 
@@ -97,7 +96,8 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 
 		BeanComponentDefinitionBuilder helper = new BeanComponentDefinitionBuilder(element, parserContext);
 
-		String mongoRef = element.getAttribute("mongo-ref");
+		String mongoRef = element.getAttribute("mongo-client-ref");
+
 		String dbname = element.getAttribute("dbname");
 
 		// Defaulting
@@ -119,8 +119,8 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 	}
 
 	/**
-	 * Registers a default {@link BeanDefinition} of a {@link Mongo} instance and returns the name under which the
-	 * {@link Mongo} instance was registered under.
+	 * Registers a default {@link BeanDefinition} of a {@link com.mongodb.client.MongoClient} instance and returns the
+	 * name under which the {@link com.mongodb.client.MongoClient} instance was registered under.
 	 *
 	 * @param element must not be {@literal null}.
 	 * @param parserContext must not be {@literal null}.
@@ -136,8 +136,7 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 	}
 
 	/**
-	 * Creates a {@link BeanDefinition} for a {@link MongoURI} or {@link MongoClientURI} depending on configured
-	 * attributes. <br />
+	 * Creates a {@link BeanDefinition} for a {@link ConnectionString} depending on configured attributes. <br />
 	 * Errors when configured element contains {@literal uri} or {@literal client-uri} along with other attributes except
 	 * {@literal write-concern} and/or {@literal id}.
 	 *
@@ -146,11 +145,19 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 	 * @return {@literal null} in case no client-/uri defined.
 	 */
 	@Nullable
-	private BeanDefinition getMongoUri(Element element, ParserContext parserContext) {
+	private BeanDefinition getConnectionString(Element element, ParserContext parserContext) {
 
-		boolean hasClientUri = element.hasAttribute("client-uri");
+		String type = null;
 
-		if (!hasClientUri && !element.hasAttribute("uri")) {
+		if (element.hasAttribute("client-uri")) {
+			type = "client-uri";
+		} else if (element.hasAttribute("connection-string")) {
+			type = "connection-string";
+		} else if (element.hasAttribute("uri")) {
+			type = "uri";
+		}
+
+		if (!StringUtils.hasText(type)) {
 			return null;
 		}
 
@@ -164,16 +171,12 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 
 		if (element.getAttributes().getLength() > allowedAttributesCount) {
 
-			parserContext.getReaderContext().error(
-					"Configure either " + (hasClientUri ? "Mongo Client URI" : "Mongo URI") + " or details individually!",
+			parserContext.getReaderContext().error("Configure either MongoDB " + type + " or details individually!",
 					parserContext.extractSource(element));
 		}
 
-		Class<?> type = MongoClientURI.class;
-		String uri = hasClientUri ? element.getAttribute("client-uri") : element.getAttribute("uri");
-
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(type);
-		builder.addConstructorArgValue(uri);
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(ConnectionString.class);
+		builder.addConstructorArgValue(element.getAttribute(type));
 
 		return builder.getBeanDefinition();
 	}

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ import org.springframework.beans.factory.config.CustomEditorConfigurer;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.ManagedMap;
 import org.springframework.beans.factory.xml.BeanDefinitionParser;
-import org.springframework.data.mongodb.core.MongoClientOptionsFactoryBean;
+import org.springframework.data.mongodb.core.MongoClientSettingsFactoryBean;
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;
 
@@ -35,6 +35,7 @@ import org.w3c.dom.Element;
  * @author Oliver Gierke
  * @author Thomas Darimont
  * @author Christoph Strobl
+ * @author Mark Paluch
  */
 @SuppressWarnings("deprecation")
 abstract class MongoParsingUtils {
@@ -42,59 +43,78 @@ abstract class MongoParsingUtils {
 	private MongoParsingUtils() {}
 
 	/**
-	 * Parses the mongo replica-set element.
-	 *
-	 * @param parserContext the parser context
-	 * @param element the mongo element
-	 * @param mongoBuilder the bean definition builder to populate
-	 * @return
-	 */
-	static void parseReplicaSet(Element element, BeanDefinitionBuilder mongoBuilder) {
-		setPropertyValue(mongoBuilder, element, "replica-set", "replicaSetSeeds");
-	}
-
-	/**
-	 * Parses the {@code mongo:client-options} sub-element. Populates the given attribute factory with the proper
+	 * Parses the {@code mongo:client-settings} sub-element. Populates the given attribute factory with the proper
 	 * attributes.
 	 * 
-	 * @param element must not be {@literal null}.
-	 * @param mongoClientBuilder must not be {@literal null}.
+	 * @param element
+	 * @param mongoClientBuilder
 	 * @return
-	 * @since 1.7
+	 * @since 3.0
 	 */
-	public static boolean parseMongoClientOptions(Element element, BeanDefinitionBuilder mongoClientBuilder) {
+	public static boolean parseMongoClientSettings(Element element, BeanDefinitionBuilder mongoClientBuilder) {
 
-		Element optionsElement = DomUtils.getChildElementByTagName(element, "client-options");
-
-		if (optionsElement == null) {
+		Element settingsElement = DomUtils.getChildElementByTagName(element, "client-settings");
+		if (settingsElement == null) {
 			return false;
 		}
 
 		BeanDefinitionBuilder clientOptionsDefBuilder = BeanDefinitionBuilder
-				.genericBeanDefinition(MongoClientOptionsFactoryBean.class);
+				.genericBeanDefinition(MongoClientSettingsFactoryBean.class);
 
-		setPropertyValue(clientOptionsDefBuilder, optionsElement, "description", "description");
-		setPropertyValue(clientOptionsDefBuilder, optionsElement, "min-connections-per-host", "minConnectionsPerHost");
-		setPropertyValue(clientOptionsDefBuilder, optionsElement, "connections-per-host", "connectionsPerHost");
-		setPropertyValue(clientOptionsDefBuilder, optionsElement, "threads-allowed-to-block-for-connection-multiplier",
-				"threadsAllowedToBlockForConnectionMultiplier");
-		setPropertyValue(clientOptionsDefBuilder, optionsElement, "max-wait-time", "maxWaitTime");
-		setPropertyValue(clientOptionsDefBuilder, optionsElement, "max-connection-idle-time", "maxConnectionIdleTime");
-		setPropertyValue(clientOptionsDefBuilder, optionsElement, "max-connection-life-time", "maxConnectionLifeTime");
-		setPropertyValue(clientOptionsDefBuilder, optionsElement, "connect-timeout", "connectTimeout");
-		setPropertyValue(clientOptionsDefBuilder, optionsElement, "socket-timeout", "socketTimeout");
-		setPropertyValue(clientOptionsDefBuilder, optionsElement, "socket-keep-alive", "socketKeepAlive");
-		setPropertyValue(clientOptionsDefBuilder, optionsElement, "read-preference", "readPreference");
-		setPropertyValue(clientOptionsDefBuilder, optionsElement, "write-concern", "writeConcern");
-		setPropertyValue(clientOptionsDefBuilder, optionsElement, "heartbeat-frequency", "heartbeatFrequency");
-		setPropertyValue(clientOptionsDefBuilder, optionsElement, "min-heartbeat-frequency", "minHeartbeatFrequency");
-		setPropertyValue(clientOptionsDefBuilder, optionsElement, "heartbeat-connect-timeout", "heartbeatConnectTimeout");
-		setPropertyValue(clientOptionsDefBuilder, optionsElement, "heartbeat-socket-timeout", "heartbeatSocketTimeout");
-		setPropertyValue(clientOptionsDefBuilder, optionsElement, "ssl", "ssl");
-		setPropertyReference(clientOptionsDefBuilder, optionsElement, "ssl-socket-factory-ref", "sslSocketFactory");
-		setPropertyValue(clientOptionsDefBuilder, optionsElement, "server-selection-timeout", "serverSelectionTimeout");
+		setPropertyValue(clientOptionsDefBuilder, settingsElement, "application-name", "applicationName");
+		setPropertyValue(clientOptionsDefBuilder, settingsElement, "read-preference", "readPreference");
+		setPropertyValue(clientOptionsDefBuilder, settingsElement, "read-concern", "readConcern");
+		setPropertyValue(clientOptionsDefBuilder, settingsElement, "write-concern", "writeConcern");
+		setPropertyValue(clientOptionsDefBuilder, settingsElement, "retry-reads", "retryReads");
+		setPropertyValue(clientOptionsDefBuilder, settingsElement, "retry-writes", "retryWrites");
+		setPropertyValue(clientOptionsDefBuilder, settingsElement, "uuid-representation", "uUidRepresentation");
 
-		mongoClientBuilder.addPropertyValue("mongoClientOptions", clientOptionsDefBuilder.getBeanDefinition());
+		// SocketSettings
+		setPropertyValue(clientOptionsDefBuilder, settingsElement, "socket-connect-timeout", "socketConnectTimeoutMS");
+		setPropertyValue(clientOptionsDefBuilder, settingsElement, "socket-read-timeout", "socketReadTimeoutMS");
+		setPropertyValue(clientOptionsDefBuilder, settingsElement, "socket-receive-buffer-size", "socketReceiveBufferSize");
+		setPropertyValue(clientOptionsDefBuilder, settingsElement, "socket-send-buffer-size", "socketSendBufferSize");
+
+		// Server Settings
+		setPropertyValue(clientOptionsDefBuilder, settingsElement, "server-heartbeat-frequency",
+				"serverHeartbeatFrequencyMS");
+		setPropertyValue(clientOptionsDefBuilder, settingsElement, "server-min-heartbeat-frequency",
+				"serverMinHeartbeatFrequencyMS");
+
+		// Cluster Settings
+		setPropertyValue(clientOptionsDefBuilder, settingsElement, "cluster-srv-host", "clusterSrvHost");
+		setPropertyValue(clientOptionsDefBuilder, settingsElement, "cluster-hosts", "clusterHosts");
+		setPropertyValue(clientOptionsDefBuilder, settingsElement, "cluster-connection-mode", "clusterConnectionMode");
+		setPropertyValue(clientOptionsDefBuilder, settingsElement, "cluster-type", "custerRequiredClusterType");
+		setPropertyValue(clientOptionsDefBuilder, settingsElement, "cluster-local-threshold", "clusterLocalThresholdMS");
+		setPropertyValue(clientOptionsDefBuilder, settingsElement, "cluster-server-selection-timeout",
+				"clusterServerSelectionTimeoutMS");
+
+		// Connection Pool Settings
+		setPropertyValue(clientOptionsDefBuilder, settingsElement, "connection-pool-max-size", "poolMaxSize");
+		setPropertyValue(clientOptionsDefBuilder, settingsElement, "connection-pool-min-size", "poolMinSize");
+		setPropertyValue(clientOptionsDefBuilder, settingsElement, "connection-pool-max-wait-time", "poolMaxWaitTimeMS");
+		setPropertyValue(clientOptionsDefBuilder, settingsElement, "connection-pool-max-connection-life-time",
+				"poolMaxConnectionLifeTimeMS");
+		setPropertyValue(clientOptionsDefBuilder, settingsElement, "connection-pool-max-connection-idle-time",
+				"poolMaxConnectionIdleTimeMS");
+		setPropertyValue(clientOptionsDefBuilder, settingsElement, "connection-pool-maintenance-initial-delay",
+				"poolMaintenanceInitialDelayMS");
+		setPropertyValue(clientOptionsDefBuilder, settingsElement, "connection-pool-maintenance-frequency",
+				"poolMaintenanceFrequencyMS");
+
+		// SSL Settings
+		setPropertyValue(clientOptionsDefBuilder, settingsElement, "ssl-enabled", "sslEnabled");
+		setPropertyValue(clientOptionsDefBuilder, settingsElement, "ssl-invalid-host-name-allowed",
+				"sslInvalidHostNameAllowed");
+		setPropertyValue(clientOptionsDefBuilder, settingsElement, "ssl-provider", "sslProvider");
+
+		// Field level encryption
+		setPropertyReference(clientOptionsDefBuilder, settingsElement, "encryption-settings-ref", "autoEncryptionSettings");
+
+		// and the rest
+
+		mongoClientBuilder.addPropertyValue("mongoClientSettings", clientOptionsDefBuilder.getBeanDefinition());
 
 		return true;
 	}
@@ -116,6 +136,24 @@ abstract class MongoParsingUtils {
 		return builder;
 	}
 
+	/**
+	 * Returns the {@link BeanDefinitionBuilder} to build a {@link BeanDefinition} for a
+	 * {@link ReadConcernPropertyEditor}.
+	 *
+	 * @return
+	 * @since 3.0
+	 */
+	static BeanDefinitionBuilder getReadConcernPropertyEditorBuilder() {
+
+		Map<String, Class<?>> customEditors = new ManagedMap<>();
+		customEditors.put("com.mongodb.ReadConcern", ReadConcernPropertyEditor.class);
+
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CustomEditorConfigurer.class);
+		builder.addPropertyValue("customEditors", customEditors);
+
+		return builder;
+	}
+
 	/**
 	 * One should only register one bean definition but want to have the convenience of using
 	 * AbstractSingleBeanDefinitionParser but have the side effect of registering a 'default' property editor with the
@@ -123,7 +161,7 @@ abstract class MongoParsingUtils {
 	 */
 	static BeanDefinitionBuilder getServerAddressPropertyEditorBuilder() {
 
-		Map<String, String> customEditors = new ManagedMap<String, String>();
+		Map<String, String> customEditors = new ManagedMap<>();
 		customEditors.put("com.mongodb.ServerAddress[]",
 				"org.springframework.data.mongodb.config.ServerAddressPropertyEditor");
 
@@ -141,7 +179,7 @@ abstract class MongoParsingUtils {
 	 */
 	static BeanDefinitionBuilder getReadPreferencePropertyEditorBuilder() {
 
-		Map<String, Class<?>> customEditors = new ManagedMap<String, Class<?>>();
+		Map<String, Class<?>> customEditors = new ManagedMap<>();
 		customEditors.put("com.mongodb.ReadPreference", ReadPreferencePropertyEditor.class);
 
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CustomEditorConfigurer.class);
@@ -167,4 +205,41 @@ abstract class MongoParsingUtils {
 
 		return builder;
 	}
+
+	/**
+	 * Returns the {@link BeanDefinitionBuilder} to build a {@link BeanDefinition} for a
+	 * {@link ConnectionStringPropertyEditor}.
+	 *
+	 * @return
+	 * @since 3.0
+	 */
+	static BeanDefinitionBuilder getConnectionStringPropertyEditorBuilder() {
+
+		Map<String, Class<?>> customEditors = new ManagedMap<>();
+		customEditors.put("com.mongodb.ConnectionString", ConnectionStringPropertyEditor.class);
+
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CustomEditorConfigurer.class);
+		builder.addPropertyValue("customEditors", customEditors);
+
+		return builder;
+	}
+
+	/**
+	 * Returns the {@link BeanDefinitionBuilder} to build a {@link BeanDefinition} for a
+	 * {@link ConnectionStringPropertyEditor}.
+	 *
+	 * @return
+	 * @since 3.0
+	 */
+	static BeanDefinitionBuilder getUUidRepresentationEditorBuilder() {
+
+		Map<String, Class<?>> customEditors = new ManagedMap<>();
+		customEditors.put("org.bson.UuidRepresentation", UUidRepresentationPropertyEditor.class);
+
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CustomEditorConfigurer.class);
+		builder.addPropertyValue("customEditors", customEditors);
+
+		return builder;
+	}
+
 }

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

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

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

@@ -0,0 +1,48 @@
+/*
+ * 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.config;
+
+import java.beans.PropertyEditorSupport;
+
+import org.springframework.lang.Nullable;
+import org.springframework.util.StringUtils;
+
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadConcernLevel;
+
+/**
+ * Parse a {@link String} to a {@link ReadConcern}. If it is a well know {@link String} as identified by the
+ * {@link ReadConcernLevel#fromString(String)}.
+ *
+ * @author Christoph Strobl
+ * @since 3.0
+ */
+public class ReadConcernPropertyEditor extends PropertyEditorSupport {
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.xml.BeanDefinitionParser#parse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext)
+	 */
+	@Override
+	public void setAsText(@Nullable String readConcernString) {
+
+		if (!StringUtils.hasText(readConcernString)) {
+			return;
+		}
+
+		setValue(new ReadConcern(ReadConcernLevel.fromString(readConcernString)));
+	}
+}

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

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

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

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

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

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

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

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2020 the original author 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.config;
+
+import java.beans.PropertyEditorSupport;
+
+import org.bson.UuidRepresentation;
+import org.springframework.lang.Nullable;
+import org.springframework.util.StringUtils;
+
+/**
+ * Parse a {@link String} to a {@link UuidRepresentation}.
+ *
+ * @author Christoph Strobl
+ * @since 3.0
+ */
+public class UUidRepresentationPropertyEditor extends PropertyEditorSupport {
+
+	/*
+	 * (non-Javadoc)
+	 * @see java.beans.PropertyEditorSupport#setAsText(java.lang.String)
+	 */
+	@Override
+	public void setAsText(@Nullable String value) {
+
+		if (!StringUtils.hasText(value)) {
+			return;
+		}
+
+		setValue(UuidRepresentation.valueOf(value));
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ import com.mongodb.WriteConcern;
 public class WriteConcernPropertyEditor extends PropertyEditorSupport {
 
 	/**
-	 * Parse a string to a List<ServerAddress>
+	 * Parse a string to a {@link WriteConcern}.
 	 */
 	@Override
 	public void setAsText(@Nullable String writeConcernString) {
@@ -51,6 +51,5 @@ public class WriteConcernPropertyEditor extends PropertyEditorSupport {
 			// pass on the string to the constructor
 			setValue(new WriteConcern(writeConcernString));
 		}
-
 	}
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,227 @@
+/*
+ * Copyright 2019-2020 the original author 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.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.bson.Document;
+
+import org.springframework.data.geo.Point;
+import org.springframework.lang.Nullable;
+import org.springframework.util.ObjectUtils;
+
+/**
+ * Value object representing a count query. Count queries using {@code $near} or {@code $nearSphere} require a rewrite
+ * to {@code $geoWithin}.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @since 3.0
+ */
+class CountQuery {
+
+	private Document source;
+
+	private CountQuery(Document source) {
+		this.source = source;
+	}
+
+	public static CountQuery of(Document source) {
+		return new CountQuery(source);
+	}
+
+	/**
+	 * Returns the query {@link Document} that can be used with {@code countDocuments()}. Potentially rewrites the query
+	 * to be usable with {@code countDocuments()}.
+	 *
+	 * @return the query {@link Document} that can be used with {@code countDocuments()}.
+	 */
+	public Document toQueryDocument() {
+
+		if (!requiresRewrite(source)) {
+			return source;
+		}
+
+		Document target = new Document();
+
+		for (Map.Entry<String, Object> entry : source.entrySet()) {
+
+			if (entry.getValue() instanceof Document && requiresRewrite(entry.getValue())) {
+
+				Document theValue = (Document) entry.getValue();
+				target.putAll(createGeoWithin(entry.getKey(), theValue, source.get("$and")));
+				continue;
+			}
+
+			if (entry.getValue() instanceof Collection && requiresRewrite(entry.getValue())) {
+
+				Collection<?> source = (Collection<?>) entry.getValue();
+
+				target.put(entry.getKey(), rewriteCollection(source));
+				continue;
+			}
+
+			if ("$and".equals(entry.getKey()) && target.containsKey("$and")) {
+				// Expect $and to be processed with Document and createGeoWithin.
+				continue;
+			}
+
+			target.put(entry.getKey(), entry.getValue());
+		}
+
+		return target;
+	}
+
+	/**
+	 * @param valueToInspect
+	 * @return {@code true} if the enclosing element needs to be rewritten.
+	 */
+	private boolean requiresRewrite(Object valueToInspect) {
+
+		if (valueToInspect instanceof Document) {
+			return requiresRewrite((Document) valueToInspect);
+		}
+
+		if (valueToInspect instanceof Collection) {
+			return requiresRewrite((Collection) valueToInspect);
+		}
+
+		return false;
+	}
+
+	private boolean requiresRewrite(Collection<?> collection) {
+
+		for (Object o : collection) {
+			if (o instanceof Document && requiresRewrite((Document) o)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	private boolean requiresRewrite(Document document) {
+
+		if (containsNear(document)) {
+			return true;
+		}
+
+		for (Object entry : document.values()) {
+
+			if (requiresRewrite(entry)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	private Collection<Object> rewriteCollection(Collection<?> source) {
+
+		Collection<Object> rewrittenCollection = new ArrayList<>(source.size());
+
+		for (Object item : source) {
+			if (item instanceof Document && requiresRewrite(item)) {
+				rewrittenCollection.add(CountQuery.of((Document) item).toQueryDocument());
+			} else {
+				rewrittenCollection.add(item);
+			}
+		}
+
+		return rewrittenCollection;
+	}
+
+	/**
+	 * Rewrite the near query for field {@code key} to {@code $geoWithin}.
+	 *
+	 * @param key the queried field.
+	 * @param source source {@link Document}.
+	 * @param $and potentially existing {@code $and} condition.
+	 * @return the rewritten query {@link Document}.
+	 */
+	private static Document createGeoWithin(String key, Document source, @Nullable Object $and) {
+
+		boolean spheric = source.containsKey("$nearSphere");
+		Object $near = spheric ? source.get("$nearSphere") : source.get("$near");
+
+		Number maxDistance = source.containsKey("$maxDistance") ? (Number) source.get("$maxDistance") : Double.MAX_VALUE;
+		List<Object> $centerMax = Arrays.asList(toCenterCoordinates($near), maxDistance);
+		Document $geoWithinMax = new Document("$geoWithin",
+				new Document(spheric ? "$centerSphere" : "$center", $centerMax));
+
+		if (!containsNearWithMinDistance(source)) {
+			return new Document(key, $geoWithinMax);
+		}
+
+		Number minDistance = (Number) source.get("$minDistance");
+		List<Object> $centerMin = Arrays.asList(toCenterCoordinates($near), minDistance);
+		Document $geoWithinMin = new Document("$geoWithin",
+				new Document(spheric ? "$centerSphere" : "$center", $centerMin));
+
+		List<Document> criteria = new ArrayList<>();
+
+		if ($and != null) {
+			if ($and instanceof Collection) {
+				criteria.addAll((Collection) $and);
+			} else {
+				throw new IllegalArgumentException(
+						"Cannot rewrite query as it contains an '$and' element that is not a Collection!: Offending element: "
+								+ $and);
+			}
+		}
+
+		criteria.add(new Document("$nor", Collections.singletonList(new Document(key, $geoWithinMin))));
+		criteria.add(new Document(key, $geoWithinMax));
+		return new Document("$and", criteria);
+	}
+
+	private static boolean containsNear(Document source) {
+		return source.containsKey("$near") || source.containsKey("$nearSphere");
+	}
+
+	private static boolean containsNearWithMinDistance(Document source) {
+
+		if (!containsNear(source)) {
+			return false;
+		}
+
+		return source.containsKey("$minDistance");
+	}
+
+	private static Object toCenterCoordinates(Object value) {
+
+		if (ObjectUtils.isArray(value)) {
+			return value;
+		}
+
+		if (value instanceof Point) {
+			return Arrays.asList(((Point) value).getX(), ((Point) value).getY());
+		}
+
+		if (value instanceof Document && ((Document) value).containsKey("x")) {
+
+			Document point = (Document) value;
+			return Arrays.asList(point.get("x"), point.get("y"));
+		}
+
+		return value;
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,15 @@
  */
 package org.springframework.data.mongodb.core;
 
-import org.bson.Document;
+import java.util.function.Function;
 
+import org.bson.Document;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+
+import com.mongodb.ReadPreference;
 import com.mongodb.client.FindIterable;
+import com.mongodb.client.MongoCollection;
 
 /**
  * Simple callback interface to allow customization of a {@link FindIterable}.
@@ -25,7 +31,14 @@ import com.mongodb.client.FindIterable;
  * @author Oliver Gierke
  * @author Christoph Strobl
  */
-interface CursorPreparer {
+public interface CursorPreparer extends ReadPreferenceAware {
+
+	/**
+	 * Default {@link CursorPreparer} just passing on the given {@link FindIterable}.
+	 *
+	 * @since 2.2
+	 */
+	CursorPreparer NO_OP_PREPARER = (iterable -> iterable);
 
 	/**
 	 * Prepare the given cursor (apply limits, skips and so on). Returns the prepared cursor.
@@ -33,4 +46,37 @@ interface CursorPreparer {
 	 * @param cursor
 	 */
 	FindIterable<Document> prepare(FindIterable<Document> cursor);
+
+	/**
+	 * Apply query specific settings to {@link MongoCollection} and initate a find operation returning a
+	 * {@link FindIterable} via the given {@link Function find} function.
+	 *
+	 * @param collection must not be {@literal null}.
+	 * @param find must not be {@literal null}.
+	 * @return
+	 * @throws IllegalArgumentException if one of the required arguments is {@literal null}.
+	 * @since 2.2
+	 */
+	default FindIterable<Document> initiateFind(MongoCollection<Document> collection,
+			Function<MongoCollection<Document>, FindIterable<Document>> find) {
+
+		Assert.notNull(collection, "Collection must not be null!");
+		Assert.notNull(find, "Find function must not be null!");
+
+		if (hasReadPreference()) {
+			collection = collection.withReadPreference(getReadPreference());
+		}
+
+		return prepare(find.apply(collection));
+	}
+
+	/**
+	 * @return the {@link ReadPreference} to apply or {@literal null} if none defined.
+	 * @since 2.2
+	 */
+	@Override
+	@Nullable
+	default ReadPreference getReadPreference() {
+		return null;
+	}
 }

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,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;
@@ -38,6 +41,8 @@ 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;
+import org.springframework.data.mongodb.core.query.UpdateDefinition;
+import org.springframework.data.mongodb.core.query.UpdateDefinition.ArrayFilter;
 import org.springframework.data.util.Pair;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
@@ -47,9 +52,6 @@ import com.mongodb.bulk.BulkWriteResult;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.model.*;
 
-import lombok.NonNull;
-import lombok.Value;
-
 /**
  * Default implementation for {@link BulkOperations}.
  *
@@ -59,6 +61,7 @@ import lombok.Value;
  * @author Mark Paluch
  * @author Minsu Kim
  * @author Jens Schauder
+ * @author Michail Nikolaev
  * @since 1.9
  */
 class DefaultBulkOperations implements BulkOperations {
@@ -306,6 +309,10 @@ class DefaultBulkOperations implements BulkOperations {
 
 	private BulkWriteResult bulkWriteTo(MongoCollection<Document> collection) {
 
+		if (defaultWriteConcern != null) {
+			collection = collection.withWriteConcern(defaultWriteConcern);
+		}
+
 		return collection.bulkWrite( //
 				models.stream() //
 						.map(this::extractAndMapWriteModel) //
@@ -344,9 +351,7 @@ class DefaultBulkOperations implements BulkOperations {
 		Assert.notNull(query, "Query must not be null!");
 		Assert.notNull(update, "Update must not be null!");
 
-		UpdateOptions options = new UpdateOptions();
-		options.upsert(upsert);
-		query.getCollation().map(Collation::toMongoCollation).ifPresent(options::collation);
+		UpdateOptions options = computeUpdateOptions(query, update, upsert);
 
 		if (multi) {
 			addModel(update, new UpdateManyModel<>(query.getQueryObject(), update.getUpdateObject(), options));
@@ -484,6 +489,29 @@ class DefaultBulkOperations implements BulkOperations {
 		throw new IllegalStateException("BulkMode was null!");
 	}
 
+	/**
+	 * @param filterQuery The {@link Query} to read a potential {@link Collation} from. Must not be {@literal null}.
+	 * @param update The {@link Update} to apply
+	 * @param upsert flag to indicate if document should be upserted.
+	 * @return new instance of {@link UpdateOptions}.
+	 */
+	private static UpdateOptions computeUpdateOptions(Query filterQuery, UpdateDefinition update, boolean upsert) {
+
+		UpdateOptions options = new UpdateOptions();
+		options.upsert(upsert);
+
+		if (update.hasArrayFilters()) {
+			List<Document> list = new ArrayList<>(update.getArrayFilters().size());
+			for (ArrayFilter arrayFilter : update.getArrayFilters()) {
+				list.add(arrayFilter.asDocument());
+			}
+			options.arrayFilters(list);
+		}
+
+		filterQuery.getCollation().map(Collation::toMongoCollation).ifPresent(options::collation);
+		return options;
+	}
+
 	/**
 	 * {@link BulkOperationContext} holds information about
 	 * {@link org.springframework.data.mongodb.core.BulkOperations.BulkMode} the entity in use as well as references to

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import java.util.List;
 
 import org.bson.Document;
 import org.springframework.dao.DataAccessException;
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
 import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.index.IndexDefinition;
 import org.springframework.data.mongodb.core.index.IndexInfo;
@@ -64,7 +64,7 @@ public class DefaultIndexOperations implements IndexOperations {
 	 *             {@link DefaultIndexOperations#DefaultIndexOperations(MongoOperations, String, Class)}.
 	 */
 	@Deprecated
-	public DefaultIndexOperations(MongoDbFactory mongoDbFactory, String collectionName, QueryMapper queryMapper) {
+	public DefaultIndexOperations(MongoDatabaseFactory mongoDbFactory, String collectionName, QueryMapper queryMapper) {
 		this(mongoDbFactory, collectionName, queryMapper, null);
 	}
 
@@ -80,7 +80,7 @@ public class DefaultIndexOperations implements IndexOperations {
 	 *             {@link DefaultIndexOperations#DefaultIndexOperations(MongoOperations, String, Class)}.
 	 */
 	@Deprecated
-	public DefaultIndexOperations(MongoDbFactory mongoDbFactory, String collectionName, QueryMapper queryMapper,
+	public DefaultIndexOperations(MongoDatabaseFactory mongoDbFactory, String collectionName, QueryMapper queryMapper,
 			@Nullable Class<?> type) {
 
 		Assert.notNull(mongoDbFactory, "MongoDbFactory must not be null!");
@@ -127,7 +127,7 @@ public class DefaultIndexOperations implements IndexOperations {
 			indexOptions = addPartialFilterIfPresent(indexOptions, indexDefinition.getIndexOptions(), entity);
 			indexOptions = addDefaultCollationIfRequired(indexOptions, entity);
 
-			Document mappedKeys = mapper.getMappedObject(indexDefinition.getIndexKeys(), entity);
+			Document mappedKeys = mapper.getMappedSort(indexDefinition.getIndexKeys(), entity);
 			return collection.createIndex(mappedKeys, indexOptions);
 		});
 	}
@@ -223,7 +223,7 @@ public class DefaultIndexOperations implements IndexOperations {
 
 		Assert.isInstanceOf(Document.class, sourceOptions.get(PARTIAL_FILTER_EXPRESSION_KEY));
 		return ops.partialFilterExpression(
-				mapper.getMappedObject((Document) sourceOptions.get(PARTIAL_FILTER_EXPRESSION_KEY), entity));
+				mapper.getMappedSort((Document) sourceOptions.get(PARTIAL_FILTER_EXPRESSION_KEY), entity));
 	}
 
 	private static IndexOptions addDefaultCollationIfRequired(IndexOptions ops, MongoPersistentEntity<?> entity) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +15,13 @@
  */
 package org.springframework.data.mongodb.core;
 
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
 import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.index.IndexOperations;
 import org.springframework.data.mongodb.core.index.IndexOperationsProvider;
 
 /**
- * {@link IndexOperationsProvider} to obtain {@link IndexOperations} from a given {@link MongoDbFactory}.
+ * {@link IndexOperationsProvider} to obtain {@link IndexOperations} from a given {@link MongoDatabaseFactory}.
  *
  * @author Mark Paluch
  * @author Christoph Strobl
@@ -29,14 +29,14 @@ import org.springframework.data.mongodb.core.index.IndexOperationsProvider;
  */
 class DefaultIndexOperationsProvider implements IndexOperationsProvider {
 
-	private final MongoDbFactory mongoDbFactory;
+	private final MongoDatabaseFactory mongoDbFactory;
 	private final QueryMapper mapper;
 
 	/**
 	 * @param mongoDbFactory must not be {@literal null}.
 	 * @param mapper must not be {@literal null}.
 	 */
-	DefaultIndexOperationsProvider(MongoDbFactory mongoDbFactory, QueryMapper mapper) {
+	DefaultIndexOperationsProvider(MongoDatabaseFactory mongoDbFactory, QueryMapper mapper) {
 
 		this.mongoDbFactory = mongoDbFactory;
 		this.mapper = mapper;

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -118,17 +118,6 @@ class EntityOperations {
 		return context.getRequiredPersistentEntity(entityClass).getCollection();
 	}
 
-	/**
-	 * Returns the collection name to be used for the given entity.
-	 *
-	 * @param obj can be {@literal null}.
-	 * @return
-	 */
-	@Nullable
-	public String determineEntityCollectionName(@Nullable Object obj) {
-		return null == obj ? null : determineCollectionName(obj.getClass());
-	}
-
 	public Query getByIdInQuery(Collection<?> entities) {
 
 		MultiValueMap<String, Object> byIds = new LinkedMultiValueMap<>();

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package org.springframework.data.mongodb.core;
 
+import com.mongodb.ReadPreference;
 import lombok.AccessLevel;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
@@ -267,6 +268,11 @@ class ExecutableFindOperationSupport implements ExecutableFindOperation {
 			this.limit = Optional.of(limit);
 			return this;
 		}
+
+		@Override
+		public ReadPreference getReadPreference() {
+			return delegate.getReadPreference();
+		}
 	}
 
 	/**

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,10 @@ package org.springframework.data.mongodb.core;
 
 import java.util.Optional;
 
+import org.springframework.data.mongodb.core.aggregation.AggregationUpdate;
 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.lang.Nullable;
 
 import com.mongodb.client.result.UpdateResult;
@@ -151,13 +153,16 @@ public interface ExecutableUpdateOperation {
 	interface UpdateWithUpdate<T> {
 
 		/**
-		 * Set the {@link Update} to be applied.
+		 * Set the {@link UpdateDefinition} to be applied.
 		 *
 		 * @param update must not be {@literal null}.
 		 * @return new instance of {@link TerminatingUpdate}.
 		 * @throws IllegalArgumentException if update is {@literal null}.
+		 * @since 3.0
+		 * @see Update
+		 * @see AggregationUpdate
 		 */
-		TerminatingUpdate<T> apply(Update update);
+		TerminatingUpdate<T> apply(UpdateDefinition update);
 
 		/**
 		 * Specify {@code replacement} object.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.experimental.FieldDefaults;
 
 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.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
@@ -67,7 +67,7 @@ class ExecutableUpdateOperationSupport implements ExecutableUpdateOperation {
 		@NonNull MongoTemplate template;
 		@NonNull Class domainType;
 		Query query;
-		@Nullable Update update;
+		@Nullable UpdateDefinition update;
 		@Nullable String collection;
 		@Nullable FindAndModifyOptions findAndModifyOptions;
 		@Nullable FindAndReplaceOptions findAndReplaceOptions;
@@ -76,10 +76,10 @@ class ExecutableUpdateOperationSupport implements ExecutableUpdateOperation {
 
 		/*
 		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.UpdateWithUpdate#apply(Update)
+		 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.UpdateWithUpdate#apply(org.springframework.data.mongodb.core.query.UpdateDefinition)
 		 */
 		@Override
-		public TerminatingUpdate<T> apply(Update update) {
+		public TerminatingUpdate<T> apply(UpdateDefinition update) {
 
 			Assert.notNull(update, "Update must not be null!");
 

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,19 +15,69 @@
  */
 package org.springframework.data.mongodb.core;
 
+import java.util.function.Function;
+
+import org.bson.Document;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+
+import com.mongodb.ReadPreference;
 import com.mongodb.reactivestreams.client.FindPublisher;
+import com.mongodb.reactivestreams.client.MongoCollection;
 
 /**
  * Simple callback interface to allow customization of a {@link FindPublisher}.
  *
  * @author Mark Paluch
+ * @author Christoph Strobl
+ * @author Konstantin Volivach
  */
-interface FindPublisherPreparer {
+public interface FindPublisherPreparer extends ReadPreferenceAware {
+
+	/**
+	 * Default {@link FindPublisherPreparer} just passing on the given {@link FindPublisher}.
+	 *
+	 * @since 2.2
+	 */
+	FindPublisherPreparer NO_OP_PREPARER = (findPublisher -> findPublisher);
 
 	/**
 	 * Prepare the given cursor (apply limits, skips and so on). Returns the prepared cursor.
 	 *
 	 * @param findPublisher must not be {@literal null}.
 	 */
-	<T> FindPublisher<T> prepare(FindPublisher<T> findPublisher);
+	FindPublisher<Document> prepare(FindPublisher<Document> findPublisher);
+
+	/**
+	 * Apply query specific settings to {@link MongoCollection} and initate a find operation returning a
+	 * {@link FindPublisher} via the given {@link Function find} function.
+	 *
+	 * @param collection must not be {@literal null}.
+	 * @param find must not be {@literal null}.
+	 * @return
+	 * @throws IllegalArgumentException if one of the required arguments is {@literal null}.
+	 * @since 2.2
+	 */
+	default FindPublisher<Document> initiateFind(MongoCollection<Document> collection,
+			Function<MongoCollection<Document>, FindPublisher<Document>> find) {
+
+		Assert.notNull(collection, "Collection must not be null!");
+		Assert.notNull(find, "Find function must not be null!");
+
+		if (hasReadPreference()) {
+			collection = collection.withReadPreference(getReadPreference());
+		}
+
+		return prepare(find.apply(collection));
+	}
+
+	/**
+	 * @return the {@link ReadPreference} to apply or {@literal null} if none defined.
+	 * @since 2.2
+	 */
+	@Override
+	@Nullable
+	default ReadPreference getReadPreference() {
+		return null;
+	}
 }

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

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